Infrastructure/zipline
1
Fork 0
mirror of https://github.com/diced/zipline.git synced 2025-03-28 23:11:22 -05:00
Code Issues Activity

fix(config): extention -> extension

Browse source
This commit is contained in:
diced 2022-06-19 16:44:55 -07:00
parent fb34dfadb0
commit 5965c2e237
No known key found for this signature in database
GPG key ID: 370BD1BA142842D1
6 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.example.toml
View file

@ -16,4 +16,4 @@ length = 6
directory = './uploads'
user_limit = 104900000 # 100mb
admin_limit = 104900000 # 100mb
disabled_extentions = ['jpg']
disabled_extensions = ['jpg']

3
src/lib/config.ts
View file

@ -1,7 +1,6 @@
import type { Config } from './types';
import readConfig from './readConfig';
import validateConfig from '../server/validateConfig';
if (!global.config) global.config = validateConfig(readConfig()) as unknown as Config;
if (!global.config) global.config = validateConfig(readConfig());
export default global.config;

4
src/lib/readConfig.ts
View file

@ -27,7 +27,7 @@ const envValues = [
e('UPLOADER_LENGTH', 'number', (c, v) => c.uploader.length = v),
e('UPLOADER_ADMIN_LIMIT', 'number', (c, v) => c.uploader.admin_limit = v),
e('UPLOADER_USER_LIMIT', 'number', (c, v) => c.uploader.user_limit = v),
e('UPLOADER_DISABLED_EXTS', 'array', (c, v) => v ? c.uploader.disabled_extentions = v : c.uploader.disabled_extentions = []),
e('UPLOADER_DISABLED_EXTS', 'array', (c, v) => v ? c.uploader.disabled_extensions = v : c.uploader.disabled_extensions = []),
e('URLS_ROUTE', 'string', (c, v) => c.urls.route = v),
e('URLS_LENGTH', 'number', (c, v) => c.urls.length = v),
@ -80,7 +80,7 @@ function tryReadEnv(): Config {
length: undefined,
admin_limit: undefined,
user_limit: undefined,
disabled_extentions: undefined,
disabled_extensions: undefined,
},
urls: {
route: undefined,

2
src/lib/types.ts
View file

@ -57,7 +57,7 @@ export interface ConfigUploader {
user_limit: number;
// Disabled extensions to block from uploading
disabled_extentions: string[];
disabled_extensions: string[];
}
export interface ConfigUrls {

2
src/pages/api/upload.ts
View file

@ -38,7 +38,7 @@ async function handler(req: NextApiReq, res: NextApiRes) {
if (file.size > zconfig.uploader[user.administrator ? 'admin_limit' : 'user_limit']) return res.error(`file[${i}] size too big`);
const ext = file.originalname.split('.').pop();
if (zconfig.uploader.disabled_extentions.includes(ext)) return res.error('disabled extension recieved: ' + ext);
if (zconfig.uploader.disabled_extensions.includes(ext)) return res.error('disabled extension recieved: ' + ext);
let fileName: string;
switch (format) {

6
src/server/validateConfig.ts
View file

@ -51,12 +51,12 @@ export default function validate(config): Config {
if (!validated.datasource.s3.access_key_id) errors.push('datasource.s3.access_key_id is a required field');
if (!validated.datasource.s3.secret_access_key) errors.push('datasource.s3.secret_access_key is a required field');
if (!validated.datasource.s3.bucket) errors.push('datasource.s3.bucket is a required field');
if (errors.length) throw { errors };
if (errors.length) throw { errors };
}
return validated as unknown as Config;
} catch (e) {
if (process.env.ZIPLINE_DOCKER_BUILD) return null;
throw `${e.errors.length} errors occured\n${e.errors.map(x => '\t' + x).join('\n')}`;
}
}
};