From: Sasha Sorokin <10401817+Brawaru@users.noreply.github.com>
Date: Wed, 13 Oct 2021 03:02:55 +0000 (+0700)
Subject: fix(streaming): req.scopes can be nullable (#16823)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=6c88ebfd4b8e7d3d976cf3fd66c496394f845e87;p=mastodon.git

fix(streaming): req.scopes can be nullable (#16823)

When checking for required OAuth scopes, an unexpected error could
happen due to missing (null-y) req.scopes. This commit fixes that by
checking if req.scopes are present before checking if any required
scopes are present, otherwise it skips that straight to rejection.
---

diff --git a/streaming/index.js b/streaming/index.js
index 67cd48b43..8b7477a44 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -430,7 +430,7 @@ const startWorker = (workerId) => {
       requiredScopes.push('read:statuses');
     }
 
-    if (requiredScopes.some(requiredScope => req.scopes.includes(requiredScope))) {
+    if (req.scopes && requiredScopes.some(requiredScope => req.scopes.includes(requiredScope))) {
       resolve();
       return;
     }