diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2018-05-22 19:43:13 +0200 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2018-05-22 19:44:34 +0200 |
commit | ff2c1fe8133f9556f6aaa52058cd8b83c40085e6 (patch) | |
tree | bc92cde25bf5a1d74b1413d7145179ef7abfd670 /server/initializers | |
parent | e2f1dad83607aa610ee33b234a81b07664f4304c (diff) | |
download | PeerTube-ff2c1fe8133f9556f6aaa52058cd8b83c40085e6.tar.gz PeerTube-ff2c1fe8133f9556f6aaa52058cd8b83c40085e6.tar.zst PeerTube-ff2c1fe8133f9556f6aaa52058cd8b83c40085e6.zip |
feature: IP filtering on signup page
disable registration form on IP not in range
checking the CIDR list before filtering with it
placing the cidr filters as an attribute object in the config
Diffstat (limited to 'server/initializers')
-rw-r--r-- | server/initializers/checker.ts | 4 | ||||
-rw-r--r-- | server/initializers/constants.ts | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/server/initializers/checker.ts b/server/initializers/checker.ts index 5a9c603b5..6259c7b6c 100644 --- a/server/initializers/checker.ts +++ b/server/initializers/checker.ts | |||
@@ -27,7 +27,9 @@ function checkMissedConfig () { | |||
27 | 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', | 27 | 'storage.avatars', 'storage.videos', 'storage.logs', 'storage.previews', 'storage.thumbnails', 'storage.torrents', 'storage.cache', |
28 | 'log.level', | 28 | 'log.level', |
29 | 'user.video_quota', | 29 | 'user.video_quota', |
30 | 'cache.previews.size', 'admin.email', 'signup.enabled', 'signup.limit', 'transcoding.enabled', 'transcoding.threads', | 30 | 'cache.previews.size', 'admin.email', |
31 | 'signup.enabled', 'signup.limit', 'signup.filters.cidr.whitelist', 'signup.filters.cidr.blacklist', | ||
32 | 'transcoding.enabled', 'transcoding.threads', | ||
31 | 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', | 33 | 'instance.name', 'instance.short_description', 'instance.description', 'instance.terms', 'instance.default_client_route', |
32 | 'instance.default_nsfw_policy', 'instance.robots', | 34 | 'instance.default_nsfw_policy', 'instance.robots', |
33 | 'services.twitter.username', 'services.twitter.whitelisted' | 35 | 'services.twitter.username', 'services.twitter.whitelisted' |
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 424947590..a35306730 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
@@ -150,7 +150,13 @@ const CONFIG = { | |||
150 | }, | 150 | }, |
151 | SIGNUP: { | 151 | SIGNUP: { |
152 | get ENABLED () { return config.get<boolean>('signup.enabled') }, | 152 | get ENABLED () { return config.get<boolean>('signup.enabled') }, |
153 | get LIMIT () { return config.get<number>('signup.limit') } | 153 | get LIMIT () { return config.get<number>('signup.limit') }, |
154 | FILTERS: { | ||
155 | CIDR: { | ||
156 | get WHITELIST () { return config.get<string[]>('signup.filters.cidr.whitelist') }, | ||
157 | get BLACKLIST () { return config.get<string[]>('signup.filters.cidr.blacklist') } | ||
158 | } | ||
159 | } | ||
154 | }, | 160 | }, |
155 | USER: { | 161 | USER: { |
156 | get VIDEO_QUOTA () { return config.get<number>('user.video_quota') } | 162 | get VIDEO_QUOTA () { return config.get<number>('user.video_quota') } |