Repository navigation
Migrate organization and user flows to BaseOrg/BaseUser - #1982
Open
jdalphond-mitre wants to merge 30 commits into
Open
jdalphond-mitre wants to merge 30 commits into
jdalphond-mitre wants to merge 30 commits into
Conversation
david-rocca
previously requested changes
Aug 28, 2026
david-rocca
left a comment
david-rocca
left a comment
Collaborator
There was a problem hiding this comment.
The factory no longer exposes the legacy repositories, but these artifacts remain:
Collaborator
|
In addition, we need to fix the lint issues. |
Collaborator
Author
|
linting fixed |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
jdalphond-mitre
force-pushed
the
2.9.0-release
branch
from
September 9, 2026 15:15
fe63a90 to
8a4d47f
Compare
jdalphond-mitre
force-pushed
the
jd_1942_1943
branch
from
September 9, 2026 16:55
8133760 to
6416d94
Compare
Collaborator
|
Looks like we have one more linting fix |
jdalphond-mitre
force-pushed
the
2.9.0-release
branch
from
October 1, 2026 13:16
8a4d47f to
7291827
Compare
jdalphond-mitre
force-pushed
the
jd_1942_1943
branch
from
October 1, 2026 13:39
6416d94 to
6413924
Compare
… out legacy and registry tests to more easily tell which files are which.
…rization to BaseOrg
…bsolete OrgRepository factory getter and legacy test mocks.
Update legacy user-capacity setup to use BaseOrg membership rather than legacy User records. Add coverage that verifies legacy user create, update, read, and reset-secret responses remain compatible while BaseUser and BaseOrg remain the sources of truth.
Project legacy user reads and write responses directly from BaseUser and BaseOrg membership/admin data, eliminating UserRepository and RegistryUser usage from BaseUserRepository create, update, full update, reset-secret, delete, lookup, and authorization paths. Normalize legacy dotted user fields during creation and re-read the owning BaseOrg before projecting legacy responses so names and ADMIN roles match the persisted BaseUser/BaseOrg state. Avoid logging one-time user secrets in org creation audit records. Release BaseOrg reservation locks before sending post-lock CVE-ID responses, while retaining finally cleanup for exceptions, so an immediately-following reservation is not incorrectly rejected as in progress. Update unit and integration tests for BaseUser-only behavior, legacy write compatibility, and clearer reservation response assertions.
Registry full user updates preserve ADMIN membership when the user remains in the same organization. When org_short_name changes, the user is removed from the source admins list and receives destination membership only. Extend integration coverage for both same-org updates and organization moves.
Use BaseUserRepository when CVE and CVE-ID controllers resolve the authenticated requester UUID for audit metadata, removing their remaining UserRepository factory dependency. Update affected CVE/CVE-ID unit-test factories to provide BaseUserRepository and update registry user-move coverage to require destination membership without destination ADMIN access.
Make BaseOrg the sole source of ADMIN membership by removing the legacy User collection updates from addAdmin() and removeAdmin(). Legacy user responses continue to derive active_roles from BaseOrg membership through the compatibility projection. Expand admin-role integration coverage to verify that: - legacy grants remain visible through registry reads, - registry revokes remain visible through both API formats, and - registry grants remain visible through legacy reads.
Remove the legacy UserRepository factory import and getter now that all production callers use BaseUserRepository. Delete the retired UserRepository implementation and its unit coverage. Update remaining middleware, user-update, and reservation test helpers to use BaseOrgRepository and BaseUserRepository exclusively.
Seed canonical BaseOrg/BaseUser fixtures directly, including memberships, admin references, discriminator types, and quotas. Remove the legacy Org/User migration script and obsolete test setup references. Update population helpers and affected tests to use Base repositories only. Retain Monday migration support for existing BaseOrg/BaseUser data.
Return empty active_roles for disabled organizations and remove the implicit CNA fallback. Include disabled in legacy read projections, remove obsolete code, and add regression coverage.
Authentication previously validated organization membership, active user status, and API keys without checking BaseOrg.disabled. Members of disabled organizations could therefore authenticate and reach role and ownership checks using the organization’s stored authority. Update required and optional authentication to: - Load the organization UUID and disabled flag from BaseOrg. - Require disabled to be explicitly false before validating the user. - Reject missing, null, or non-boolean disabled values. - Clear authenticated state and cached organization/user UUIDs before validation to prevent rejected attempts from retaining stale identity. - Preserve active-user, membership, API-key, role, and ownership checks. Required authentication returns 401 for non-enabled organizations. Optional authentication continues with unauthenticated public response behavior. Disabled Secretariat organizations receive no exemption. Add regression coverage for: - Enabled CNA admins and regular members reserving IDs and publishing and editing records owned by their organization. - Disabled organizations being denied reservation, publication, and editing. - Missing or malformed disabled flags failing authentication. - Optional reads redacting protected information for disabled organizations. - Inactive users, missing active status, invalid keys, and false membership claims being rejected. - Cross-CNA reservation, publication, and editing remaining forbidden. - Denied edits leaving existing records unchanged. - Stale optional authentication context being cleared before user lookup.
Default Secretariat organizations to disabled: false and require that value in model and JSON schema validation. Protect organization creation and full updates by checking both existing and requested authority roles. Reject attempts to remove SECRETARIAT and disable the organization in the same request. Keep Secretariat organizations enabled when full updates omit disabled, and enable organizations promoted to Secretariat through registry or legacy role updates. Return HTTP 400 for rejected disable attempts, including review approvals. Abort rejected approvals so the review remains pending. Preserve normal CNA disabling and existing authentication checks. Add unit and integration coverage for defaults, validation, role-change bypasses, omitted flags, CNA disabling, and pending review rollback.
jdalphond-mitre
force-pushed
the
jd_1942_1943
branch
from
October 7, 2026 19:33
b53571b to
612b221
Compare
Legacy user responses derived the ADMIN role from the owning organization's admins list without checking the user's status. Inactive admins therefore returned active_roles: ['ADMIN'], differing from the previous legacy response behavior. Require both active status and admin membership when populating authority.active_roles. Inactive users retain the authority object with an empty active_roles array. The shared converter applies this behavior to legacy single-user and list responses. Stored admin membership remains intact so reactivated users regain their reported role. Registry role reporting is unchanged.
david-rocca
changed the title
added 2 commits
October 8, 2026 16:04
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
#1942
#1943
Migrates CVE, CVE-ID, organization, and user flows away from legacy repository dual-writes while preserving legacy-format compatibility where required.
Important Changes
src/repositories/baseOrgRepository.js/src/repositories/baseUserRepository.jssrc/utils/orgCompatibility.js/src/utils/userCompatibility.jssrc/controller/src/repositories/userRepository.js/src/scripts/migrate.jstest/Testing
bash -i -c "npm run test:integration".