wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-10 17:30:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: handle token error in collaborator service (#8493)

Browse Source 
Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
This commit is contained in:
Alexander Onnikov 2025-04-08 13:19:11 +07:00 committed by GitHub
parent 87caab77c9
commit 8ea386abe8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/collaborator/src/server.ts
View File

@ -16,7 +16,7 @@
import { Analytics } from '@hcengineering/analytics'
import { MeasureContext, generateId, metricsAggregate } from '@hcengineering/core'
import type { StorageAdapter } from '@hcengineering/server-core'
import { Token, decodeToken } from '@hcengineering/server-token'
import { Token, TokenError, decodeToken } from '@hcengineering/server-token'
import { Hocuspocus } from '@hocuspocus/server'
import bp from 'body-parser'
import cors from 'cors'
@ -132,6 +132,11 @@ export async function start (ctx: MeasureContext, config: Config, storageAdapter
})
res.end(json)
} catch (err: any) {
if (err instanceof TokenError) {
res.status(401).send({ error: 'Unauthorized' })
return
}
ctx.error('statistics error', { err })
Analytics.handleError(err)
res.writeHead(404, {})
@ -143,7 +148,16 @@ export async function start (ctx: MeasureContext, config: Config, storageAdapter
app.post('/rpc/:id', async (req, res) => {
const authHeader = req.headers.authorization
if (authHeader === undefined) {
res.status(403).send({ error: 'Unauthorized' })
res.status(401).send({ error: 'Unauthorized' })
return
}
const rawToken = authHeader.split(' ')[1]
let token: Token
try {
token = decodeToken(rawToken)
} catch {
res.status(401).send({ error: 'Unauthorized' })
return
}
@ -167,8 +181,6 @@ export async function start (ctx: MeasureContext, config: Config, storageAdapter
return
}
const rawToken = authHeader.split(' ')[1]
const token = decodeToken(rawToken)
const context = await getContext(rawToken, token)
rpcCtx.info('rpc', { method: request.method, connectionId: context.connectionId, mode: token.extra?.mode ?? '' })