Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(admin): rm bot exists check in security mw #12192

Merged
merged 1 commit into from Oct 21, 2022
Merged

fix(admin): rm bot exists check in security mw #12192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/bp/src/admin/workspace/bots/bots-router.ts
View file
Open in desktop
Expand Up @@ -214,15 +214,17 @@ class BotsRouter extends CustomAdminRouter {
return res.status(400).send('Bot should be imported from archive')
}

const overwrite = yn(req.query.overwrite)
const botId = await this.botService.makeBotId(req.params.botId, req.workspace!)

await assertBotInWorkspace(botId, req.workspace)
if (overwrite) {
await assertBotInWorkspace(botId, req.workspace)
}

const buffers: any[] = []
req.on('data', chunk => buffers.push(chunk))
await Promise.fromCallback(cb => req.on('end', cb))

const overwrite = yn(req.query.overwrite)
await this.botService.importBot(botId, Buffer.concat(buffers), req.workspace!, overwrite)
res.sendStatus(200)
})
Expand Down
5 changes: 0 additions & 5 deletions packages/bp/src/core/security/router-security.ts
View file
Open in desktop
Expand Up @@ -211,11 +211,6 @@ const checkPermissions = (workspaceService: WorkspaceService) => (
return new ForbiddenError(`User "${email}" doesn't have access to workspace "${req.workspace}"`)
}

const isBotIdValid = req.params.botId && req.params.botId !== ALL_BOTS
if (isBotIdValid && !(await workspaceService.isBotInWorkspace(req.workspace, req.params.botId))) {
return new NotFoundError(`Bot "${req.params.botId}" doesn't exist in workspace "${req.workspace}"`)
}

const role = await workspaceService.getRoleForUser(email, strategy, req.workspace)

if (!role || !checkRule(role.rules, operation, resource)) {
Expand Down