n8n 1.110.0 → 1.111.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/auth.service.js +2 -0
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/start.d.ts +1 -0
- package/dist/commands/start.js +17 -0
- package/dist/commands/start.js.map +1 -1
- package/dist/constants.d.ts +2 -0
- package/dist/constants.js +3 -1
- package/dist/constants.js.map +1 -1
- package/dist/controllers/e2e.controller.js +1 -0
- package/dist/controllers/e2e.controller.js.map +1 -1
- package/dist/controllers/folder.controller.d.ts +7 -2
- package/dist/controllers/folder.controller.js +24 -3
- package/dist/controllers/folder.controller.js.map +1 -1
- package/dist/controllers/role.controller.d.ts +5 -4
- package/dist/controllers/role.controller.js +21 -15
- package/dist/controllers/role.controller.js.map +1 -1
- package/dist/middlewares/list-query/dtos/workflow.filter.dto.d.ts +1 -0
- package/dist/middlewares/list-query/dtos/workflow.filter.dto.js +6 -0
- package/dist/middlewares/list-query/dtos/workflow.filter.dto.js.map +1 -1
- package/dist/modules/community-packages/npm-utils.js +10 -0
- package/dist/modules/community-packages/npm-utils.js.map +1 -1
- package/dist/modules/data-table/data-store-proxy.service.d.ts +1 -1
- package/dist/modules/data-table/data-store-proxy.service.js +5 -5
- package/dist/modules/data-table/data-store-proxy.service.js.map +1 -1
- package/dist/modules/data-table/data-store-rows.repository.d.ts +7 -4
- package/dist/modules/data-table/data-store-rows.repository.js +40 -75
- package/dist/modules/data-table/data-store-rows.repository.js.map +1 -1
- package/dist/modules/data-table/data-store.controller.d.ts +4 -4
- package/dist/modules/data-table/data-store.controller.js +5 -5
- package/dist/modules/data-table/data-store.controller.js.map +1 -1
- package/dist/modules/data-table/data-store.repository.js.map +1 -1
- package/dist/modules/data-table/data-store.service.d.ts +8 -7
- package/dist/modules/data-table/data-store.service.js +49 -53
- package/dist/modules/data-table/data-store.service.js.map +1 -1
- package/dist/modules/data-table/data-store.types.d.ts +2 -0
- package/dist/modules/data-table/data-store.types.js +7 -0
- package/dist/modules/data-table/data-store.types.js.map +1 -1
- package/dist/modules/data-table/data-table.module.js +1 -1
- package/dist/modules/data-table/utils/sql-utils.d.ts +1 -5
- package/dist/modules/data-table/utils/sql-utils.js +2 -19
- package/dist/modules/data-table/utils/sql-utils.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +18 -5
- package/dist/server.js +20 -23
- package/dist/server.js.map +1 -1
- package/dist/services/frontend.service.js +1 -0
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/ownership.service.d.ts +1 -0
- package/dist/services/ownership.service.js +6 -0
- package/dist/services/ownership.service.js.map +1 -1
- package/dist/services/role.service.d.ts +2 -2
- package/dist/services/role.service.js +3 -3
- package/dist/services/role.service.js.map +1 -1
- package/dist/sso.ee/oidc/oidc.service.ee.d.ts +19 -3
- package/dist/sso.ee/oidc/oidc.service.ee.js +124 -10
- package/dist/sso.ee/oidc/oidc.service.ee.js.map +1 -1
- package/dist/sso.ee/oidc/routes/oidc.controller.ee.d.ts +6 -2
- package/dist/sso.ee/oidc/routes/oidc.controller.ee.js +41 -7
- package/dist/sso.ee/oidc/routes/oidc.controller.ee.js.map +1 -1
- package/dist/user-management/email/templates/credentials-shared.handlebars +48 -40
- package/dist/user-management/email/templates/n8n-logo.png +0 -0
- package/dist/user-management/email/templates/password-reset-requested.handlebars +68 -60
- package/dist/user-management/email/templates/project-shared.handlebars +43 -35
- package/dist/user-management/email/templates/user-invited.handlebars +48 -40
- package/dist/user-management/email/templates/workflow-shared.handlebars +48 -40
- package/dist/workflows/workflow.request.d.ts +1 -0
- package/dist/workflows/workflow.service.ee.js +1 -0
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/package.json +25 -19
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"frontend.service.js","sourceRoot":"","sources":["../../src/services/frontend.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ export declare class OwnershipService {
|
|
|
12
12
|
copyUser(user: User): Partial<User>;
|
|
13
13
|
reconstructUser(cachedUser: Partial<User>): User | undefined;
|
|
14
14
|
getWorkflowProjectCached(workflowId: string): Promise<Project>;
|
|
15
|
+
setWorkflowProjectCacheEntry(workflowId: string, project: Project): Promise<Project>;
|
|
15
16
|
getPersonalProjectOwnerCached(projectId: string): Promise<User | null>;
|
|
16
17
|
addOwnedByAndSharedWith(rawWorkflow: ListQueryDb.Workflow.WithSharing): ListQueryDb.Workflow.WithOwnedByAndSharedWith;
|
|
17
18
|
addOwnedByAndSharedWith(rawCredential: ListQueryDb.Credentials.WithSharing): ListQueryDb.Credentials.WithOwnedByAndSharedWith;
|
|
@@ -70,6 +70,12 @@ let OwnershipService = class OwnershipService {
|
|
|
70
70
|
});
|
|
71
71
|
return sharedWorkflow.project;
|
|
72
72
|
}
|
|
73
|
+
async setWorkflowProjectCacheEntry(workflowId, project) {
|
|
74
|
+
void this.cacheService.setHash('workflow-project', {
|
|
75
|
+
[workflowId]: this.copyProject(project),
|
|
76
|
+
});
|
|
77
|
+
return project;
|
|
78
|
+
}
|
|
73
79
|
async getPersonalProjectOwnerCached(projectId) {
|
|
74
80
|
const cachedValue = await this.cacheService.getHashValue('project-owner', projectId);
|
|
75
81
|
if (cachedValue) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownership.service.js","sourceRoot":"","sources":["../../src/services/ownership.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ownership.service.js","sourceRoot":"","sources":["../../src/services/ownership.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { CreateRoleDto, UpdateRoleDto } from '@n8n/api-types';
|
|
2
|
+
import { LicenseState } from '@n8n/backend-common';
|
|
2
3
|
import { CredentialsEntity, SharedCredentials, SharedWorkflow, User, ListQueryDb, ScopesField, ProjectRelation, RoleRepository, ScopeRepository } from '@n8n/db';
|
|
3
4
|
import type { Scope, Role as RoleDTO, AssignableProjectRole } from '@n8n/permissions';
|
|
4
|
-
import { License } from '../license';
|
|
5
5
|
export declare class RoleService {
|
|
6
6
|
private readonly license;
|
|
7
7
|
private readonly roleRepository;
|
|
8
8
|
private readonly scopeRepository;
|
|
9
|
-
constructor(license:
|
|
9
|
+
constructor(license: LicenseState, roleRepository: RoleRepository, scopeRepository: ScopeRepository);
|
|
10
10
|
private dbRoleToRoleDTO;
|
|
11
11
|
getAllRoles(): Promise<RoleDTO[]>;
|
|
12
12
|
getRole(slug: string): Promise<RoleDTO>;
|
|
@@ -10,13 +10,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.RoleService = void 0;
|
|
13
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
13
14
|
const db_1 = require("@n8n/db");
|
|
14
15
|
const di_1 = require("@n8n/di");
|
|
15
16
|
const permissions_1 = require("@n8n/permissions");
|
|
16
17
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
17
18
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
18
19
|
const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
19
|
-
const license_1 = require("../license");
|
|
20
20
|
let RoleService = class RoleService {
|
|
21
21
|
constructor(license, roleRepository, scopeRepository) {
|
|
22
22
|
this.license = license;
|
|
@@ -145,7 +145,7 @@ let RoleService = class RoleService {
|
|
|
145
145
|
}
|
|
146
146
|
isRoleLicensed(role) {
|
|
147
147
|
if (!(0, permissions_1.isBuiltInRole)(role)) {
|
|
148
|
-
return
|
|
148
|
+
return this.license.isCustomRolesLicensed();
|
|
149
149
|
}
|
|
150
150
|
switch (role) {
|
|
151
151
|
case permissions_1.PROJECT_ADMIN_ROLE_SLUG:
|
|
@@ -164,7 +164,7 @@ let RoleService = class RoleService {
|
|
|
164
164
|
exports.RoleService = RoleService;
|
|
165
165
|
exports.RoleService = RoleService = __decorate([
|
|
166
166
|
(0, di_1.Service)(),
|
|
167
|
-
__metadata("design:paramtypes", [
|
|
167
|
+
__metadata("design:paramtypes", [backend_common_1.LicenseState,
|
|
168
168
|
db_1.RoleRepository,
|
|
169
169
|
db_1.ScopeRepository])
|
|
170
170
|
], RoleService);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,gCAaiB;AACjB,gCAAkC;AAElC,kDAQ0B;AAC1B,+CAA0D;AAE1D,kFAA6E;AAC7E,8EAAyE;
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { Logger } from '@n8n/backend-common';
|
|
|
3
3
|
import { GlobalConfig } from '@n8n/config';
|
|
4
4
|
import { AuthIdentityRepository, SettingsRepository, type User, UserRepository } from '@n8n/db';
|
|
5
5
|
import { Cipher } from 'n8n-core';
|
|
6
|
+
import { JwtService } from '../../services/jwt.service';
|
|
6
7
|
import { UrlService } from '../../services/url.service';
|
|
7
8
|
type OidcRuntimeConfig = Pick<OidcConfigDto, 'clientId' | 'clientSecret' | 'loginEnabled'> & {
|
|
8
9
|
discoveryEndpoint: URL;
|
|
@@ -15,13 +16,28 @@ export declare class OidcService {
|
|
|
15
16
|
private readonly userRepository;
|
|
16
17
|
private readonly cipher;
|
|
17
18
|
private readonly logger;
|
|
19
|
+
private readonly jwtService;
|
|
18
20
|
private oidcConfig;
|
|
19
|
-
constructor(settingsRepository: SettingsRepository, authIdentityRepository: AuthIdentityRepository, urlService: UrlService, globalConfig: GlobalConfig, userRepository: UserRepository, cipher: Cipher, logger: Logger);
|
|
21
|
+
constructor(settingsRepository: SettingsRepository, authIdentityRepository: AuthIdentityRepository, urlService: UrlService, globalConfig: GlobalConfig, userRepository: UserRepository, cipher: Cipher, logger: Logger, jwtService: JwtService);
|
|
20
22
|
init(): Promise<void>;
|
|
21
23
|
getCallbackUrl(): string;
|
|
22
24
|
getRedactedConfig(): OidcConfigDto;
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
generateState(): {
|
|
26
|
+
signed: string;
|
|
27
|
+
plaintext: string;
|
|
28
|
+
};
|
|
29
|
+
verifyState(signedState: string): string;
|
|
30
|
+
generateNonce(): {
|
|
31
|
+
signed: string;
|
|
32
|
+
plaintext: string;
|
|
33
|
+
};
|
|
34
|
+
verifyNonce(signedNonce: string): string;
|
|
35
|
+
generateLoginUrl(): Promise<{
|
|
36
|
+
url: URL;
|
|
37
|
+
state: string;
|
|
38
|
+
nonce: string;
|
|
39
|
+
}>;
|
|
40
|
+
loginUser(callbackUrl: URL, storedState: string, storedNonce: string): Promise<User>;
|
|
25
41
|
loadConfig(decryptSecret?: boolean): Promise<OidcRuntimeConfig>;
|
|
26
42
|
updateConfig(newConfig: OidcConfigDto): Promise<void>;
|
|
27
43
|
private setOidcLoginEnabled;
|
|
@@ -47,15 +47,17 @@ const backend_common_1 = require("@n8n/backend-common");
|
|
|
47
47
|
const config_1 = require("@n8n/config");
|
|
48
48
|
const db_1 = require("@n8n/db");
|
|
49
49
|
const di_1 = require("@n8n/di");
|
|
50
|
+
const crypto_1 = require("crypto");
|
|
50
51
|
const n8n_core_1 = require("n8n-core");
|
|
51
52
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
52
53
|
const client = __importStar(require("openid-client"));
|
|
53
54
|
const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
|
|
54
55
|
const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
|
|
55
56
|
const internal_server_error_1 = require("../../errors/response-errors/internal-server.error");
|
|
57
|
+
const jwt_service_1 = require("../../services/jwt.service");
|
|
56
58
|
const url_service_1 = require("../../services/url.service");
|
|
57
|
-
const constants_1 = require("./constants");
|
|
58
59
|
const sso_helpers_1 = require("../sso-helpers");
|
|
60
|
+
const constants_1 = require("./constants");
|
|
59
61
|
const DEFAULT_OIDC_CONFIG = {
|
|
60
62
|
clientId: '',
|
|
61
63
|
clientSecret: '',
|
|
@@ -67,7 +69,7 @@ const DEFAULT_OIDC_RUNTIME_CONFIG = {
|
|
|
67
69
|
discoveryEndpoint: new URL('http://n8n.io/not-set'),
|
|
68
70
|
};
|
|
69
71
|
let OidcService = class OidcService {
|
|
70
|
-
constructor(settingsRepository, authIdentityRepository, urlService, globalConfig, userRepository, cipher, logger) {
|
|
72
|
+
constructor(settingsRepository, authIdentityRepository, urlService, globalConfig, userRepository, cipher, logger, jwtService) {
|
|
71
73
|
this.settingsRepository = settingsRepository;
|
|
72
74
|
this.authIdentityRepository = authIdentityRepository;
|
|
73
75
|
this.urlService = urlService;
|
|
@@ -75,6 +77,7 @@ let OidcService = class OidcService {
|
|
|
75
77
|
this.userRepository = userRepository;
|
|
76
78
|
this.cipher = cipher;
|
|
77
79
|
this.logger = logger;
|
|
80
|
+
this.jwtService = jwtService;
|
|
78
81
|
this.oidcConfig = DEFAULT_OIDC_RUNTIME_CONFIG;
|
|
79
82
|
}
|
|
80
83
|
async init() {
|
|
@@ -92,24 +95,118 @@ let OidcService = class OidcService {
|
|
|
92
95
|
clientSecret: constants_1.OIDC_CLIENT_SECRET_REDACTED_VALUE,
|
|
93
96
|
};
|
|
94
97
|
}
|
|
98
|
+
generateState() {
|
|
99
|
+
const state = `n8n_state:${(0, crypto_1.randomUUID)()}`;
|
|
100
|
+
return {
|
|
101
|
+
signed: this.jwtService.sign({ state }, { expiresIn: '15m' }),
|
|
102
|
+
plaintext: state,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
verifyState(signedState) {
|
|
106
|
+
let state;
|
|
107
|
+
try {
|
|
108
|
+
const decodedState = this.jwtService.verify(signedState);
|
|
109
|
+
state = decodedState?.state;
|
|
110
|
+
}
|
|
111
|
+
catch (error) {
|
|
112
|
+
this.logger.error('Failed to verify state', { error });
|
|
113
|
+
throw new bad_request_error_1.BadRequestError('Invalid state');
|
|
114
|
+
}
|
|
115
|
+
if (typeof state !== 'string') {
|
|
116
|
+
this.logger.error('Provided state has an invalid format');
|
|
117
|
+
throw new bad_request_error_1.BadRequestError('Invalid state');
|
|
118
|
+
}
|
|
119
|
+
const splitState = state.split(':');
|
|
120
|
+
if (splitState.length !== 2 || splitState[0] !== 'n8n_state') {
|
|
121
|
+
this.logger.error('Provided state is missing the well-known prefix');
|
|
122
|
+
throw new bad_request_error_1.BadRequestError('Invalid state');
|
|
123
|
+
}
|
|
124
|
+
if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(splitState[1])) {
|
|
125
|
+
this.logger.error('Provided state is not formatted correctly');
|
|
126
|
+
throw new bad_request_error_1.BadRequestError('Invalid state');
|
|
127
|
+
}
|
|
128
|
+
return state;
|
|
129
|
+
}
|
|
130
|
+
generateNonce() {
|
|
131
|
+
const nonce = `n8n_nonce:${(0, crypto_1.randomUUID)()}`;
|
|
132
|
+
return {
|
|
133
|
+
signed: this.jwtService.sign({ nonce }, { expiresIn: '15m' }),
|
|
134
|
+
plaintext: nonce,
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
verifyNonce(signedNonce) {
|
|
138
|
+
let nonce;
|
|
139
|
+
try {
|
|
140
|
+
const decodedNonce = this.jwtService.verify(signedNonce);
|
|
141
|
+
nonce = decodedNonce?.nonce;
|
|
142
|
+
}
|
|
143
|
+
catch (error) {
|
|
144
|
+
this.logger.error('Failed to verify nonce', { error });
|
|
145
|
+
throw new bad_request_error_1.BadRequestError('Invalid nonce');
|
|
146
|
+
}
|
|
147
|
+
if (typeof nonce !== 'string') {
|
|
148
|
+
this.logger.error('Provided nonce has an invalid format');
|
|
149
|
+
throw new bad_request_error_1.BadRequestError('Invalid nonce');
|
|
150
|
+
}
|
|
151
|
+
const splitNonce = nonce.split(':');
|
|
152
|
+
if (splitNonce.length !== 2 || splitNonce[0] !== 'n8n_nonce') {
|
|
153
|
+
this.logger.error('Provided nonce is missing the well-known prefix');
|
|
154
|
+
throw new bad_request_error_1.BadRequestError('Invalid nonce');
|
|
155
|
+
}
|
|
156
|
+
if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(splitNonce[1])) {
|
|
157
|
+
this.logger.error('Provided nonce is not formatted correctly');
|
|
158
|
+
throw new bad_request_error_1.BadRequestError('Invalid nonce');
|
|
159
|
+
}
|
|
160
|
+
return nonce;
|
|
161
|
+
}
|
|
95
162
|
async generateLoginUrl() {
|
|
96
163
|
const configuration = await this.getOidcConfiguration();
|
|
164
|
+
const state = this.generateState();
|
|
165
|
+
const nonce = this.generateNonce();
|
|
97
166
|
const authorizationURL = client.buildAuthorizationUrl(configuration, {
|
|
98
167
|
redirect_uri: this.getCallbackUrl(),
|
|
99
168
|
response_type: 'code',
|
|
100
169
|
scope: 'openid email profile',
|
|
101
170
|
prompt: 'select_account',
|
|
171
|
+
state: state.plaintext,
|
|
172
|
+
nonce: nonce.plaintext,
|
|
102
173
|
});
|
|
103
|
-
return authorizationURL;
|
|
174
|
+
return { url: authorizationURL, state: state.signed, nonce: nonce.signed };
|
|
104
175
|
}
|
|
105
|
-
async loginUser(callbackUrl) {
|
|
176
|
+
async loginUser(callbackUrl, storedState, storedNonce) {
|
|
106
177
|
const configuration = await this.getOidcConfiguration();
|
|
107
|
-
const
|
|
108
|
-
const
|
|
178
|
+
const expectedState = this.verifyState(storedState);
|
|
179
|
+
const expectedNonce = this.verifyNonce(storedNonce);
|
|
180
|
+
let tokens;
|
|
181
|
+
try {
|
|
182
|
+
tokens = await client.authorizationCodeGrant(configuration, callbackUrl, {
|
|
183
|
+
expectedState,
|
|
184
|
+
expectedNonce,
|
|
185
|
+
});
|
|
186
|
+
}
|
|
187
|
+
catch (error) {
|
|
188
|
+
this.logger.error('Failed to exchange authorization code for tokens', { error });
|
|
189
|
+
throw new bad_request_error_1.BadRequestError('Invalid authorization code');
|
|
190
|
+
}
|
|
191
|
+
let claims;
|
|
192
|
+
try {
|
|
193
|
+
claims = tokens.claims();
|
|
194
|
+
}
|
|
195
|
+
catch (error) {
|
|
196
|
+
this.logger.error('Failed to extract claims from tokens', { error });
|
|
197
|
+
throw new bad_request_error_1.BadRequestError('Invalid token');
|
|
198
|
+
}
|
|
109
199
|
if (!claims) {
|
|
110
200
|
throw new forbidden_error_1.ForbiddenError('No claims found in the OIDC token');
|
|
111
201
|
}
|
|
112
|
-
|
|
202
|
+
let userInfo;
|
|
203
|
+
try {
|
|
204
|
+
userInfo = await client.fetchUserInfo(configuration, tokens.access_token, claims.sub);
|
|
205
|
+
}
|
|
206
|
+
catch (error) {
|
|
207
|
+
this.logger.error('Failed to fetch user info', { error });
|
|
208
|
+
throw new bad_request_error_1.BadRequestError('Invalid token');
|
|
209
|
+
}
|
|
113
210
|
if (!userInfo.email) {
|
|
114
211
|
throw new bad_request_error_1.BadRequestError('An email is required');
|
|
115
212
|
}
|
|
@@ -193,11 +290,20 @@ let OidcService = class OidcService {
|
|
|
193
290
|
discoveryEndpoint = new URL(newConfig.discoveryEndpoint);
|
|
194
291
|
}
|
|
195
292
|
catch (error) {
|
|
196
|
-
|
|
293
|
+
this.logger.error(`The provided endpoint is not a valid URL: ${newConfig.discoveryEndpoint}`);
|
|
294
|
+
throw new n8n_workflow_1.UserError('Provided discovery endpoint is not a valid URL');
|
|
197
295
|
}
|
|
198
296
|
if (newConfig.clientSecret === constants_1.OIDC_CLIENT_SECRET_REDACTED_VALUE) {
|
|
199
297
|
newConfig.clientSecret = this.oidcConfig.clientSecret;
|
|
200
298
|
}
|
|
299
|
+
try {
|
|
300
|
+
const discoveredMetadata = await client.discovery(discoveryEndpoint, newConfig.clientId, newConfig.clientSecret);
|
|
301
|
+
this.logger.debug(`Discovered OIDC metadata: ${JSON.stringify(discoveredMetadata)}`);
|
|
302
|
+
}
|
|
303
|
+
catch (error) {
|
|
304
|
+
this.logger.error('Failed to discover OIDC metadata', { error });
|
|
305
|
+
throw new n8n_workflow_1.UserError('Failed to discover OIDC metadata, based on the provided configuration');
|
|
306
|
+
}
|
|
201
307
|
await this.settingsRepository.update({
|
|
202
308
|
key: constants_1.OIDC_PREFERENCES_DB_KEY,
|
|
203
309
|
}, {
|
|
@@ -210,6 +316,8 @@ let OidcService = class OidcService {
|
|
|
210
316
|
...newConfig,
|
|
211
317
|
discoveryEndpoint,
|
|
212
318
|
};
|
|
319
|
+
this.cachedOidcConfiguration = undefined;
|
|
320
|
+
this.logger.debug(`OIDC login is now ${this.oidcConfig.loginEnabled ? 'enabled' : 'disabled'}.`);
|
|
213
321
|
await this.setOidcLoginEnabled(this.oidcConfig.loginEnabled);
|
|
214
322
|
}
|
|
215
323
|
async setOidcLoginEnabled(enabled) {
|
|
@@ -224,8 +332,13 @@ let OidcService = class OidcService {
|
|
|
224
332
|
async getOidcConfiguration() {
|
|
225
333
|
const now = Date.now();
|
|
226
334
|
if (this.cachedOidcConfiguration === undefined ||
|
|
227
|
-
now >= this.cachedOidcConfiguration.validTill.getTime()
|
|
335
|
+
now >= this.cachedOidcConfiguration.validTill.getTime() ||
|
|
336
|
+
this.oidcConfig.discoveryEndpoint.toString() !==
|
|
337
|
+
this.cachedOidcConfiguration.discoveryEndpoint.toString() ||
|
|
338
|
+
this.oidcConfig.clientId !== this.cachedOidcConfiguration.clientId ||
|
|
339
|
+
this.oidcConfig.clientSecret !== this.cachedOidcConfiguration.clientSecret) {
|
|
228
340
|
this.cachedOidcConfiguration = {
|
|
341
|
+
...this.oidcConfig,
|
|
229
342
|
configuration: client.discovery(this.oidcConfig.discoveryEndpoint, this.oidcConfig.clientId, this.oidcConfig.clientSecret),
|
|
230
343
|
validTill: new Date(Date.now() + 60 * 60 * 1000),
|
|
231
344
|
};
|
|
@@ -242,6 +355,7 @@ exports.OidcService = OidcService = __decorate([
|
|
|
242
355
|
config_1.GlobalConfig,
|
|
243
356
|
db_1.UserRepository,
|
|
244
357
|
n8n_core_1.Cipher,
|
|
245
|
-
backend_common_1.Logger
|
|
358
|
+
backend_common_1.Logger,
|
|
359
|
+
jwt_service_1.JwtService])
|
|
246
360
|
], OidcService);
|
|
247
361
|
//# sourceMappingURL=oidc.service.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.service.ee.js","sourceRoot":"","sources":["../../../src/sso.ee/oidc/oidc.service.ee.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oidc.service.ee.js","sourceRoot":"","sources":["../../../src/sso.ee/oidc/oidc.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,19 @@
|
|
|
1
1
|
import { OidcConfigDto } from '@n8n/api-types';
|
|
2
|
+
import { Logger } from '@n8n/backend-common';
|
|
3
|
+
import { GlobalConfig } from '@n8n/config';
|
|
2
4
|
import { AuthenticatedRequest } from '@n8n/db';
|
|
3
5
|
import { Request, Response } from 'express';
|
|
4
6
|
import { AuthService } from '../../../auth/auth.service';
|
|
7
|
+
import { AuthlessRequest } from '../../../requests';
|
|
5
8
|
import { UrlService } from '../../../services/url.service';
|
|
6
9
|
import { OidcService } from '../oidc.service.ee';
|
|
7
|
-
import { AuthlessRequest } from '../../../requests';
|
|
8
10
|
export declare class OidcController {
|
|
9
11
|
private readonly oidcService;
|
|
10
12
|
private readonly authService;
|
|
11
13
|
private readonly urlService;
|
|
12
|
-
|
|
14
|
+
private readonly globalConfig;
|
|
15
|
+
private readonly logger;
|
|
16
|
+
constructor(oidcService: OidcService, authService: AuthService, urlService: UrlService, globalConfig: GlobalConfig, logger: Logger);
|
|
13
17
|
retrieveConfiguration(_req: AuthenticatedRequest): Promise<Pick<OidcConfigDto, "clientId" | "clientSecret" | "loginEnabled"> & {
|
|
14
18
|
discoveryEndpoint: URL;
|
|
15
19
|
}>;
|
|
@@ -14,21 +14,28 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.OidcController = void 0;
|
|
16
16
|
const api_types_1 = require("@n8n/api-types");
|
|
17
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
18
|
+
const config_1 = require("@n8n/config");
|
|
19
|
+
const constants_1 = require("@n8n/constants");
|
|
17
20
|
const decorators_1 = require("@n8n/decorators");
|
|
18
21
|
const auth_service_1 = require("../../../auth/auth.service");
|
|
22
|
+
const constants_2 = require("../../../constants");
|
|
23
|
+
const bad_request_error_1 = require("../../../errors/response-errors/bad-request.error");
|
|
19
24
|
const url_service_1 = require("../../../services/url.service");
|
|
20
|
-
const
|
|
25
|
+
const constants_3 = require("../constants");
|
|
21
26
|
const oidc_service_ee_1 = require("../oidc.service.ee");
|
|
22
27
|
let OidcController = class OidcController {
|
|
23
|
-
constructor(oidcService, authService, urlService) {
|
|
28
|
+
constructor(oidcService, authService, urlService, globalConfig, logger) {
|
|
24
29
|
this.oidcService = oidcService;
|
|
25
30
|
this.authService = authService;
|
|
26
31
|
this.urlService = urlService;
|
|
32
|
+
this.globalConfig = globalConfig;
|
|
33
|
+
this.logger = logger;
|
|
27
34
|
}
|
|
28
35
|
async retrieveConfiguration(_req) {
|
|
29
36
|
const config = await this.oidcService.loadConfig();
|
|
30
37
|
if (config.clientSecret) {
|
|
31
|
-
config.clientSecret =
|
|
38
|
+
config.clientSecret = constants_3.OIDC_CLIENT_SECRET_REDACTED_VALUE;
|
|
32
39
|
}
|
|
33
40
|
return config;
|
|
34
41
|
}
|
|
@@ -38,13 +45,38 @@ let OidcController = class OidcController {
|
|
|
38
45
|
return config;
|
|
39
46
|
}
|
|
40
47
|
async redirectToAuthProvider(_req, res) {
|
|
41
|
-
const
|
|
42
|
-
|
|
48
|
+
const authorization = await this.oidcService.generateLoginUrl();
|
|
49
|
+
const { samesite, secure } = this.globalConfig.auth.cookie;
|
|
50
|
+
res.cookie(constants_2.OIDC_STATE_COOKIE_NAME, authorization.state, {
|
|
51
|
+
maxAge: 15 * constants_1.Time.minutes.toMilliseconds,
|
|
52
|
+
httpOnly: true,
|
|
53
|
+
sameSite: samesite,
|
|
54
|
+
secure,
|
|
55
|
+
});
|
|
56
|
+
res.cookie(constants_2.OIDC_NONCE_COOKIE_NAME, authorization.nonce, {
|
|
57
|
+
maxAge: 15 * constants_1.Time.minutes.toMilliseconds,
|
|
58
|
+
httpOnly: true,
|
|
59
|
+
sameSite: samesite,
|
|
60
|
+
secure,
|
|
61
|
+
});
|
|
62
|
+
res.redirect(authorization.url.toString());
|
|
43
63
|
}
|
|
44
64
|
async callbackHandler(req, res) {
|
|
45
65
|
const fullUrl = `${this.urlService.getInstanceBaseUrl()}${req.originalUrl}`;
|
|
46
66
|
const callbackUrl = new URL(fullUrl);
|
|
47
|
-
const
|
|
67
|
+
const state = req.cookies[constants_2.OIDC_STATE_COOKIE_NAME];
|
|
68
|
+
if (typeof state !== 'string') {
|
|
69
|
+
this.logger.error('State is missing');
|
|
70
|
+
throw new bad_request_error_1.BadRequestError('Invalid state');
|
|
71
|
+
}
|
|
72
|
+
const nonce = req.cookies[constants_2.OIDC_NONCE_COOKIE_NAME];
|
|
73
|
+
if (typeof nonce !== 'string') {
|
|
74
|
+
this.logger.error('Nonce is missing');
|
|
75
|
+
throw new bad_request_error_1.BadRequestError('Invalid nonce');
|
|
76
|
+
}
|
|
77
|
+
const user = await this.oidcService.loginUser(callbackUrl, state, nonce);
|
|
78
|
+
res.clearCookie(constants_2.OIDC_STATE_COOKIE_NAME);
|
|
79
|
+
res.clearCookie(constants_2.OIDC_NONCE_COOKIE_NAME);
|
|
48
80
|
this.authService.issueCookie(res, user, true, req.browserId);
|
|
49
81
|
res.redirect('/');
|
|
50
82
|
}
|
|
@@ -85,6 +117,8 @@ exports.OidcController = OidcController = __decorate([
|
|
|
85
117
|
(0, decorators_1.RestController)('/sso/oidc'),
|
|
86
118
|
__metadata("design:paramtypes", [oidc_service_ee_1.OidcService,
|
|
87
119
|
auth_service_1.AuthService,
|
|
88
|
-
url_service_1.UrlService
|
|
120
|
+
url_service_1.UrlService,
|
|
121
|
+
config_1.GlobalConfig,
|
|
122
|
+
backend_common_1.Logger])
|
|
89
123
|
], OidcController);
|
|
90
124
|
//# sourceMappingURL=oidc.controller.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.controller.ee.js","sourceRoot":"","sources":["../../../../src/sso.ee/oidc/routes/oidc.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA+C;
|
|
1
|
+
{"version":3,"file":"oidc.controller.ee.js","sourceRoot":"","sources":["../../../../src/sso.ee/oidc/routes/oidc.controller.ee.ts"],"names":[],"mappings":"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"}
|