-
Notifications
You must be signed in to change notification settings - Fork 324
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: close websocket with reason on invalid token (#9744)
Signed-off-by: Matt Krick <matt.krick@gmail.com>
- Loading branch information
Showing
4 changed files
with
38 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,14 @@ | ||
| import {WebSocketBehavior} from 'uWebSockets.js' | ||
| import {TrebuchetCloseReason} from '../../client/types/constEnums' | ||
| import safetyPatchRes from '../safetyPatchRes' | ||
| import {isAuthenticated} from '../utils/authorization' | ||
| import checkBlacklistJWT from '../utils/checkBlacklistJWT' | ||
| import getQueryToken from '../utils/getQueryToken' | ||
| import sendToSentry from '../utils/sendToSentry' | ||
| import uwsGetIP from '../utils/uwsGetIP' | ||
|
|
||
| const handleUpgrade: WebSocketBehavior<void>['upgrade'] = async (res, req, context) => { | ||
| safetyPatchRes(res) | ||
| const protocol = req.getHeader('sec-websocket-protocol') | ||
| if (protocol !== 'trebuchet-ws') { | ||
| sendToSentry(new Error(`WebSocket error: invalid protocol: ${protocol}`)) | ||
| // WS Error 1002 is roughly HTTP 412 Precondition Failed because we can't support the req header | ||
| res.writeStatus('412').end() | ||
| return | ||
| } | ||
| const authToken = getQueryToken(req) | ||
| if (!isAuthenticated(authToken)) { | ||
| res.writeStatus('401').end() | ||
| return | ||
| } | ||
|
|
||
| const handleUpgrade: WebSocketBehavior<void>['upgrade'] = (res, req, context) => { | ||
| const key = req.getHeader('sec-websocket-key') | ||
| const protocol = req.getHeader('sec-websocket-protocol') | ||
| const extensions = req.getHeader('sec-websocket-extensions') | ||
| const ip = uwsGetIP(res, req) | ||
| const {sub: userId, iat} = authToken | ||
| // ALL async calls must come after the message listener, or we'll skip out on messages (e.g. resub after server restart) | ||
| const isBlacklistedJWT = await checkBlacklistJWT(userId, iat) | ||
| if (isBlacklistedJWT) { | ||
| res.writeStatus('401').end(TrebuchetCloseReason.EXPIRED_SESSION) | ||
| return | ||
| } | ||
| res.upgrade({ip, authToken}, key, protocol, extensions, context) | ||
| const authToken = getQueryToken(req) | ||
| res.upgrade({ip, authToken, protocol}, key, protocol, extensions, context) | ||
| } | ||
|
|
||
| export default handleUpgrade |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters