diff options
author | ThibG <thib@sitedethib.com> | 2019-07-30 15:40:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-30 15:40:28 +0200 |
commit | 4ecfa8f298399d9857737f212fc8f5767ffa7c6d (patch) | |
tree | 16896fc6f86c006ed6aba93db23cdec84c11bee3 /streaming | |
parent | f48c7689d230b915ed740a4774736bd5998cbc66 (diff) | |
parent | d8097ecd2f787aa0a065a753146151074eef55c6 (diff) |
Merge pull request #1183 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'streaming')
-rw-r--r-- | streaming/index.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/streaming/index.js b/streaming/index.js index 12e4e3ab1..64e71f353 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -12,6 +12,7 @@ const uuid = require('uuid'); const fs = require('fs'); const env = process.env.NODE_ENV || 'development'; +const alwaysRequireAuth = process.env.WHITELIST_MODE === 'true' || process.env.AUTHORIZED_FETCH === 'true'; dotenv.config({ path: env === 'production' ? '.env.production' : '.env', @@ -271,7 +272,7 @@ const startWorker = (workerId) => { const wsVerifyClient = (info, cb) => { const location = url.parse(info.req.url, true); - const authRequired = !PUBLIC_STREAMS.some(stream => stream === location.query.stream); + const authRequired = alwaysRequireAuth || !PUBLIC_STREAMS.some(stream => stream === location.query.stream); const allowedScopes = []; if (authRequired) { @@ -306,7 +307,7 @@ const startWorker = (workerId) => { return; } - const authRequired = !PUBLIC_ENDPOINTS.some(endpoint => endpoint === req.path); + const authRequired = alwaysRequireAuth || !PUBLIC_ENDPOINTS.some(endpoint => endpoint === req.path); const allowedScopes = []; if (authRequired) { |