Skip to content

[backend] users add relations in orga admin context (#13901) #13902

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

Merged
Archidoit merged 4 commits into from
Jan 8, 2026
Merged

[backend] users add relations in orga admin context (#13901) #13902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63dc2e2
[backend] users add relations in orga admin context (#13901)
Archidoit Jan 6, 2026
448083d
[backend] tests (#13901)
Archidoit Jan 7, 2026
ab6d662
[backend] tests (#13901)
Archidoit Jan 7, 2026
4b98c39
[backend] tests (#13901)
Archidoit Jan 7, 2026
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
80 changes: 42 additions & 38 deletions opencti-platform/opencti-graphql/src/domain/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ const extractTokenFromBasicAuth = async (authorization) => {

export const findById = async (context, user, userId) => {
if (!isUserHasCapability(user, SETTINGS_SET_ACCESSES) && user.id !== userId) {
// if no organization in common with the logged user
// if no organization in common with the logged user administrated organizations
const memberOrganizations = await fullEntitiesThroughRelationsToList(context, user, userId, RELATION_PARTICIPATE_TO, ENTITY_TYPE_IDENTITY_ORGANIZATION);
const myOrganizationsIds = user.administrated_organizations.map((organization) => organization.id);
if (!memberOrganizations.map((organization) => organization.id).find((orgaId) => myOrganizationsIds.includes(orgaId))) {
Expand Down Expand Up @@ -525,17 +525,35 @@ const isUserAdministratingOrga = (user, organizationId) => {
return user.administrated_organizations.some(({ id }) => id === organizationId);
};

const loadUserToUpdateWithAccessCheck = async (context, user, userId) => {
const userToUpdate = await internalLoadById(context, user, userId, { type: ENTITY_TYPE_USER });
if (!userToUpdate) {
throw FunctionalError(`${ENTITY_TYPE_USER} cannot be found.`, { userId });
}
if (!isUserHasCapability(user, SETTINGS_SET_ACCESSES) && user.id !== userId) {
// Check in an organization admin edits a user that's not in its administrated organizations
if (isOnlyOrgaAdmin(user)) {
const myAdministratedOrganizationsIds = user.administrated_organizations.map((orga) => orga.id);
if (!userToUpdate[RELATION_PARTICIPATE_TO]?.find((orga) => myAdministratedOrganizationsIds.includes(orga))) {
throw ForbiddenAccess();
}
} else {
throw ForbiddenAccess();
}
}
return userToUpdate;
};

export const assignOrganizationToUser = async (context, user, userId, organizationId) => {
if (isOnlyOrgaAdmin(user)) {
// When user is organization admin, we make sure she is also admin of organization added
if (!isUserAdministratingOrga(user, organizationId)) {
throw ForbiddenAccess();
}
}
const targetUser = await findById(context, user, userId);
if (!targetUser) {
throw FunctionalError('Cannot add the relation, User cannot be found.', { userId });
}
// check the user is accessible
const targetUser = await loadUserToUpdateWithAccessCheck(context, user, userId);

const input = { fromId: userId, toId: organizationId, relationship_type: RELATION_PARTICIPATE_TO };
const created = await createRelation(context, user, input);
const actionEmail = ENABLED_DEMO_MODE ? REDACTED_USER.user_email : created.from.user_email;
Expand Down Expand Up @@ -899,14 +917,7 @@ export const roleDeleteRelation = async (context, user, roleId, toId, relationsh
// User related
export const userEditField = async (context, user, userId, rawInputs) => {
const inputs = [];
const userToUpdate = await internalLoadById(context, user, userId);
// Check in an organization admin edits a user that's not in its administrated organizations
const myAdministratedOrganizationsIds = user.administrated_organizations.map((orga) => orga.id);
if (isOnlyOrgaAdmin(user)) {
if (userId !== user.id && !userToUpdate[RELATION_PARTICIPATE_TO].find((orga) => myAdministratedOrganizationsIds.includes(orga))) {
throw ForbiddenAccess();
}
}
const userToUpdate = await loadUserToUpdateWithAccessCheck(context, user, userId);
let skipThisInput = false;
for (let index = 0; index < rawInputs.length; index += 1) {
const input = rawInputs[index];
Expand Down Expand Up @@ -1186,14 +1197,9 @@ export const deleteAllNotificationByUser = async (userId) => {
* @returns {Promise<*>}
*/
export const userDelete = async (context, user, userId) => {
if (isOnlyOrgaAdmin(user)) {
// When user is organization admin, we make sure that the deleted user is in one of the administrated organizations of the admin
const userData = await storeLoadById(context, user, userId, ENTITY_TYPE_USER);
const myAdministratedOrganizationsIds = user.administrated_organizations.map(({ id }) => id);
if (!userData[RELATION_PARTICIPATE_TO].find((orga) => myAdministratedOrganizationsIds.includes(orga))) {
throw ForbiddenAccess();
}
}
// check rights
await loadUserToUpdateWithAccessCheck(context, user, userId);

await deleteAllTriggerAndDigestByUser(userId);
await deleteAllNotificationByUser(userId);
await deleteAllWorkspaceForUser(context, user, userId);
Expand All @@ -1213,14 +1219,14 @@ export const userDelete = async (context, user, userId) => {
};

export const userAddRelation = async (context, user, userId, input) => {
const userData = await storeLoadById(context, user, userId, ENTITY_TYPE_USER);
if (!userData) {
throw FunctionalError(`Cannot add the relation, ${ENTITY_TYPE_USER} cannot be found.`, { userId });
}
// check the user is accessible
const userData = await loadUserToUpdateWithAccessCheck(context, user, userId);

// check the relationship type
if (!isInternalRelationship(input.relationship_type)) {
throw FunctionalError(`Only ${ABSTRACT_INTERNAL_RELATIONSHIP} can be added through this method, got ${input.relationship_type}.`);
}
// Check in case organization admins adds non-grantable goup a user
// Check in case organization admins adds non-grantable group a user
const myGrantableGroups = R.uniq(user.administrated_organizations.map((orga) => orga.grantable_groups).flat());
if (isOnlyOrgaAdmin(user)) {
if (input.relationship_type === 'member-of' && !myGrantableGroups.includes(input.toId)) {
Expand Down Expand Up @@ -1260,10 +1266,9 @@ export const userDeleteRelation = async (context, user, targetUser, toId, relati
};

export const userIdDeleteRelation = async (context, user, userId, toId, relationshipType) => {
const userData = await storeLoadById(context, user, userId, ENTITY_TYPE_USER);
if (!userData) {
throw FunctionalError('Cannot delete the relation, User cannot be found.', { userId });
}
// check the user is accessible
const userData = await loadUserToUpdateWithAccessCheck(context, user, userId);

if (!isInternalRelationship(relationshipType)) {
throw FunctionalError(`Only ${ABSTRACT_INTERNAL_RELATIONSHIP} can be deleted through this method, got ${relationshipType}.`);
}
Expand All @@ -1277,10 +1282,8 @@ export const userDeleteOrganizationRelation = async (context, user, userId, toId
throw ForbiddenAccess();
}
}
const targetUser = await findById(context, user, userId);
if (!targetUser) {
throw FunctionalError('Cannot delete the relation, User cannot be found.', { userId });
}
// check the user is accessible
const targetUser = await loadUserToUpdateWithAccessCheck(context, user, userId);

const { to } = await deleteRelationsByFromAndTo(context, user, userId, toId, RELATION_PARTICIPATE_TO, ABSTRACT_INTERNAL_RELATIONSHIP);
if (to.authorized_authorities?.includes(userId)) {
Expand Down Expand Up @@ -1690,10 +1693,9 @@ export const userRenewToken = async (context, user, userId) => {
throw FunctionalError('Cannot renew token of admin user defined in configuration, please change configuration instead.');
}

const userData = await storeLoadById(context, user, userId, ENTITY_TYPE_USER);
if (!userData) {
throw FunctionalError(`Cannot renew token, ${userId} user cannot be found.`);
}
// check the user is accessible
const userData = await loadUserToUpdateWithAccessCheck(context, user, userId);

const patch = { api_token: uuid() };
const { element } = await patchAttribute(context, user, userId, ENTITY_TYPE_USER, patch);

Expand Down Expand Up @@ -1872,11 +1874,13 @@ export const findDefaultDashboards = async (context, user, currentUser) => {

// region context
export const userCleanContext = async (context, user, userId) => {
await loadUserToUpdateWithAccessCheck(context, user, userId);
await delEditContext(user, userId);
return storeLoadById(context, user, userId, ENTITY_TYPE_USER);
};

export const userEditContext = async (context, user, userId, input) => {
await loadUserToUpdateWithAccessCheck(context, user, userId);
await setEditContext(user, userId, input);
return storeLoadById(context, user, userId, ENTITY_TYPE_USER);
};
Expand Down
25 changes: 23 additions & 2 deletions opencti-platform/opencti-graphql/tests/03-integration/02-resolvers/user-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import gql from 'graphql-tag';
import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
import { elLoadById } from '../../../src/database/engine';
import { generateStandardId } from '../../../src/schema/identifier';
import { ENTITY_TYPE_CAPABILITY, ENTITY_TYPE_GROUP, ENTITY_TYPE_USER } from '../../../src/schema/internalObject';
Expand All @@ -20,6 +20,7 @@ import {
USER_CONNECTOR,
USER_DISINFORMATION_ANALYST,
USER_EDITOR,
USER_SECURITY,
} from '../../utils/testQuery';
import { ENTITY_TYPE_IDENTITY_ORGANIZATION } from '../../../src/modules/organization/organization-types';
import { VIRTUAL_ORGANIZATION_ADMIN } from '../../../src/utils/access';
Expand All @@ -37,7 +38,6 @@ import { OPENCTI_ADMIN_UUID } from '../../../src/schema/general';
import type { Capability, Member, UserAddInput } from '../../../src/generated/graphql';
import { storeLoadById } from '../../../src/database/middleware-loader';
import { entitiesCounter } from '../../02-dataInjection/01-dataCount/entityCountHelper';
import * as entrepriseEdition from '../../../src/enterprise-edition/ee';

const LIST_QUERY = gql`
query users(
Expand Down Expand Up @@ -980,6 +980,18 @@ describe('User has no settings capability and is organization admin query behavi
});
expect(queryResult.data.userEdit.fieldPatch.account_status).toEqual('Inactive');
});
it('should not update user with no organization', async () => {
await queryAsUserIsExpectedForbidden(USER_EDITOR.client, {
query: UPDATE_QUERY,
variables: { id: ADMIN_USER.id, input: { key: 'account_status', value: ['Inactive'] } },
});
});
it('should not update user from an other organization', async () => {
await queryAsUserIsExpectedForbidden(USER_EDITOR.client, {
query: UPDATE_QUERY,
variables: { id: USER_SECURITY.id, input: { key: 'account_status', value: ['Inactive'] } },
});
});
it('should not add organization to user if not admin', async () => {
platformOrganizationId = await getOrganizationIdByName(PLATFORM_ORGANIZATION.name);
await queryAsUserIsExpectedForbidden(USER_EDITOR.client, {
Expand All @@ -990,6 +1002,15 @@ describe('User has no settings capability and is organization admin query behavi
},
});
});
it('should not add organization to user if user is not in its own organization', async () => {
await queryAsUserIsExpectedForbidden(USER_EDITOR.client, {
query: ORGANIZATION_ADD_QUERY,
variables: {
id: ADMIN_USER.id,
organizationId: testOrganizationId,
},
});
});
it('should administrate more than 1 organization', async () => {
// Need to add granted_groups to PLATFORM_ORGANIZATION because of line 533 in domain/user.js
const grantableGroupQueryResult = await adminQuery({
Expand Down