Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pierre Boudes
mastodon
Commits
17435271
Unverified
Commit
17435271
authored
2 years ago
by
Claire
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Disable anonymous access to the streaming API (#23989)
parent
59b24c36
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
streaming/index.js
+7
-13
7 additions, 13 deletions
streaming/index.js
with
7 additions
and
13 deletions
streaming/index.js
+
7
−
13
View file @
17435271
...
...
@@ -16,7 +16,6 @@ const WebSocket = require('ws');
const
{
JSDOM
}
=
require
(
'
jsdom
'
);
const
env
=
process
.
env
.
NODE_ENV
||
'
development
'
;
const
alwaysRequireAuth
=
process
.
env
.
LIMITED_FEDERATION_MODE
===
'
true
'
||
process
.
env
.
WHITELIST_MODE
===
'
true
'
||
process
.
env
.
AUTHORIZED_FETCH
===
'
true
'
;
dotenv
.
config
({
path
:
env
===
'
production
'
?
'
.env.production
'
:
'
.env
'
,
...
...
@@ -347,22 +346,17 @@ const startWorker = async (workerId) => {
* @param {boolean=} required
* @return {Promise.<void>}
*/
const
accountFromRequest
=
(
req
,
required
=
true
)
=>
new
Promise
((
resolve
,
reject
)
=>
{
const
accountFromRequest
=
(
req
)
=>
new
Promise
((
resolve
,
reject
)
=>
{
const
authorization
=
req
.
headers
.
authorization
;
const
location
=
url
.
parse
(
req
.
url
,
true
);
const
accessToken
=
location
.
query
.
access_token
||
req
.
headers
[
'
sec-websocket-protocol
'
];
if
(
!
authorization
&&
!
accessToken
)
{
if
(
required
)
{
const
err
=
new
Error
(
'
Missing access token
'
);
err
.
status
=
401
;
const
err
=
new
Error
(
'
Missing access token
'
);
err
.
status
=
401
;
reject
(
err
);
return
;
}
else
{
resolve
();
return
;
}
reject
(
err
);
return
;
}
const
token
=
authorization
?
authorization
.
replace
(
/^Bearer /
,
''
)
:
accessToken
;
...
...
@@ -465,7 +459,7 @@ const startWorker = async (workerId) => {
// variables. OAuth scope checks are moved to the point of subscription
// to a specific stream.
accountFromRequest
(
info
.
req
,
alwaysRequireAuth
).
then
(()
=>
{
accountFromRequest
(
info
.
req
).
then
(()
=>
{
callback
(
true
,
undefined
,
undefined
);
}).
catch
(
err
=>
{
log
.
error
(
info
.
req
.
requestId
,
err
.
toString
());
...
...
@@ -539,7 +533,7 @@ const startWorker = async (workerId) => {
return
;
}
accountFromRequest
(
req
,
alwaysRequireAuth
).
then
(()
=>
checkScopes
(
req
,
channelNameFromPath
(
req
))).
then
(()
=>
{
accountFromRequest
(
req
).
then
(()
=>
checkScopes
(
req
,
channelNameFromPath
(
req
))).
then
(()
=>
{
subscribeHttpToSystemChannel
(
req
,
res
);
}).
then
(()
=>
{
next
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment