Skip to content

Resolves Issue #1735 and #1736, Preventing UUID changes on update requests #1822

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
afoote-mitre wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Resolves Issue #1735 and #1736, Preventing UUID changes on update requests #1822

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
16 changes: 16 additions & 0 deletions src/controller/registry-org.controller/registry-org.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,13 @@ async function updateOrg (req, res, next) {

// Eventually we should validate this, but this is a bit tricky.
if (reviewOrg) {
// For review objects, verify the provided UUID matches the target review object's UUID
const providedUUID = body?.UUID || body?.uuid
if (providedUUID && providedUUID !== reviewOrg.uuid) {
await session.abortTransaction()
return res.status(400).json(error.uuidProvided('org'))
}

const updateResult = await reviewRepo.updateReviewOrgObject(body, reviewOrg.uuid, { session })
if (updateResult) {
updatedOrg = reviewOrg
Expand All @@ -307,6 +314,15 @@ async function updateOrg (req, res, next) {
}
}

// Verify that the provided UUID matches the existing organization's immutable database UUID
if (org) {
const providedUUID = body?.UUID || body?.uuid
if (providedUUID && providedUUID !== org.UUID) {
await session.abortTransaction()
return res.status(400).json(error.uuidProvided('org'))
}
}

// Validate org
const result = repo.validateOrg(body, { session })
if (!result.isValid) {
Expand Down
13 changes: 13 additions & 0 deletions src/controller/registry-user.controller/registry-user.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,19 @@ async function updateUser (req, res, next) {
}
}

// Allow existing UUIDs to be passed, but block any attempts to mutate them
if (userToEdit) {
if (body?.UUID || body?.uuid) {
if (body.UUID) body.UUID = userToEdit.UUID
if (body.uuid) body.uuid = userToEdit.UUID
}

if (body?.org_UUID || body?.org_uuid) {
if (body.org_UUID) body.org_UUID = userToEdit.org_UUID
if (body.org_uuid) body.org_uuid = userToEdit.org_UUID
}
}

if (body.org_short_name && !isSecretariat) {
logger.info({ uuid: req.ctx.uuid, message: 'Only Secretariat can reassign user organization.' })
return res.status(403).json(error.notAllowedToChangeOrganization())
Expand Down
Loading