natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

coerce DOWNLOAD_COUNTS and EXPIRE_TIMES_SECONDS into positive integer arrays

This commit is contained in:
Nick Sweeting 2021-05-19 01:39:14 -04:00 committed by GitHub
parent 1e7efe3d98
commit 4a6a3dfc36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/config.js
View File

@ -3,6 +3,18 @@ const { tmpdir } = require('os');
const path = require('path'); const path = require('path');
const { randomBytes } = require('crypto'); const { randomBytes } = require('crypto');
convict.addFormat({
name: 'positive-int-array',
validate: (ints, schema) => {
ints.forEach(int => {
if (isNaN(int) || int < 0)
throw new Error('must be a comma-separated list of positive integers')
})
},
coerce: (ints_str, schema) =>
ints_str.trim().split(',').map(int_str => parseInt(int_str.trim(), 10))
});
const conf = convict({ const conf = convict({
s3_bucket: { s3_bucket: {
format: String, format: String,
@ -25,7 +37,7 @@ const conf = convict({
env: 'GCS_BUCKET' env: 'GCS_BUCKET'
}, },
expire_times_seconds: { expire_times_seconds: {
format: Array, format: 'positive-int-array',
default: [300, 3600, 86400, 604800], default: [300, 3600, 86400, 604800],
env: 'EXPIRE_TIMES_SECONDS' env: 'EXPIRE_TIMES_SECONDS'
}, },
@ -40,7 +52,7 @@ const conf = convict({
env: 'MAX_EXPIRE_SECONDS' env: 'MAX_EXPIRE_SECONDS'
}, },
download_counts: { download_counts: {
format: Array, format: 'positive-int-array',
default: [1, 2, 3, 4, 5, 20, 50, 100], default: [1, 2, 3, 4, 5, 20, 50, 100],
env: 'DOWNLOAD_COUNTS' env: 'DOWNLOAD_COUNTS'
}, },