Skip to content

Fix IDOR Takeover in PUT /api/v1/user #5986

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

Open
christopherholland-workday wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −9
Open

Fix IDOR Takeover in PUT /api/v1/user #5986

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/server/src/enterprise/controllers/user.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ export class UserController {
if (!currentUser) {
throw new InternalFlowiseError(StatusCodes.UNAUTHORIZED, UserErrorMessage.USER_NOT_FOUND)
}
const { id } = req.body
const { id, name, oldPassword, newPassword, confirmPassword } = req.body
if (currentUser.id !== id) {
throw new InternalFlowiseError(StatusCodes.FORBIDDEN, UserErrorMessage.USER_NOT_FOUND)
}
const user = await userService.updateUser(req.body)
const user = await userService.updateUser({ id, name, updatedBy: currentUser.id, oldPassword, newPassword, confirmPassword })
return res.status(StatusCodes.OK).json(user)
} catch (error) {
next(error)
Expand Down
24 changes: 17 additions & 7 deletions packages/server/src/enterprise/services/user.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,10 @@ export class UserService {
if (!updateUserData) throw new InternalFlowiseError(StatusCodes.NOT_FOUND, UserErrorMessage.USER_NOT_FOUND)
}

newUserData.createdBy = oldUserData.createdBy

if (newUserData.name) {
this.validateUserName(newUserData.name)
}

if (newUserData.status) {
this.validateUserStatus(newUserData.status)
}

if (newUserData.oldPassword && newUserData.newPassword && newUserData.confirmPassword) {
if (!oldUserData.credential) {
throw new InternalFlowiseError(StatusCodes.BAD_REQUEST, UserErrorMessage.INVALID_USER_CREDENTIAL)
Expand All @@ -176,7 +170,23 @@ export class UserService {
newUserData.tokenExpiry = undefined
}

updatedUser = queryRunner.manager.merge(User, oldUserData, newUserData)
const safePatch: Partial<User> = {
createdBy: oldUserData.createdBy // always preserve from DB
}

if (newUserData.name) {
safePatch.name = newUserData.name
}

safePatch.updatedBy = newUserData.updatedBy // always set (controller forces req.user.id)
if (newUserData.oldPassword && newUserData.newPassword && newUserData.confirmPassword) {
// credential/tempToken/tokenExpiry were set by the validated workflow above
safePatch.credential = newUserData.credential
safePatch.tempToken = newUserData.tempToken
safePatch.tokenExpiry = newUserData.tokenExpiry
}

updatedUser = queryRunner.manager.merge(User, oldUserData, safePatch)
await queryRunner.startTransaction()
await this.saveUser(updatedUser, queryRunner)
await queryRunner.commitTransaction()
Expand Down
Loading