n8n 1.24.0 → 1.25.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.
Files changed (166) hide show
  1. package/dist/ActiveExecutions.js +1 -0
  2. package/dist/ActiveExecutions.js.map +1 -1
  3. package/dist/Interfaces.d.ts +3 -7
  4. package/dist/Interfaces.js.map +1 -1
  5. package/dist/Ldap/helpers.d.ts +2 -8
  6. package/dist/Ldap/helpers.js +4 -118
  7. package/dist/Ldap/helpers.js.map +1 -1
  8. package/dist/{controllers → Ldap}/ldap.controller.d.ts +6 -6
  9. package/dist/{controllers → Ldap}/ldap.controller.js +11 -12
  10. package/dist/Ldap/ldap.controller.js.map +1 -0
  11. package/dist/Ldap/ldap.service.d.ts +36 -0
  12. package/dist/Ldap/ldap.service.js +298 -0
  13. package/dist/Ldap/ldap.service.js.map +1 -0
  14. package/dist/PublicApi/v1/handlers/executions/executions.handler.js +4 -5
  15. package/dist/PublicApi/v1/handlers/executions/executions.handler.js.map +1 -1
  16. package/dist/ResponseHelper.d.ts +0 -3
  17. package/dist/ResponseHelper.js +1 -42
  18. package/dist/ResponseHelper.js.map +1 -1
  19. package/dist/Server.js +8 -7
  20. package/dist/Server.js.map +1 -1
  21. package/dist/TestWebhooks.d.ts +7 -3
  22. package/dist/TestWebhooks.js +35 -19
  23. package/dist/TestWebhooks.js.map +1 -1
  24. package/dist/UserManagement/PermissionChecker.d.ts +14 -3
  25. package/dist/UserManagement/PermissionChecker.js +37 -13
  26. package/dist/UserManagement/PermissionChecker.js.map +1 -1
  27. package/dist/WaitTracker.d.ts +1 -0
  28. package/dist/WaitTracker.js +21 -46
  29. package/dist/WaitTracker.js.map +1 -1
  30. package/dist/WaitingWebhooks.js.map +1 -1
  31. package/dist/WorkflowExecuteAdditionalData.d.ts +1 -1
  32. package/dist/WorkflowExecuteAdditionalData.js +9 -10
  33. package/dist/WorkflowExecuteAdditionalData.js.map +1 -1
  34. package/dist/WorkflowHelpers.d.ts +2 -12
  35. package/dist/WorkflowHelpers.js +1 -231
  36. package/dist/WorkflowHelpers.js.map +1 -1
  37. package/dist/WorkflowRunner.js +8 -5
  38. package/dist/WorkflowRunner.js.map +1 -1
  39. package/dist/WorkflowRunnerProcess.js +2 -2
  40. package/dist/WorkflowRunnerProcess.js.map +1 -1
  41. package/dist/auth/methods/ldap.js +8 -7
  42. package/dist/auth/methods/ldap.js.map +1 -1
  43. package/dist/build.tsbuildinfo +1 -1
  44. package/dist/commands/start.js +2 -0
  45. package/dist/commands/start.js.map +1 -1
  46. package/dist/commands/worker.js +4 -1
  47. package/dist/commands/worker.js.map +1 -1
  48. package/dist/config/index.d.ts +1 -0
  49. package/dist/config/index.js +0 -1
  50. package/dist/config/index.js.map +1 -1
  51. package/dist/config/schema.d.ts +6 -0
  52. package/dist/config/schema.js +6 -0
  53. package/dist/config/schema.js.map +1 -1
  54. package/dist/constants.d.ts +6 -4
  55. package/dist/constants.js +3 -1
  56. package/dist/constants.js.map +1 -1
  57. package/dist/controllers/passwordReset.controller.js +1 -2
  58. package/dist/controllers/passwordReset.controller.js.map +1 -1
  59. package/dist/controllers/workflowStatistics.controller.d.ts +1 -1
  60. package/dist/databases/repositories/execution.repository.d.ts +35 -2
  61. package/dist/databases/repositories/execution.repository.js +86 -1
  62. package/dist/databases/repositories/execution.repository.js.map +1 -1
  63. package/dist/databases/repositories/workflow.repository.d.ts +1 -1
  64. package/dist/databases/types.d.ts +1 -0
  65. package/dist/databases/types.js +3 -0
  66. package/dist/databases/types.js.map +1 -1
  67. package/dist/executionLifecycleHooks/shared/sharedHookFunctions.js +1 -0
  68. package/dist/executionLifecycleHooks/shared/sharedHookFunctions.js.map +1 -1
  69. package/dist/executions/execution.request.d.ts +31 -0
  70. package/dist/executions/execution.request.js +3 -0
  71. package/dist/executions/execution.request.js.map +1 -0
  72. package/dist/executions/executions.controller.d.ts +7 -1
  73. package/dist/executions/executions.controller.js +56 -42
  74. package/dist/executions/executions.controller.js.map +1 -1
  75. package/dist/executions/executions.service.d.ts +2 -19
  76. package/dist/executions/executions.service.ee.d.ts +2 -2
  77. package/dist/executions/executions.service.ee.js +6 -6
  78. package/dist/executions/executions.service.ee.js.map +1 -1
  79. package/dist/executions/executions.service.js +5 -19
  80. package/dist/executions/executions.service.js.map +1 -1
  81. package/dist/push/abstract.push.d.ts +8 -5
  82. package/dist/push/abstract.push.js +21 -17
  83. package/dist/push/abstract.push.js.map +1 -1
  84. package/dist/push/index.d.ts +3 -3
  85. package/dist/push/index.js +3 -4
  86. package/dist/push/index.js.map +1 -1
  87. package/dist/push/sse.push.d.ts +3 -2
  88. package/dist/push/sse.push.js +5 -4
  89. package/dist/push/sse.push.js.map +1 -1
  90. package/dist/push/websocket.push.d.ts +3 -2
  91. package/dist/push/websocket.push.js +5 -4
  92. package/dist/push/websocket.push.js.map +1 -1
  93. package/dist/requests.d.ts +1 -30
  94. package/dist/requests.js.map +1 -1
  95. package/dist/services/cache/cache.service.d.ts +1 -0
  96. package/dist/services/cache/cache.service.js +14 -0
  97. package/dist/services/cache/cache.service.js.map +1 -1
  98. package/dist/services/cache/redis.cache-manager.d.ts +1 -0
  99. package/dist/services/cache/redis.cache-manager.js +3 -0
  100. package/dist/services/cache/redis.cache-manager.js.map +1 -1
  101. package/dist/services/orchestration/main/MultiMainSetup.ee.d.ts +2 -10
  102. package/dist/services/orchestration/main/MultiMainSetup.ee.js +4 -13
  103. package/dist/services/orchestration/main/MultiMainSetup.ee.js.map +1 -1
  104. package/dist/services/orchestration/main/handleCommandMessageMain.js +25 -2
  105. package/dist/services/orchestration/main/handleCommandMessageMain.js.map +1 -1
  106. package/dist/services/orchestration/worker/handleCommandMessageWorker.js +4 -0
  107. package/dist/services/orchestration/worker/handleCommandMessageWorker.js.map +1 -1
  108. package/dist/services/redis/RedisServiceCommands.d.ts +20 -5
  109. package/dist/services/redis.service.d.ts +1 -13
  110. package/dist/services/redis.service.js +2 -30
  111. package/dist/services/redis.service.js.map +1 -1
  112. package/dist/services/test-webhook-registrations.service.js +3 -0
  113. package/dist/services/test-webhook-registrations.service.js.map +1 -1
  114. package/dist/services/userOnboarding.service.d.ts +13 -0
  115. package/dist/services/userOnboarding.service.js +72 -0
  116. package/dist/services/userOnboarding.service.js.map +1 -0
  117. package/dist/sso/saml/samlValidator.js +10 -2
  118. package/dist/sso/saml/samlValidator.js.map +1 -1
  119. package/dist/workflows/workflow.service.d.ts +8 -23
  120. package/dist/workflows/workflow.service.ee.d.ts +9 -9
  121. package/dist/workflows/workflow.service.ee.js +56 -38
  122. package/dist/workflows/workflow.service.ee.js.map +1 -1
  123. package/dist/workflows/workflow.service.js +8 -75
  124. package/dist/workflows/workflow.service.js.map +1 -1
  125. package/dist/workflows/workflowExecution.service.d.ts +27 -0
  126. package/dist/workflows/workflowExecution.service.js +233 -0
  127. package/dist/workflows/workflowExecution.service.js.map +1 -0
  128. package/dist/workflows/workflowSharing.service.d.ts +10 -0
  129. package/dist/workflows/workflowSharing.service.js +44 -0
  130. package/dist/workflows/workflowSharing.service.js.map +1 -0
  131. package/dist/workflows/workflowStaticData.service.d.ts +1 -0
  132. package/dist/workflows/workflowStaticData.service.js +8 -0
  133. package/dist/workflows/workflowStaticData.service.js.map +1 -1
  134. package/dist/workflows/workflows.controller.d.ts +12 -6
  135. package/dist/workflows/workflows.controller.js +22 -14
  136. package/dist/workflows/workflows.controller.js.map +1 -1
  137. package/oclif.manifest.json +1 -1
  138. package/package.json +7 -7
  139. package/dist/Ldap/LdapManager.ee.d.ts +0 -13
  140. package/dist/Ldap/LdapManager.ee.js +0 -30
  141. package/dist/Ldap/LdapManager.ee.js.map +0 -1
  142. package/dist/Ldap/LdapService.ee.d.ts +0 -12
  143. package/dist/Ldap/LdapService.ee.js +0 -69
  144. package/dist/Ldap/LdapService.ee.js.map +0 -1
  145. package/dist/Ldap/LdapSync.ee.d.ts +0 -19
  146. package/dist/Ldap/LdapSync.ee.js +0 -124
  147. package/dist/Ldap/LdapSync.ee.js.map +0 -1
  148. package/dist/PublicApi/v1/handlers/executions/executions.service.d.ts +0 -18
  149. package/dist/PublicApi/v1/handlers/executions/executions.service.js +0 -86
  150. package/dist/PublicApi/v1/handlers/executions/executions.service.js.map +0 -1
  151. package/dist/controllers/ldap.controller.js.map +0 -1
  152. package/dist/executions/executions.controller.ee.d.ts +0 -1
  153. package/dist/executions/executions.controller.ee.js +0 -54
  154. package/dist/executions/executions.controller.ee.js.map +0 -1
  155. package/dist/services/redis/RedisServiceListReceiver.d.ts +0 -10
  156. package/dist/services/redis/RedisServiceListReceiver.js +0 -60
  157. package/dist/services/redis/RedisServiceListReceiver.js.map +0 -1
  158. package/dist/services/redis/RedisServiceListSender.d.ts +0 -8
  159. package/dist/services/redis/RedisServiceListSender.js +0 -39
  160. package/dist/services/redis/RedisServiceListSender.js.map +0 -1
  161. package/dist/services/redis/RedisServiceStreamConsumer.d.ts +0 -20
  162. package/dist/services/redis/RedisServiceStreamConsumer.js +0 -83
  163. package/dist/services/redis/RedisServiceStreamConsumer.js.map +0 -1
  164. package/dist/services/redis/RedisServiceStreamProducer.d.ts +0 -11
  165. package/dist/services/redis/RedisServiceStreamProducer.js +0 -40
  166. package/dist/services/redis/RedisServiceStreamProducer.js.map +0 -1
