mirror of
https://github.com/n8n-io/n8n.git
synced 2025-03-05 20:50:17 -08:00
feat(core): Prevent non owners password reset when saml is enabled (#5788)
* prevent non owners from pw reset when saml is enabled * improve tests * change error type
This commit is contained in:
parent
9e9003bf13
commit
2216455760
|
@ -7,6 +7,7 @@ import {
|
||||||
BadRequestError,
|
BadRequestError,
|
||||||
InternalServerError,
|
InternalServerError,
|
||||||
NotFoundError,
|
NotFoundError,
|
||||||
|
UnauthorizedError,
|
||||||
UnprocessableRequestError,
|
UnprocessableRequestError,
|
||||||
} from '@/ResponseHelper';
|
} from '@/ResponseHelper';
|
||||||
import {
|
import {
|
||||||
|
@ -24,6 +25,7 @@ import { PasswordResetRequest } from '@/requests';
|
||||||
import type { IDatabaseCollections, IExternalHooksClass, IInternalHooksClass } from '@/Interfaces';
|
import type { IDatabaseCollections, IExternalHooksClass, IInternalHooksClass } from '@/Interfaces';
|
||||||
import { issueCookie } from '@/auth/jwt';
|
import { issueCookie } from '@/auth/jwt';
|
||||||
import { isLdapEnabled } from '@/Ldap/helpers';
|
import { isLdapEnabled } from '@/Ldap/helpers';
|
||||||
|
import { isSamlCurrentAuthenticationMethod } from '../sso/ssoHelpers';
|
||||||
|
|
||||||
@RestController()
|
@RestController()
|
||||||
export class PasswordResetController {
|
export class PasswordResetController {
|
||||||
|
@ -100,9 +102,18 @@ export class PasswordResetController {
|
||||||
email,
|
email,
|
||||||
password: Not(IsNull()),
|
password: Not(IsNull()),
|
||||||
},
|
},
|
||||||
relations: ['authIdentities'],
|
relations: ['authIdentities', 'globalRole'],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (isSamlCurrentAuthenticationMethod() && user?.globalRole.name !== 'owner') {
|
||||||
|
this.logger.debug(
|
||||||
|
'Request to send password reset email failed because login is handled by SAML',
|
||||||
|
);
|
||||||
|
throw new UnauthorizedError(
|
||||||
|
'Login is handled by SAML. Please contact your Identity Provider to reset your password.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
|
const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
|
||||||
|
|
||||||
if (!user?.password || (ldapIdentity && user.disabled)) {
|
if (!user?.password || (ldapIdentity && user.disabled)) {
|
||||||
|
|
|
@ -14,6 +14,7 @@ import {
|
||||||
randomValidPassword,
|
randomValidPassword,
|
||||||
} from './shared/random';
|
} from './shared/random';
|
||||||
import * as testDb from './shared/testDb';
|
import * as testDb from './shared/testDb';
|
||||||
|
import { setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
|
||||||
|
|
||||||
jest.mock('@/UserManagement/email/NodeMailer');
|
jest.mock('@/UserManagement/email/NodeMailer');
|
||||||
|
|
||||||
|
@ -74,6 +75,35 @@ describe('POST /forgot-password', () => {
|
||||||
expect(storedOwner.resetPasswordToken).toBeNull();
|
expect(storedOwner.resetPasswordToken).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('should fail if SAML is authentication method', async () => {
|
||||||
|
await setCurrentAuthenticationMethod('saml');
|
||||||
|
config.set('userManagement.emails.mode', 'smtp');
|
||||||
|
const member = await testDb.createUser({
|
||||||
|
email: 'test@test.com',
|
||||||
|
globalRole: globalMemberRole,
|
||||||
|
});
|
||||||
|
|
||||||
|
await authlessAgent.post('/forgot-password').send({ email: member.email }).expect(403);
|
||||||
|
|
||||||
|
const storedOwner = await Db.collections.User.findOneByOrFail({ email: member.email });
|
||||||
|
expect(storedOwner.resetPasswordToken).toBeNull();
|
||||||
|
await setCurrentAuthenticationMethod('email');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('should succeed if SAML is authentication method and requestor is owner', async () => {
|
||||||
|
await setCurrentAuthenticationMethod('saml');
|
||||||
|
config.set('userManagement.emails.mode', 'smtp');
|
||||||
|
|
||||||
|
const response = await authlessAgent.post('/forgot-password').send({ email: owner.email });
|
||||||
|
|
||||||
|
expect(response.statusCode).toBe(200);
|
||||||
|
expect(response.body).toEqual({});
|
||||||
|
|
||||||
|
const storedOwner = await Db.collections.User.findOneByOrFail({ email: owner.email });
|
||||||
|
expect(storedOwner.resetPasswordToken).not.toBeNull();
|
||||||
|
await setCurrentAuthenticationMethod('email');
|
||||||
|
});
|
||||||
|
|
||||||
test('should fail with invalid inputs', async () => {
|
test('should fail with invalid inputs', async () => {
|
||||||
config.set('userManagement.emails.mode', 'smtp');
|
config.set('userManagement.emails.mode', 'smtp');
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue