Sultan
/
Flowise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1119 from FlowiseAI/bugfix/API-Authentication 

Bugfix/Chatflow API Authentication
This commit is contained in:
Henry Heng 2023-10-23 16:29:34 +01:00 committed by GitHub
parent 43ca334b1d 2f0b4e18f4
commit 012fe45e86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/server/src/index.ts
View File

@ -809,18 +809,21 @@ export class App {
* @param {Response} res * @param {Response} res
* @param {ChatFlow} chatflow * @param {ChatFlow} chatflow
*/ */
async validateKey(req: Request, res: Response, chatflow: ChatFlow) { async validateKey(req: Request, chatflow: ChatFlow) {
const chatFlowApiKeyId = chatflow.apikeyid const chatFlowApiKeyId = chatflow.apikeyid
const authorizationHeader = (req.headers['Authorization'] as string) ?? (req.headers['authorization'] as string) ?? '' if (!chatFlowApiKeyId) return true
if (chatFlowApiKeyId && !authorizationHeader) return res.status(401).send(`Unauthorized`) const authorizationHeader = (req.headers['Authorization'] as string) ?? (req.headers['authorization'] as string) ?? ''
if (chatFlowApiKeyId && !authorizationHeader) return false
const suppliedKey = authorizationHeader.split(`Bearer `).pop() const suppliedKey = authorizationHeader.split(`Bearer `).pop()
if (chatFlowApiKeyId && suppliedKey) { if (suppliedKey) {
const keys = await getAPIKeys() const keys = await getAPIKeys()
const apiSecret = keys.find((key) => key.id === chatFlowApiKeyId)?.apiSecret const apiSecret = keys.find((key) => key.id === chatFlowApiKeyId)?.apiSecret
if (!compareKeys(apiSecret, suppliedKey)) return res.status(401).send(`Unauthorized`) if (!compareKeys(apiSecret, suppliedKey)) return false
return true
} }
return false
} }
/** /**
@ -846,7 +849,8 @@ export class App {
if (!chatId) chatId = chatflowid if (!chatId) chatId = chatflowid
if (!isInternal) { if (!isInternal) {
await this.validateKey(req, res, chatflow) const isKeyValidated = await this.validateKey(req, chatflow)
if (!isKeyValidated) return res.status(401).send('Unauthorized')
} }
let isStreamValid = false let isStreamValid = false