@@ -30,6 +30,7 @@ let ActiveExecutions = class ActiveExecutions {
30
30
  startedAt: new Date(),
31
31
  workflowData: executionData.workflowData,
32
32
  status: executionStatus,
33
+ workflowId: executionData.workflowData.id,
33
34
  };
34
35
  if (executionData.retryOf !== undefined) {
35
36
  fullExecutionData.retryOf = executionData.retryOf.toString();
@@ -1 +1 @@
1
- {"version":3,"file":"ActiveExecutions.js","sourceRoot":"","sources":["../src/ActiveExecutions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ActiveExecutions.js","sourceRoot":"","sources":["../src/ActiveExecutions.ts"],"names":[],"mappings":"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"}
@@ -38,7 +38,6 @@ export type UsageCount = {
38
38
  };
39
39
  export type ITagWithCountDb = Pick<TagEntity, 'id' | 'name' | 'createdAt' | 'updatedAt'> & UsageCount;
40
40
  export interface IWorkflowDb extends IWorkflowBase {
41
- id: string;
42
41
  tags?: TagEntity[];
43
42
  }
44
43
  export interface IWorkflowToImport extends IWorkflowBase {
@@ -64,16 +63,16 @@ export interface IExecutionBase {
64
63
  mode: WorkflowExecuteMode;
65
64
  startedAt: Date;
66
65
  stoppedAt?: Date;
67
- workflowId?: string;
66
+ workflowId: string;
68
67
  finished: boolean;
69
68
  retryOf?: string;
70
69
  retrySuccessId?: string;
71
70
  status: ExecutionStatus;
71
+ waitTill?: Date | null;
72
72
  }
73
73
  export interface IExecutionDb extends IExecutionBase {
74
74
  data: IRunExecutionData;
75
- waitTill?: Date | null;
76
- workflowData?: IWorkflowBase;
75
+ workflowData: IWorkflowBase;
77
76
  }
78
77
  export type ExecutionPayload = Omit<IExecutionDb, 'id'>;
79
78
  export interface IExecutionPushResponse {
@@ -85,7 +84,6 @@ export interface IExecutionResponse extends IExecutionBase {
85
84
  data: IRunExecutionData;
86
85
  retryOf?: string;
87
86
  retrySuccessId?: string;
88
- waitTill?: Date | null;
89
87
  workflowData: IWorkflowBase | WorkflowWithSharingsAndCredentials;
90
88
  }
91
89
  export interface IExecutionFlatted extends IExecutionBase {
@@ -95,9 +93,7 @@ export interface IExecutionFlatted extends IExecutionBase {
95
93
  export interface IExecutionFlattedDb extends IExecutionBase {
96
94
  id: string;
97
95
  data: string;
98
- waitTill?: Date | null;
99
96
  workflowData: Omit<IWorkflowBase, 'pinData'>;
100
- status: ExecutionStatus;
101
97
  }
102
98
  export interface IExecutionFlattedResponse extends IExecutionFlatted {
103
99
  id: string;
@@ -1 +1 @@
1
- {"version":3,"file":"Interfaces.js","sourceRoot":"","sources":["../src/Interfaces.ts"],"names":[],"mappings":";;;AAotBA,MAAsB,eAAe;CAiBpC;AAjBD,0CAiBC"}
1
+ {"version":3,"file":"Interfaces.js","sourceRoot":"","sources":["../src/Interfaces.ts"],"names":[],"mappings":";;;AAgtBA,MAAsB,eAAe;CAiBpC;AAjBD,0CAiBC"}
@@ -5,9 +5,6 @@ import { AuthIdentity } from '../databases/entities/AuthIdentity';
5
5
  import type { AuthProviderSyncHistory } from '../databases/entities/AuthProviderSyncHistory';
6
6
  import type { ConnectionSecurity, LdapConfig } from './types';
7
7
  export declare const isLdapEnabled: () => boolean;
8
- export declare const isLdapDisabled: () => boolean;
9
- export declare const setLdapLoginLabel: (value: string) => void;
10
- export declare function setLdapLoginEnabled(enabled: boolean): Promise<void>;
11
8
  export declare const getLdapLoginLabel: () => string;
12
9
  export declare const isLdapLoginEnabled: () => boolean;
13
10
  export declare const randomPassword: () => string;
@@ -16,14 +13,10 @@ export declare const validateLdapConfigurationSchema: (ldapConfig: LdapConfig) =
16
13
  valid: boolean;
17
14
  message: string;
18
15
  };
19
- export declare const getLdapConfig: () => Promise<LdapConfig>;
20
- export declare const setGlobalLdapConfigVariables: (ldapConfig: LdapConfig) => Promise<void>;
16
+ export declare const resolveEntryBinaryAttributes: (entry: LdapUser) => LdapUser;
21
17
  export declare const resolveBinaryAttributes: (entries: LdapUser[]) => void;
22
- export declare const updateLdapConfig: (ldapConfig: LdapConfig) => Promise<void>;
23
- export declare const handleLdapInit: () => Promise<void>;
24
18
  export declare const createFilter: (filter: string, userFilter: string) => string;
25
19
  export declare const escapeFilter: (filter: string) => string;
26
- export declare const findAndAuthenticateLdapUser: (loginId: string, password: string, loginIdAttribute: string, userFilter: string) => Promise<LdapUser | undefined>;
27
20
  export declare const getAuthIdentityByLdapId: (idAttributeValue: string) => Promise<AuthIdentity | null>;
28
21
  export declare const getUserByEmail: (email: string) => Promise<User | null>;
29
22
  export declare const mapLdapAttributesToUser: (ldapUser: LdapUser, ldapConfig: LdapConfig) => [AuthIdentity['providerId'], Pick<User, 'email' | 'firstName' | 'lastName'>];
@@ -66,3 +59,4 @@ export declare const createLdapUserOnLocalDb: (role: Role, data: Partial<User>,
66
59
  setUpdateDate?: (() => void) | undefined;
67
60
  } & User>;
68
61
  export declare const updateLdapUserOnLocalDb: (identity: AuthIdentity, data: Partial<User>) => Promise<void>;
62
+ export declare const deleteAllLdapIdentities: () => Promise<import("typeorm").DeleteResult>;
@@ -26,55 +26,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.updateLdapUserOnLocalDb = exports.createLdapUserOnLocalDb = exports.createLdapAuthIdentity = exports.getMappingAttributes = exports.formatUrl = exports.getLdapSynchronizations = exports.saveLdapSynchronization = exports.processUsers = exports.mapLdapUserToDbUser = exports.getLdapUsers = exports.getLdapIds = exports.mapLdapAttributesToUser = exports.getUserByEmail = exports.getAuthIdentityByLdapId = exports.findAndAuthenticateLdapUser = exports.escapeFilter = exports.createFilter = exports.handleLdapInit = exports.updateLdapConfig = exports.resolveBinaryAttributes = exports.setGlobalLdapConfigVariables = exports.getLdapConfig = exports.validateLdapConfigurationSchema = exports.getLdapUserRole = exports.randomPassword = exports.isLdapLoginEnabled = exports.getLdapLoginLabel = exports.setLdapLoginEnabled = exports.setLdapLoginLabel = exports.isLdapDisabled = exports.isLdapEnabled = void 0;
29
+ exports.deleteAllLdapIdentities = exports.updateLdapUserOnLocalDb = exports.createLdapUserOnLocalDb = exports.createLdapAuthIdentity = exports.getMappingAttributes = exports.formatUrl = exports.getLdapSynchronizations = exports.saveLdapSynchronization = exports.processUsers = exports.mapLdapUserToDbUser = exports.getLdapUsers = exports.getLdapIds = exports.mapLdapAttributesToUser = exports.getUserByEmail = exports.getAuthIdentityByLdapId = exports.escapeFilter = exports.createFilter = exports.resolveBinaryAttributes = exports.resolveEntryBinaryAttributes = exports.validateLdapConfigurationSchema = exports.getLdapUserRole = exports.randomPassword = exports.isLdapLoginEnabled = exports.getLdapLoginLabel = exports.isLdapEnabled = void 0;
30
30
  const Filter_1 = require("ldapts/filters/Filter");
31
31
  const typedi_1 = require("typedi");
32
- const n8n_core_1 = require("n8n-core");
33
32
  const jsonschema_1 = require("jsonschema");
34
33
  const Db = __importStar(require("../Db"));
35
34
  const config_1 = __importDefault(require("../config"));
36
35
  const User_1 = require("../databases/entities/User");
37
36
  const AuthIdentity_1 = require("../databases/entities/AuthIdentity");
38
- const LdapManager_ee_1 = require("./LdapManager.ee");
39
37
  const constants_1 = require("./constants");
40
- const n8n_workflow_1 = require("n8n-workflow");
41
38
  const License_1 = require("../License");
42
- const InternalHooks_1 = require("../InternalHooks");
43
- const ssoHelpers_1 = require("../sso/ssoHelpers");
44
39
  const role_service_1 = require("../services/role.service");
45
- const Logger_1 = require("../Logger");
46
40
  const user_repository_1 = require("../databases/repositories/user.repository");
47
- const settings_repository_1 = require("../databases/repositories/settings.repository");
48
41
  const authProviderSyncHistory_repository_1 = require("../databases/repositories/authProviderSyncHistory.repository");
49
42
  const authIdentity_repository_1 = require("../databases/repositories/authIdentity.repository");
50
- const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
51
- const internal_server_error_1 = require("../errors/response-errors/internal-server.error");
52
43
  const isLdapEnabled = () => {
53
44
  return typedi_1.Container.get(License_1.License).isLdapEnabled();
54
45
  };
55
46
  exports.isLdapEnabled = isLdapEnabled;
56
- const isLdapDisabled = () => !(0, exports.isLdapEnabled)();
57
- exports.isLdapDisabled = isLdapDisabled;
58
- const setLdapLoginLabel = (value) => {
59
- config_1.default.set(constants_1.LDAP_LOGIN_LABEL, value);
60
- };
61
- exports.setLdapLoginLabel = setLdapLoginLabel;
62
- async function setLdapLoginEnabled(enabled) {
63
- if ((0, ssoHelpers_1.isEmailCurrentAuthenticationMethod)() || (0, ssoHelpers_1.isLdapCurrentAuthenticationMethod)()) {
64
- if (enabled) {
65
- config_1.default.set(constants_1.LDAP_LOGIN_ENABLED, true);
66
- await (0, ssoHelpers_1.setCurrentAuthenticationMethod)('ldap');
67
- }
68
- else if (!enabled) {
69
- config_1.default.set(constants_1.LDAP_LOGIN_ENABLED, false);
70
- await (0, ssoHelpers_1.setCurrentAuthenticationMethod)('email');
71
- }
72
- }
73
- else {
74
- throw new internal_server_error_1.InternalServerError(`Cannot switch LDAP login enabled state when an authentication method other than email or ldap is active (current: ${(0, ssoHelpers_1.getCurrentAuthenticationMethod)()})`);
75
- }
76
- }
77
- exports.setLdapLoginEnabled = setLdapLoginEnabled;
78
47
  const getLdapLoginLabel = () => config_1.default.getEnv(constants_1.LDAP_LOGIN_LABEL);
79
48
  exports.getLdapLoginLabel = getLdapLoginLabel;
80
49
  const isLdapLoginEnabled = () => config_1.default.getEnv(constants_1.LDAP_LOGIN_ENABLED);
@@ -96,20 +65,6 @@ const validateLdapConfigurationSchema = (ldapConfig) => {
96
65
  return { valid, message };
97
66
  };
98
67
  exports.validateLdapConfigurationSchema = validateLdapConfigurationSchema;
99
- const getLdapConfig = async () => {
100
- const configuration = await typedi_1.Container.get(settings_repository_1.SettingsRepository).findOneByOrFail({
101
- key: constants_1.LDAP_FEATURE_NAME,
102
- });
103
- const configurationData = (0, n8n_workflow_1.jsonParse)(configuration.value);
104
- configurationData.bindingAdminPassword = typedi_1.Container.get(n8n_core_1.Cipher).decrypt(configurationData.bindingAdminPassword);
105
- return configurationData;
106
- };
107
- exports.getLdapConfig = getLdapConfig;
108
- const setGlobalLdapConfigVariables = async (ldapConfig) => {
109
- await setLdapLoginEnabled(ldapConfig.loginEnabled);
110
- (0, exports.setLdapLoginLabel)(ldapConfig.loginLabel);
111
- };
112
- exports.setGlobalLdapConfigVariables = setGlobalLdapConfigVariables;
113
68
  const resolveEntryBinaryAttributes = (entry) => {
114
69
  Object.entries(entry)
115
70
  .filter(([k]) => constants_1.BINARY_AD_ATTRIBUTES.includes(k))
@@ -118,44 +73,11 @@ const resolveEntryBinaryAttributes = (entry) => {
118
73
  });
119
74
  return entry;
120
75
  };
76
+ exports.resolveEntryBinaryAttributes = resolveEntryBinaryAttributes;
121
77
  const resolveBinaryAttributes = (entries) => {
122
- entries.forEach((entry) => resolveEntryBinaryAttributes(entry));
78
+ entries.forEach((entry) => (0, exports.resolveEntryBinaryAttributes)(entry));
123
79
  };
124
80
  exports.resolveBinaryAttributes = resolveBinaryAttributes;
125
- const updateLdapConfig = async (ldapConfig) => {
126
- const { valid, message } = (0, exports.validateLdapConfigurationSchema)(ldapConfig);
127
- if (!valid) {
128
- throw new n8n_workflow_1.ApplicationError(message);
129
- }
130
- if (ldapConfig.loginEnabled && (0, ssoHelpers_1.getCurrentAuthenticationMethod)() === 'saml') {
131
- throw new bad_request_error_1.BadRequestError('LDAP cannot be enabled if SSO in enabled');
132
- }
133
- LdapManager_ee_1.LdapManager.updateConfig({ ...ldapConfig });
134
- ldapConfig.bindingAdminPassword = typedi_1.Container.get(n8n_core_1.Cipher).encrypt(ldapConfig.bindingAdminPassword);
135
- if (!ldapConfig.loginEnabled) {
136
- ldapConfig.synchronizationEnabled = false;
137
- const ldapUsers = await (0, exports.getLdapUsers)();
138
- if (ldapUsers.length) {
139
- await deleteAllLdapIdentities();
140
- }
141
- }
142
- await typedi_1.Container.get(settings_repository_1.SettingsRepository).update({ key: constants_1.LDAP_FEATURE_NAME }, { value: JSON.stringify(ldapConfig), loadOnStartup: true });
143
- await (0, exports.setGlobalLdapConfigVariables)(ldapConfig);
144
- };
145
- exports.updateLdapConfig = updateLdapConfig;
146
- const handleLdapInit = async () => {
147
- if (!(0, exports.isLdapEnabled)())
148
- return;
149
- const ldapConfig = await (0, exports.getLdapConfig)();
150
- try {
151
- await (0, exports.setGlobalLdapConfigVariables)(ldapConfig);
152
- }
153
- catch (error) {
154
- typedi_1.Container.get(Logger_1.Logger).warn(`Cannot set LDAP login enabled state when an authentication method other than email or ldap is active (current: ${(0, ssoHelpers_1.getCurrentAuthenticationMethod)()})`, error);
155
- }
156
- LdapManager_ee_1.LdapManager.init(ldapConfig);
157
- };
158
- exports.handleLdapInit = handleLdapInit;
159
81
  const createFilter = (filter, userFilter) => {
160
82
  let _filter = `(&(|(objectClass=person)(objectClass=user))${filter})`;
161
83
  if (userFilter) {
@@ -168,43 +90,6 @@ const escapeFilter = (filter) => {
168
90
  return new Filter_1.Filter().escape(filter);
169
91
  };
170
92
  exports.escapeFilter = escapeFilter;
171
- const findAndAuthenticateLdapUser = async (loginId, password, loginIdAttribute, userFilter) => {
172
- const ldapService = LdapManager_ee_1.LdapManager.getInstance().service;
173
- let searchResult = [];
174
- try {
175
- searchResult = await ldapService.searchWithAdminBinding((0, exports.createFilter)(`(${loginIdAttribute}=${(0, exports.escapeFilter)(loginId)})`, userFilter));
176
- }
177
- catch (e) {
178
- if (e instanceof Error) {
179
- void typedi_1.Container.get(InternalHooks_1.InternalHooks).onLdapLoginSyncFailed({
180
- error: e.message,
181
- });
182
- typedi_1.Container.get(Logger_1.Logger).error('LDAP - Error during search', { message: e.message });
183
- }
184
- return undefined;
185
- }
186
- if (!searchResult.length) {
187
- return undefined;
188
- }
189
- let user = searchResult.pop();
190
- if (user === undefined) {
191
- user = { dn: '' };
192
- }
193
- try {
194
- await ldapService.validUser(user.dn, password);
195
- }
196
- catch (e) {
197
- if (e instanceof Error) {
198
- typedi_1.Container.get(Logger_1.Logger).error('LDAP - Error validating user against LDAP server', {
199
- message: e.message,
200
- });
201
- }
202
- return undefined;
203
- }
204
- resolveEntryBinaryAttributes(user);
205
- return user;
206
- };
207
- exports.findAndAuthenticateLdapUser = findAndAuthenticateLdapUser;
208
93
  const getAuthIdentityByLdapId = async (idAttributeValue) => {
209
94
  return typedi_1.Container.get(authIdentity_repository_1.AuthIdentityRepository).findOne({
210
95
  relations: ['user', 'user.globalRole'],
@@ -353,4 +238,5 @@ exports.updateLdapUserOnLocalDb = updateLdapUserOnLocalDb;
353
238
  const deleteAllLdapIdentities = async () => {
354
239
  return typedi_1.Container.get(authIdentity_repository_1.AuthIdentityRepository).delete({ providerType: 'ldap' });
355
240
  };
241
+ exports.deleteAllLdapIdentities = deleteAllLdapIdentities;
356
242
  //# sourceMappingURL=helpers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/Ldap/helpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kDAA+C;AAC/C,mCAAmC;AACnC,uCAAkC;AAClC,2CAAsC;AACtC,yCAA2B;AAC3B,sDAA8B;AAE9B,4CAAyC;AACzC,4DAAyD;AAEzD,qDAA+C;AAE/C,2CAMqB;AAErB,+CAA2D;AAC3D,uCAAoC;AACpC,mDAAgD;AAChD,iDAK0B;AAC1B,0DAAsD;AACtD,qCAAkC;AAClC,sEAAkE;AAClE,8EAA0E;AAC1E,4GAAwG;AACxG,sFAAkF;AAClF,kFAA6E;AAC7E,0FAAqF;AAK9E,MAAM,aAAa,GAAG,GAAG,EAAE;IACjC,OAAO,kBAAS,CAAC,GAAG,CAAC,iBAAO,CAAC,CAAC,aAAa,EAAE,CAAC;AAC/C,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAKK,MAAM,cAAc,GAAG,GAAY,EAAE,CAAC,CAAC,IAAA,qBAAa,GAAE,CAAC;AAAjD,QAAA,cAAc,kBAAmC;AAKvD,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAQ,EAAE;IACxD,gBAAM,CAAC,GAAG,CAAC,4BAAgB,EAAE,KAAK,CAAC,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,iBAAiB,qBAE5B;AAKK,KAAK,UAAU,mBAAmB,CAAC,OAAgB;IACzD,IAAI,IAAA,+CAAkC,GAAE,IAAI,IAAA,8CAAiC,GAAE,EAAE,CAAC;QACjF,IAAI,OAAO,EAAE,CAAC;YACb,gBAAM,CAAC,GAAG,CAAC,8BAAkB,EAAE,IAAI,CAAC,CAAC;YACrC,MAAM,IAAA,2CAA8B,EAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;aAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,gBAAM,CAAC,GAAG,CAAC,8BAAkB,EAAE,KAAK,CAAC,CAAC;YACtC,MAAM,IAAA,2CAA8B,EAAC,OAAO,CAAC,CAAC;QAC/C,CAAC;IACF,CAAC;SAAM,CAAC;QACP,MAAM,IAAI,2CAAmB,CAC5B,qHAAqH,IAAA,2CAA8B,GAAE,GAAG,CACxJ,CAAC;IACH,CAAC;AACF,CAAC;AAdD,kDAcC;AAKM,MAAM,iBAAiB,GAAG,GAAW,EAAE,CAAC,gBAAM,CAAC,MAAM,CAAC,4BAAgB,CAAC,CAAC;AAAlE,QAAA,iBAAiB,qBAAiD;AAKxE,MAAM,kBAAkB,GAAG,GAAY,EAAE,CAAC,gBAAM,CAAC,MAAM,CAAC,8BAAkB,CAAC,CAAC;AAAtE,QAAA,kBAAkB,sBAAoD;AAK5E,MAAM,cAAc,GAAG,GAAW,EAAE;IAC1C,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB;AAKK,MAAM,eAAe,GAAG,KAAK,IAAmB,EAAE;IACxD,OAAO,kBAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC,oBAAoB,EAAE,CAAC;AAC1D,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B;AAKK,MAAM,+BAA+B,GAAG,CAC9C,UAAsB,EACgB,EAAE;IACxC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAA,qBAAQ,EAAC,UAAU,EAAE,8BAAkB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAE3F,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAgB,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7F,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC3B,CAAC,CAAC;AAVW,QAAA,+BAA+B,mCAU1C;AAKK,MAAM,aAAa,GAAG,KAAK,IAAyB,EAAE;IAC5D,MAAM,aAAa,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,wCAAkB,CAAC,CAAC,eAAe,CAAC;QAC7E,GAAG,EAAE,6BAAiB;KACtB,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,IAAA,wBAAS,EAAa,aAAa,CAAC,KAAK,CAAC,CAAC;IACrE,iBAAiB,CAAC,oBAAoB,GAAG,kBAAS,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAC,OAAO,CACrE,iBAAiB,CAAC,oBAAoB,CACtC,CAAC;IACF,OAAO,iBAAiB,CAAC;AAC1B,CAAC,CAAC;AATW,QAAA,aAAa,iBASxB;AAKK,MAAM,4BAA4B,GAAG,KAAK,EAAE,UAAsB,EAAiB,EAAE;IAC3F,MAAM,mBAAmB,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACnD,IAAA,yBAAiB,EAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAC1C,CAAC,CAAC;AAHW,QAAA,4BAA4B,gCAGvC;AAEF,MAAM,4BAA4B,GAAG,CAAC,KAAe,EAAY,EAAE;IAClE,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;SACnB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gCAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SACjD,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;QAChB,KAAK,CAAC,CAAC,CAAC,GAAI,KAAK,CAAC,CAAC,CAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IACJ,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,uBAAuB,GAAG,CAAC,OAAmB,EAAQ,EAAE;IACpE,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAFW,QAAA,uBAAuB,2BAElC;AAKK,MAAM,gBAAgB,GAAG,KAAK,EAAE,UAAsB,EAAiB,EAAE;IAC/E,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAA,uCAA+B,EAAC,UAAU,CAAC,CAAC;IAEvE,IAAI,CAAC,KAAK,EAAE,CAAC;QACZ,MAAM,IAAI,+BAAgB,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,UAAU,CAAC,YAAY,IAAI,IAAA,2CAA8B,GAAE,KAAK,MAAM,EAAE,CAAC;QAC5E,MAAM,IAAI,mCAAe,CAAC,0CAA0C,CAAC,CAAC;IACvE,CAAC;IAED,4BAAW,CAAC,YAAY,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;IAE5C,UAAU,CAAC,oBAAoB,GAAG,kBAAS,CAAC,GAAG,CAAC,iBAAM,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAEjG,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;QAC9B,UAAU,CAAC,sBAAsB,GAAG,KAAK,CAAC;QAC1C,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAY,GAAE,CAAC;QACvC,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;YACtB,MAAM,uBAAuB,EAAE,CAAC;QACjC,CAAC;IACF,CAAC;IAED,MAAM,kBAAS,CAAC,GAAG,CAAC,wCAAkB,CAAC,CAAC,MAAM,CAC7C,EAAE,GAAG,EAAE,6BAAiB,EAAE,EAC1B,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAC1D,CAAC;IACF,MAAM,IAAA,oCAA4B,EAAC,UAAU,CAAC,CAAC;AAChD,CAAC,CAAC;AA5BW,QAAA,gBAAgB,oBA4B3B;AAMK,MAAM,cAAc,GAAG,KAAK,IAAmB,EAAE;IACvD,IAAI,CAAC,IAAA,qBAAa,GAAE;QAAE,OAAO;IAE7B,MAAM,UAAU,GAAG,MAAM,IAAA,qBAAa,GAAE,CAAC;IAEzC,IAAI,CAAC;QACJ,MAAM,IAAA,oCAA4B,EAAC,UAAU,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,kBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC,IAAI,CACzB,kHAAkH,IAAA,2CAA8B,GAAE,GAAG,EAErJ,KAAK,CACL,CAAC;IACH,CAAC;IAID,4BAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC9B,CAAC,CAAC;AAlBW,QAAA,cAAc,kBAkBzB;AAEK,MAAM,YAAY,GAAG,CAAC,MAAc,EAAE,UAAkB,EAAE,EAAE;IAClE,IAAI,OAAO,GAAG,8CAA8C,MAAM,GAAG,CAAC;IACtE,IAAI,UAAU,EAAE,CAAC;QAChB,OAAO,GAAG,KAAK,UAAU,GAAG,MAAM,EAAE,CAAC;IACtC,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC;AANW,QAAA,YAAY,gBAMvB;AAEK,MAAM,YAAY,GAAG,CAAC,MAAc,EAAU,EAAE;IAEtD,OAAO,IAAI,eAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACpC,CAAC,CAAC;AAHW,QAAA,YAAY,gBAGvB;AAKK,MAAM,2BAA2B,GAAG,KAAK,EAC/C,OAAe,EACf,QAAgB,EAChB,gBAAwB,EACxB,UAAkB,EACc,EAAE;IAClC,MAAM,WAAW,GAAG,4BAAW,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC;IAKtD,IAAI,YAAY,GAAe,EAAE,CAAC;IAElC,IAAI,CAAC;QACJ,YAAY,GAAG,MAAM,WAAW,CAAC,sBAAsB,CACtD,IAAA,oBAAY,EAAC,IAAI,gBAAgB,IAAI,IAAA,oBAAY,EAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAC1E,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;YACxB,KAAK,kBAAS,CAAC,GAAG,CAAC,6BAAa,CAAC,CAAC,qBAAqB,CAAC;gBACvD,KAAK,EAAE,CAAC,CAAC,OAAO;aAChB,CAAC,CAAC;YACH,kBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IAClB,CAAC;IAMD,IAAI,IAAI,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC;IAE9B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,IAAI,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,CAAC;QAIJ,MAAM,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACZ,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;YACxB,kBAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC,KAAK,CAAC,kDAAkD,EAAE;gBAC/E,OAAO,EAAE,CAAC,CAAC,OAAO;aAClB,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,4BAA4B,CAAC,IAAI,CAAC,CAAC;IAEnC,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AA1DW,QAAA,2BAA2B,+BA0DtC;AAKK,MAAM,uBAAuB,GAAG,KAAK,EAC3C,gBAAwB,EACO,EAAE;IACjC,OAAO,kBAAS,CAAC,GAAG,CAAC,gDAAsB,CAAC,CAAC,OAAO,CAAC;QACpD,SAAS,EAAE,CAAC,MAAM,EAAE,iBAAiB,CAAC;QACtC,KAAK,EAAE;YACN,UAAU,EAAE,gBAAgB;YAC5B,YAAY,EAAE,MAAM;SACpB;KACD,CAAC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,uBAAuB,2BAUlC;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,KAAa,EAAwB,EAAE;IAC3E,OAAO,kBAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,OAAO,CAAC;QAC5C,KAAK,EAAE,EAAE,KAAK,EAAE;QAChB,SAAS,EAAE,CAAC,YAAY,CAAC;KACzB,CAAC,CAAC;AACJ,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB;AAMK,MAAM,uBAAuB,GAAG,CACtC,QAAkB,EAClB,UAAsB,EACyD,EAAE;IACjF,OAAO;QACN,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAW;QAC9C;YACC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAW;YACpD,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAW;YAC5D,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAW;SAC1D;KACD,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,uBAAuB,2BAYlC;AAKK,MAAM,UAAU,GAAG,KAAK,IAAuB,EAAE;IACvD,MAAM,UAAU,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,gDAAsB,CAAC,CAAC,IAAI,CAAC;QACnE,MAAM,EAAE,CAAC,YAAY,CAAC;QACtB,KAAK,EAAE;YACN,YAAY,EAAE,MAAM;SACpB;KACD,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;AAC5C,CAAC,CAAC;AARW,QAAA,UAAU,cAQrB;AAEK,MAAM,YAAY,GAAG,KAAK,IAAqB,EAAE;IACvD,MAAM,UAAU,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,gDAAsB,CAAC,CAAC,IAAI,CAAC;QACnE,SAAS,EAAE,CAAC,MAAM,CAAC;QACnB,KAAK,EAAE;YACN,YAAY,EAAE,MAAM;SACpB;KACD,CAAC,CAAC;IACH,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB;AAKK,MAAM,mBAAmB,GAAG,CAClC,QAAkB,EAClB,UAAsB,EACtB,IAAW,EACM,EAAE;IACnB,MAAM,IAAI,GAAG,IAAI,WAAI,EAAE,CAAC;IACxB,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAA,+BAAuB,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACrE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC1B,IAAI,IAAI,EAAE,CAAC;QACV,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,IAAA,sBAAc,GAAE,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IACvB,CAAC;SAAM,CAAC;QACP,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACtB,CAAC;IACD,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC;AAhBW,QAAA,mBAAmB,uBAgB9B;AAOK,MAAM,YAAY,GAAG,KAAK,EAChC,aAAoC,EACpC,aAAoC,EACpC,cAAwB,EACR,EAAE;IAClB,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;QACjD,OAAO,OAAO,CAAC,GAAG,CAAC;YAClB,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;gBAC7C,MAAM,YAAY,GAAG,2BAAY,CAAC,MAAM,CAAC,MAAM,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;gBACtF,OAAO,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC9C,CAAC,CAAC;YACF,GAAG,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE;gBAC7C,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,SAAS,CAAC,2BAAY,EAAE;oBACrE,UAAU,EAAE,MAAM;iBAClB,CAAC,CAAC;gBACH,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE,CAAC;oBAC1B,MAAM,kBAAkB,CAAC,MAAM,CAC9B,WAAI,EACJ,EAAE,EAAE,EAAE,YAAY,CAAC,MAAM,EAAE,EAC3B,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CACzE,CAAC;gBACH,CAAC;YACF,CAAC,CAAC;YACF,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACtC,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,SAAS,CAAC,2BAAY,EAAE;oBACrE,UAAU,EAAE,MAAM;iBAClB,CAAC,CAAC;gBACH,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE,CAAC;oBAC1B,MAAM,kBAAkB,CAAC,MAAM,CAAC,WAAI,EAAE,EAAE,EAAE,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;oBACxF,MAAM,kBAAkB,CAAC,MAAM,CAAC,2BAAY,EAAE,EAAE,MAAM,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE,CAAC,CAAC;gBACjF,CAAC;YACF,CAAC,CAAC;SACF,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAlCW,QAAA,YAAY,gBAkCvB;AAKK,MAAM,uBAAuB,GAAG,KAAK,EAC3C,IAA0D,EAC1C,EAAE;IAClB,MAAM,kBAAS,CAAC,GAAG,CAAC,sEAAiC,CAAC,CAAC,IAAI,CAAC;QAC3D,GAAG,IAAI;QACP,YAAY,EAAE,MAAM;KACpB,CAAC,CAAC;AACJ,CAAC,CAAC;AAPW,QAAA,uBAAuB,2BAOlC;AAKK,MAAM,uBAAuB,GAAG,KAAK,EAC3C,IAAY,EACZ,OAAe,EACsB,EAAE;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,kBAAS,CAAC,GAAG,CAAC,sEAAiC,CAAC,CAAC,IAAI,CAAC;QAC5D,KAAK,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE;QAC/B,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;QACrB,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,KAAK,GAAG,OAAO;KACrB,CAAC,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,uBAAuB,2BAWlC;AAKK,MAAM,SAAS,GAAG,CAAC,GAAW,EAAE,IAAY,EAAE,QAA4B,EAAE,EAAE;IACpF,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/D,OAAO,GAAG,QAAQ,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;AACvC,CAAC,CAAC;AAHW,QAAA,SAAS,aAGpB;AAEK,MAAM,oBAAoB,GAAG,CAAC,UAAsB,EAAY,EAAE;IACxE,OAAO;QACN,UAAU,CAAC,cAAc;QACzB,UAAU,CAAC,eAAe;QAC1B,UAAU,CAAC,kBAAkB;QAC7B,UAAU,CAAC,iBAAiB;QAC5B,UAAU,CAAC,cAAc;KACzB,CAAC;AACH,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,MAAM,sBAAsB,GAAG,KAAK,EAAE,IAAU,EAAE,MAAc,EAAE,EAAE;IAC1E,OAAO,kBAAS,CAAC,GAAG,CAAC,gDAAsB,CAAC,CAAC,IAAI,CAAC,2BAAY,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AACtF,CAAC,CAAC;AAFW,QAAA,sBAAsB,0BAEjC;AAEK,MAAM,uBAAuB,GAAG,KAAK,EAAE,IAAU,EAAE,IAAmB,EAAE,MAAc,EAAE,EAAE;IAChG,MAAM,IAAI,GAAG,MAAM,kBAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,IAAI,CAAC;QACrD,QAAQ,EAAE,IAAA,sBAAc,GAAE;QAC1B,UAAU,EAAE,IAAI;QAChB,GAAG,IAAI;KACP,CAAC,CAAC;IACH,MAAM,IAAA,8BAAsB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAI,CAAC;AACb,CAAC,CAAC;AARW,QAAA,uBAAuB,2BAQlC;AAEK,MAAM,uBAAuB,GAAG,KAAK,EAAE,QAAsB,EAAE,IAAmB,EAAE,EAAE;;IAC5F,MAAM,MAAM,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,0CAAE,EAAE,CAAC;IAClC,IAAI,MAAM,EAAE,CAAC;QACZ,MAAM,kBAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;AACF,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEF,MAAM,uBAAuB,GAAG,KAAK,IAAI,EAAE;IAC1C,OAAO,kBAAS,CAAC,GAAG,CAAC,gDAAsB,CAAC,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;AAC/E,CAAC,CAAC"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/Ldap/helpers.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,13 @@
1
- import { LdapConfiguration } from '../Ldap/types';
2
1
  import { InternalHooks } from '../InternalHooks';
2
+ import { LdapConfiguration } from './types';
3
+ import { LdapService } from './ldap.service';
3
4
  export declare class LdapController {
4
5
  private readonly internalHooks;
5
- private ldapService;
6
- private ldapSync;
7
- constructor(internalHooks: InternalHooks);
8
- getConfig(): Promise<import("../Ldap/types").LdapConfig>;
6
+ private readonly ldapService;
7
+ constructor(internalHooks: InternalHooks, ldapService: LdapService);
8
+ getConfig(): Promise<import("./types").LdapConfig>;
9
9
  testConnection(): Promise<void>;
10
- updateConfig(req: LdapConfiguration.Update): Promise<import("../Ldap/types").LdapConfig>;
10
+ updateConfig(req: LdapConfiguration.Update): Promise<import("./types").LdapConfig>;
11
11
  getLdapSync(req: LdapConfiguration.GetSync): Promise<import("../databases/entities/AuthProviderSyncHistory").AuthProviderSyncHistory[]>;
12
12
  syncLdap(req: LdapConfiguration.Sync): Promise<void>;
13
13
  }
@@ -15,20 +15,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.LdapController = void 0;
16
16
  const pick_1 = __importDefault(require("lodash/pick"));
17
17
  const decorators_1 = require("../decorators");
18
- const helpers_1 = require("../Ldap/helpers");
19
- const LdapManager_ee_1 = require("../Ldap/LdapManager.ee");
20
- const constants_1 = require("../Ldap/constants");
21
18
  const InternalHooks_1 = require("../InternalHooks");
22
19
  const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
20
+ const constants_1 = require("./constants");
21
+ const helpers_1 = require("./helpers");
22
+ const ldap_service_1 = require("./ldap.service");
23
23
  let LdapController = class LdapController {
24
- constructor(internalHooks) {
24
+ constructor(internalHooks, ldapService) {
25
25
  this.internalHooks = internalHooks;
26
- const { service, sync } = LdapManager_ee_1.LdapManager.getInstance();
27
- this.ldapService = service;
28
- this.ldapSync = sync;
26
+ this.ldapService = ldapService;
29
27
  }
30
28
  async getConfig() {
31
- return (0, helpers_1.getLdapConfig)();
29
+ return this.ldapService.loadConfig();
32
30
  }
33
31
  async testConnection() {
34
32
  try {
@@ -40,12 +38,12 @@ let LdapController = class LdapController {
40
38
  }
41
39
  async updateConfig(req) {
42
40
  try {
43
- await (0, helpers_1.updateLdapConfig)(req.body);
41
+ await this.ldapService.updateConfig(req.body);
44
42
  }
45
43
  catch (error) {
46
44
  throw new bad_request_error_1.BadRequestError(error.message);
47
45
  }
48
- const data = await (0, helpers_1.getLdapConfig)();
46
+ const data = await this.ldapService.loadConfig();
49
47
  void this.internalHooks.onUserUpdatedLdapSettings({
50
48
  user_id: req.user.id,
51
49
  ...(0, pick_1.default)(data, constants_1.NON_SENSIBLE_LDAP_CONFIG_PROPERTIES),
@@ -58,7 +56,7 @@ let LdapController = class LdapController {
58
56
  }
59
57
  async syncLdap(req) {
60
58
  try {
61
- await this.ldapSync.run(req.body.type);
59
+ await this.ldapService.runSync(req.body.type);
62
60
  }
63
61
  catch (error) {
64
62
  throw new bad_request_error_1.BadRequestError(error.message);
@@ -104,6 +102,7 @@ __decorate([
104
102
  exports.LdapController = LdapController = __decorate([
105
103
  (0, decorators_1.Authorized)(),
106
104
  (0, decorators_1.RestController)('/ldap'),
107
- __metadata("design:paramtypes", [InternalHooks_1.InternalHooks])
105
+ __metadata("design:paramtypes", [InternalHooks_1.InternalHooks,
106
+ ldap_service_1.LdapService])
108
107
  ], LdapController);
109
108
  //# sourceMappingURL=ldap.controller.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ldap.controller.js","sourceRoot":"","sources":["../../src/Ldap/ldap.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uDAA+B;AAC/B,6CAA8F;AAC9F,mDAAgD;AAChD,kFAA6E;AAE7E,2CAAkE;AAClE,uCAAoD;AAEpD,iDAA6C;AAItC,IAAM,cAAc,GAApB,MAAM,cAAc;IAC1B,YACkB,aAA4B,EAC5B,WAAwB;QADxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAIE,AAAN,KAAK,CAAC,SAAS;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAIK,AAAN,KAAK,CAAC,cAAc;QACnB,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mCAAe,CAAE,KAA6B,CAAC,OAAO,CAAC,CAAC;QACnE,CAAC;IACF,CAAC;IAIK,AAAN,KAAK,CAAC,YAAY,CAAC,GAA6B;QAC/C,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mCAAe,CAAE,KAA6B,CAAC,OAAO,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAEjD,KAAK,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC;YACjD,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;YACpB,GAAG,IAAA,cAAI,EAAC,IAAI,EAAE,+CAAmC,CAAC;SAClD,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACb,CAAC;IAIK,AAAN,KAAK,CAAC,WAAW,CAAC,GAA8B;QAC/C,MAAM,EAAE,IAAI,GAAG,GAAG,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QACjD,OAAO,IAAA,iCAAuB,EAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3E,CAAC;IAIK,AAAN,KAAK,CAAC,QAAQ,CAAC,GAA2B;QACzC,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mCAAe,CAAE,KAA6B,CAAC,OAAO,CAAC,CAAC;QACnE,CAAC;IACF,CAAC;CACD,CAAA;AAzDY,wCAAc;AAQpB;IAFL,IAAA,gBAAG,EAAC,SAAS,CAAC;IACd,IAAA,+BAAkB,EAAC,aAAa,CAAC;;;;+CAGjC;AAIK;IAFL,IAAA,iBAAI,EAAC,kBAAkB,CAAC;IACxB,IAAA,+BAAkB,EAAC,aAAa,CAAC;;;;oDAOjC;AAIK;IAFL,IAAA,gBAAG,EAAC,SAAS,CAAC;IACd,IAAA,+BAAkB,EAAC,aAAa,CAAC;;;;kDAgBjC;AAIK;IAFL,IAAA,gBAAG,EAAC,OAAO,CAAC;IACZ,IAAA,+BAAkB,EAAC,WAAW,CAAC;;;;iDAI/B;AAIK;IAFL,IAAA,iBAAI,EAAC,OAAO,CAAC;IACb,IAAA,+BAAkB,EAAC,WAAW,CAAC;;;;8CAO/B;yBAxDW,cAAc;IAF1B,IAAA,uBAAU,GAAE;IACZ,IAAA,2BAAc,EAAC,OAAO,CAAC;qCAGU,6BAAa;QACf,0BAAW;GAH9B,cAAc,CAyD1B"}
@@ -0,0 +1,36 @@
1
+ import type { Entry as LdapUser } from 'ldapts';
2
+ import { Cipher } from 'n8n-core';
3
+ import type { RunningMode } from '../databases/entities/AuthProviderSyncHistory';
4
+ import { SettingsRepository } from '../databases/repositories/settings.repository';
5
+ import { InternalHooks } from '../InternalHooks';
6
+ import { Logger } from '../Logger';
7
+ import type { LdapConfig } from './types';
8
+ export declare class LdapService {
9
+ private readonly logger;
10
+ private readonly internalHooks;
11
+ private readonly settingsRepository;
12
+ private readonly cipher;
13
+ private client;
14
+ private syncTimer;
15
+ config: LdapConfig;
16
+ constructor(logger: Logger, internalHooks: InternalHooks, settingsRepository: SettingsRepository, cipher: Cipher);
17
+ init(): Promise<void>;
18
+ loadConfig(): Promise<LdapConfig>;
19
+ updateConfig(ldapConfig: LdapConfig): Promise<void>;
20
+ setConfig(ldapConfig: LdapConfig): void;
21
+ private setGlobalLdapConfigVariables;
22
+ private setLdapLoginEnabled;
23
+ private getClient;
24
+ private bindAdmin;
25
+ searchWithAdminBinding(filter: string): Promise<LdapUser[]>;
26
+ validUser(dn: string, password: string): Promise<void>;
27
+ findAndAuthenticateLdapUser(loginId: string, password: string, loginIdAttribute: string, userFilter: string): Promise<LdapUser | undefined>;
28
+ testConnection(): Promise<void>;
29
+ private scheduleSync;
30
+ runSync(mode: RunningMode): Promise<void>;
31
+ stopSync(): void;
32
+ private getUsersToProcess;
33
+ private getUsersToCreate;
34
+ private getUsersToUpdate;
35
+ private getUsersToDisable;
36
+ }