n8n 1.68.0 → 1.69.0

package/dist/commands/worker.js

@@ -117,6 +117,9 @@ class Worker extends base_command_1.BaseCommand {
         const { flags } = await this.parse(Worker);
         const envConcurrency = config_1.default.getEnv('executions.concurrency.productionLimit');
         this.concurrency = envConcurrency !== -1 ? envConcurrency : flags.concurrency;
+        if (this.concurrency < 5) {
+            this.logger.warn('Concurrency is set to less than 5. THIS CAN LEAD TO AN UNSTABLE ENVIRONMENT. Please consider increasing it to at least 5 to make best use of the worker.');
+        }
     }
     async initScalingService() {
         const { ScalingService } = await Promise.resolve().then(() => __importStar(require('../scaling/scaling.service')));

package/dist/commands/worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/commands/worker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/commands/worker.ts"],"names":[],"mappings":"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"}

package/dist/config/index.d.ts

@@ -63,17 +63,6 @@ declare const config: convict.Config<{
     personalization: {
         enabled: boolean;
     };
-    diagnostics: {
-        enabled: boolean;
-        config: {
-            posthog: {
-                apiKey: any;
-                apiHost: any;
-            };
-            frontend: string;
-            backend: string;
-        };
-    };
     defaultLocale: string;
     hideUsagePage: boolean;
     redis: {

package/dist/config/index.js

@@ -24,6 +24,7 @@ else if (constants_1.inTest) {
     process.env.N8N_PUBLIC_API_DISABLED = 'true';
     process.env.SKIP_STATISTICS_EVENTS = 'true';
     process.env.N8N_SECURE_COOKIE = 'false';
+    process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK = 'true';
 }
 const schema_1 = require("./schema");
 const config = (0, convict_1.default)(schema_1.schema, { args: [] });

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;AAAA,wCAA2C;AAC3C,sDAA8B;AAC9B,+BAA+B;AAC/B,2BAAkC;AAClC,yDAAiC;AACjC,+CAAgE;AAChE,4DAAgC;AAChC,mCAAmC;AAEnC,2CAAiD;AAEjD,IAAI,sBAAU,EAAE,CAAC;IAEhB,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,OAAO,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,MAAM,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,EAAE,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,2BAA2B,GAAG,OAAO,CAAC;IAClD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,MAAM,CAAC;AACrC,CAAC;KAAM,IAAI,kBAAM,EAAE,CAAC;IACnB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC;IACrC,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,MAAM,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,sBAAsB,GAAG,MAAM,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,OAAO,CAAC;AACzC,CAAC;AAGD,qCAAkC;AAClC,MAAM,MAAM,GAAG,IAAA,iBAAO,EAAC,eAAM,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;AAG7C,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC;AAG3B,IAAI,CAAC,sBAAU,IAAI,CAAC,kBAAM,EAAE,CAAC;IAG5B,MAAM,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IACzC,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,kBAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC;QACjD,MAAM,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YACtC,IAAI,CAAC,UAAU;gBAAE,SAAS;YAE1B,IAAI,CAAC;gBAEJ,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC1D,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;oBAE3B,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;oBAC/B,IAAI,MAAM,IAAI,YAAY,EAAE,CAAC;wBAE5B,IAAA,eAAK,EAAC,YAAY,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;oBACxC,CAAC;yBAAM,CAAC;wBACP,MAAM,aAAa,GAA2B,IAAA,cAAO,EAAC,SAAS,CAAC,CAAC;wBACjE,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;4BACjC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;wBACpD,CAAC;oBACF,CAAC;gBACF,CAAC;gBACD,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;YAC5D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YAC/D,CAAC;QACF,CAAC;IACF,CAAC;IAGD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE;QAC3D,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,QAAQ,EAAE,CAAC;YAC3C,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAGpD,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAW,CAAC;YACtD,IAAI,GAAG,EAAE,CAAC;gBACT,IAAI,KAAa,CAAC;gBAClB,IAAI,CAAC;oBACJ,KAAK,GAAG,IAAA,iBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBACxC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAEhB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC7B,MAAM,IAAI,+BAAgB,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;oBACvE,CAAC;oBACD,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACxB,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAGD,MAAM,CAAC,QAAQ,CAAC;IACf,OAAO,EAAE,QAAQ;CACjB,CAAC,CAAC;AACH,MAAM,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AACpD,IAAI,cAAc,CAAC,sBAAsB,IAAI,cAAc,CAAC,uBAAuB,EAAE,CAAC;IACrF,IAAI,CAAC,kBAAM;QACV,OAAO,CAAC,IAAI,CACX,iLAAiL,CACjL,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAC7D,IAAI,gBAAgB,EAAE,CAAC;IACtB,OAAO,CAAC,KAAK,CACZ,oBAAM,CAAC,MAAM,CAAC,0CAA0C,CAAC,EACzD,oBAAM,CAAC,IAAI,CAAC,oBAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAChD,CAAC;AACH,CAAC;AACD,IAAI,gBAAgB,KAAK,KAAK,EAAE,CAAC;IAChC,OAAO,CAAC,KAAK,CACZ,oBAAM,CAAC,IAAI,CAAC,oBAAM,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC,CAC3F,CAAC;IACF,OAAO,CAAC,KAAK,CACZ,oBAAM,CAAC,GAAG,CACT,gGAAgG,CAChG,CACD,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC;AAED,IAAA,6BAAc,EAAC;IACd,eAAe,EAAE,kBAAS,CAAC,GAAG,CAAC,qBAAY,CAAC,CAAC,OAAO,CAAC,QAAQ;CAC7D,CAAC,CAAC;AAGH,kBAAe,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"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"}

package/dist/config/schema.d.ts

@@ -235,42 +235,6 @@ export declare const schema: {
             env: string;
         };
     };
-    diagnostics: {
-        enabled: {
-            doc: string;
-            format: BooleanConstructor;
-            default: boolean;
-            env: string;
-        };
-        config: {
-            posthog: {
-                apiKey: {
-                    doc: string;
-                    format: StringConstructor;
-                    default: string;
-                    env: string;
-                };
-                apiHost: {
-                    doc: string;
-                    format: StringConstructor;
-                    default: string;
-                    env: string;
-                };
-            };
-            frontend: {
-                doc: string;
-                format: StringConstructor;
-                default: string;
-                env: string;
-            };
-            backend: {
-                doc: string;
-                format: StringConstructor;
-                default: string;
-                env: string;
-            };
-        };
-    };
     defaultLocale: {
         doc: string;
         format: StringConstructor;

package/dist/config/schema.js

@@ -252,42 +252,6 @@ exports.schema = {
             env: 'N8N_PERSONALIZATION_ENABLED',
         },
     },
-    diagnostics: {
-        enabled: {
-            doc: 'Whether diagnostic mode is enabled.',
-            format: Boolean,
-            default: true,
-            env: 'N8N_DIAGNOSTICS_ENABLED',
-        },
-        config: {
-            posthog: {
-                apiKey: {
-                    doc: 'API key for PostHog',
-                    format: String,
-                    default: 'phc_4URIAm1uYfJO7j8kWSe0J8lc8IqnstRLS7Jx8NcakHo',
-                    env: 'N8N_DIAGNOSTICS_POSTHOG_API_KEY',
-                },
-                apiHost: {
-                    doc: 'API host for PostHog',
-                    format: String,
-                    default: 'https://ph.n8n.io',
-                    env: 'N8N_DIAGNOSTICS_POSTHOG_API_HOST',
-                },
-            },
-            frontend: {
-                doc: 'Diagnostics config for frontend.',
-                format: String,
-                default: '1zPn9bgWPzlQc0p8Gj1uiK6DOTn;https://telemetry.n8n.io',
-                env: 'N8N_DIAGNOSTICS_CONFIG_FRONTEND',
-            },
-            backend: {
-                doc: 'Diagnostics config for backend.',
-                format: String,
-                default: '1zPn7YoGC3ZXE9zLeTKLuQCB4F6;https://telemetry.n8n.io',
-                env: 'N8N_DIAGNOSTICS_CONFIG_BACKEND',
-            },
-        },
-    },
     defaultLocale: {
         doc: 'Default locale for the UI',
         format: String,

package/dist/config/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/config/schema.ts"],"names":[],"mappings":"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"}

package/dist/constants.d.ts

@@ -78,15 +78,10 @@ export declare const LICENSE_QUOTAS: {
 export declare const UNLIMITED_LICENSE_QUOTA = -1;
 export declare const CREDENTIAL_BLANKING_VALUE = "__n8n_BLANK_VALUE_e5362baf-c777-4d57-a609-6eaf1f9e87f6";
 export declare const UM_FIX_INSTRUCTION = "Please fix the database by running ./packages/cli/bin/n8n user-management:reset";
-export declare const TIME: {
-    readonly SECOND: 1000;
-    readonly MINUTE: number;
-    readonly HOUR: number;
-    readonly DAY: number;
-};
 export declare const Time: {
     milliseconds: {
         toMinutes: number;
+        toSeconds: number;
     };
     seconds: {
         toMilliseconds: number;

package/dist/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HIGHEST_SHUTDOWN_PRIORITY = exports.DEFAULT_SHUTDOWN_PRIORITY = exports.LOWEST_SHUTDOWN_PRIORITY = exports.ARTIFICIAL_TASK_DATA = exports.GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE = exports.TEST_WEBHOOK_TIMEOUT_BUFFER = exports.TEST_WEBHOOK_TIMEOUT = exports.MAX_PASSWORD_CHAR_LENGTH = exports.MIN_PASSWORD_CHAR_LENGTH = exports.Time = exports.TIME = exports.UM_FIX_INSTRUCTION = exports.CREDENTIAL_BLANKING_VALUE = exports.UNLIMITED_LICENSE_QUOTA = exports.LICENSE_QUOTAS = exports.LICENSE_FEATURES = exports.SETTINGS_LICENSE_CERT_KEY = exports.WORKFLOW_REACTIVATE_MAX_TIMEOUT = exports.WORKFLOW_REACTIVATE_INITIAL_TIMEOUT = exports.UNKNOWN_FAILURE_REASON = exports.NPM_PACKAGE_STATUS_GOOD = exports.NPM_COMMAND_TOKENS = exports.AUTH_COOKIE_NAME = exports.RESPONSE_ERROR_MESSAGES = exports.STARTER_TEMPLATE_NAME = exports.NODE_PACKAGE_PREFIX = exports.N8N_VERSION = exports.STARTING_NODES = exports.EDITOR_UI_DIST_DIR = exports.NODES_BASE_DIR = exports.TEMPLATES_DIR = exports.CLI_DIR = exports.CUSTOM_API_CALL_KEY = exports.CUSTOM_API_CALL_NAME = exports.inE2ETests = exports.inTest = exports.inDevelopment = exports.inProduction = void 0;
+exports.HIGHEST_SHUTDOWN_PRIORITY = exports.DEFAULT_SHUTDOWN_PRIORITY = exports.LOWEST_SHUTDOWN_PRIORITY = exports.ARTIFICIAL_TASK_DATA = exports.GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE = exports.TEST_WEBHOOK_TIMEOUT_BUFFER = exports.TEST_WEBHOOK_TIMEOUT = exports.MAX_PASSWORD_CHAR_LENGTH = exports.MIN_PASSWORD_CHAR_LENGTH = exports.Time = exports.UM_FIX_INSTRUCTION = exports.CREDENTIAL_BLANKING_VALUE = exports.UNLIMITED_LICENSE_QUOTA = exports.LICENSE_QUOTAS = exports.LICENSE_FEATURES = exports.SETTINGS_LICENSE_CERT_KEY = exports.WORKFLOW_REACTIVATE_MAX_TIMEOUT = exports.WORKFLOW_REACTIVATE_INITIAL_TIMEOUT = exports.UNKNOWN_FAILURE_REASON = exports.NPM_PACKAGE_STATUS_GOOD = exports.NPM_COMMAND_TOKENS = exports.AUTH_COOKIE_NAME = exports.RESPONSE_ERROR_MESSAGES = exports.STARTER_TEMPLATE_NAME = exports.NODE_PACKAGE_PREFIX = exports.N8N_VERSION = exports.STARTING_NODES = exports.EDITOR_UI_DIST_DIR = exports.NODES_BASE_DIR = exports.TEMPLATES_DIR = exports.CLI_DIR = exports.CUSTOM_API_CALL_KEY = exports.CUSTOM_API_CALL_NAME = exports.inE2ETests = exports.inTest = exports.inDevelopment = exports.inProduction = void 0;
 exports.getN8nPackageJson = getN8nPackageJson;
 const fs_1 = require("fs");
 const n8n_workflow_1 = require("n8n-workflow");
@@ -91,15 +91,10 @@ exports.LICENSE_QUOTAS = {
 exports.UNLIMITED_LICENSE_QUOTA = -1;
 exports.CREDENTIAL_BLANKING_VALUE = '__n8n_BLANK_VALUE_e5362baf-c777-4d57-a609-6eaf1f9e87f6';
 exports.UM_FIX_INSTRUCTION = 'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
-exports.TIME = {
-    SECOND: 1000,
-    MINUTE: 60 * 1000,
-    HOUR: 60 * 60 * 1000,
-    DAY: 24 * 60 * 60 * 1000,
-};
 exports.Time = {
     milliseconds: {
         toMinutes: 1 / (60 * 1000),
+        toSeconds: 1 / 1000,
     },
     seconds: {
         toMilliseconds: 1000,
@@ -118,8 +113,8 @@ exports.Time = {
 };
 exports.MIN_PASSWORD_CHAR_LENGTH = 8;
 exports.MAX_PASSWORD_CHAR_LENGTH = 64;
-exports.TEST_WEBHOOK_TIMEOUT = 2 * exports.TIME.MINUTE;
-exports.TEST_WEBHOOK_TIMEOUT_BUFFER = 30 * exports.TIME.SECOND;
+exports.TEST_WEBHOOK_TIMEOUT = 2 * exports.Time.minutes.toMilliseconds;
+exports.TEST_WEBHOOK_TIMEOUT_BUFFER = 30 * exports.Time.seconds.toMilliseconds;
 exports.GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE = [
     'oAuth2Api',
     'googleOAuth2Api',

package/dist/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}

package/dist/controllers/oauth/abstract-oauth.controller.d.ts

@@ -8,12 +8,15 @@ import { SharedCredentialsRepository } from '../../databases/repositories/shared
 import { ExternalHooks } from '../../external-hooks';
 import type { ICredentialsDb } from '../../interfaces';
 import { Logger } from '../../logging/logger.service';
-import type { OAuthRequest } from '../../requests';
+import type { AuthenticatedRequest, OAuthRequest } from '../../requests';
 import { UrlService } from '../../services/url.service';
-export interface CsrfStateParam {
+type CsrfStateParam = {
     cid: string;
     token: string;
-}
+    createdAt: number;
+    userId?: string;
+};
+export declare const skipAuthOnOAuthCallback: boolean;
 export declare abstract class AbstractOAuthController {
     protected readonly logger: Logger;
     protected readonly externalHooks: ExternalHooks;
@@ -31,8 +34,12 @@ export declare abstract class AbstractOAuthController {
     protected applyDefaultsAndOverwrites<T>(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): T;
     protected encryptAndSaveData(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject): Promise<void>;
     protected getCredentialWithoutUser(credentialId: string): Promise<ICredentialsDb | null>;
-    createCsrfState(credentialsId: string): [string, string];
-    protected decodeCsrfState(encodedState: string): CsrfStateParam;
-    protected verifyCsrfState(decrypted: ICredentialDataDecryptedObject, state: CsrfStateParam): boolean;
+    createCsrfState(credentialsId: string, userId?: string): [string, string];
+    protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfStateParam;
+    protected verifyCsrfState(decrypted: ICredentialDataDecryptedObject & {
+        csrfSecret?: string;
+    }, state: CsrfStateParam): boolean;
+    protected resolveCredential<T>(req: OAuthRequest.OAuth1Credential.Callback | OAuthRequest.OAuth2Credential.Callback): Promise<[ICredentialsDb, ICredentialDataDecryptedObject, T]>;
     protected renderCallbackError(res: Response, message: string, reason?: string): void;
 }
+export {};

package/dist/controllers/oauth/abstract-oauth.controller.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractOAuthController = void 0;
+exports.AbstractOAuthController = exports.skipAuthOnOAuthCallback = void 0;
 const config_1 = require("@n8n/config");
 const csrf_1 = __importDefault(require("csrf"));
 const n8n_core_1 = require("n8n-core");
@@ -45,12 +45,15 @@ const constants_1 = require("../../constants");
 const credentials_helper_1 = require("../../credentials-helper");
 const credentials_repository_1 = require("../../databases/repositories/credentials.repository");
 const shared_credentials_repository_1 = require("../../databases/repositories/shared-credentials.repository");
+const auth_error_1 = require("../../errors/response-errors/auth.error");
 const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
 const not_found_error_1 = require("../../errors/response-errors/not-found.error");
 const external_hooks_1 = require("../../external-hooks");
 const logger_service_1 = require("../../logging/logger.service");
 const url_service_1 = require("../../services/url.service");
 const WorkflowExecuteAdditionalData = __importStar(require("../../workflow-execute-additional-data"));
+const MAX_CSRF_AGE = 5 * constants_1.Time.minutes.toMilliseconds;
+exports.skipAuthOnOAuthCallback = process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK !== 'true';
 let AbstractOAuthController = class AbstractOAuthController {
     constructor(logger, externalHooks, credentialsHelper, credentialsRepository, sharedCredentialsRepository, urlService, globalConfig) {
         this.logger = logger;
@@ -97,16 +100,18 @@ let AbstractOAuthController = class AbstractOAuthController {
     async getCredentialWithoutUser(credentialId) {
         return await this.credentialsRepository.findOneBy({ id: credentialId });
     }
-    createCsrfState(credentialsId) {
+    createCsrfState(credentialsId, userId) {
         const token = new csrf_1.default();
         const csrfSecret = token.secretSync();
         const state = {
             token: token.create(csrfSecret),
             cid: credentialsId,
+            createdAt: Date.now(),
+            userId,
         };
         return [csrfSecret, Buffer.from(JSON.stringify(state)).toString('base64')];
     }
-    decodeCsrfState(encodedState) {
+    decodeCsrfState(encodedState, req) {
         const errorMessage = 'Invalid state format';
         const decoded = (0, n8n_workflow_1.jsonParse)(Buffer.from(encodedState, 'base64').toString(), {
             errorMessage,
@@ -114,12 +119,31 @@ let AbstractOAuthController = class AbstractOAuthController {
         if (typeof decoded.cid !== 'string' || typeof decoded.token !== 'string') {
             throw new n8n_workflow_1.ApplicationError(errorMessage);
         }
+        if (decoded.userId !== req.user?.id) {
+            throw new auth_error_1.AuthError('Unauthorized');
+        }
         return decoded;
     }
     verifyCsrfState(decrypted, state) {
         const token = new csrf_1.default();
-        return (decrypted.csrfSecret === undefined ||
-            !token.verify(decrypted.csrfSecret, state.token));
+        return (Date.now() - state.createdAt <= MAX_CSRF_AGE &&
+            decrypted.csrfSecret !== undefined &&
+            token.verify(decrypted.csrfSecret, state.token));
+    }
+    async resolveCredential(req) {
+        const { state: encodedState } = req.query;
+        const state = this.decodeCsrfState(encodedState, req);
+        const credential = await this.getCredentialWithoutUser(state.cid);
+        if (!credential) {
+            throw new n8n_workflow_1.ApplicationError('OAuth callback failed because of insufficient permissions');
+        }
+        const additionalData = await this.getAdditionalData();
+        const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+        const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
+        if (!this.verifyCsrfState(decryptedDataOriginal, state)) {
+            throw new n8n_workflow_1.ApplicationError('The OAuth callback state is invalid!');
+        }
+        return [credential, decryptedDataOriginal, oauthCredentials];
     }
     renderCallbackError(res, message, reason) {
         res.render('oauth-error-callback', { error: { message, reason } });

package/dist/controllers/oauth/abstract-oauth.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract-oauth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstract-oauth.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"abstract-oauth.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/abstract-oauth.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/oauth/oauth1-credential.controller.js

@@ -15,10 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth1CredentialController = void 0;
 const axios_1 = __importDefault(require("axios"));
 const crypto_1 = require("crypto");
+const n8n_workflow_1 = require("n8n-workflow");
 const oauth_1_0a_1 = __importDefault(require("oauth-1.0a"));
 const decorators_1 = require("../../decorators");
-const not_found_error_1 = require("../../errors/response-errors/not-found.error");
-const response_helper_1 = require("../../response-helper");
 const abstract_oauth_controller_1 = require("./abstract-oauth.controller");
 const algorithmMap = {
     'HMAC-SHA256': 'sha256',
@@ -35,7 +34,7 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
         const additionalData = await this.getAdditionalData();
         const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
         const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
-        const [csrfSecret, state] = this.createCsrfState(credential.id);
+        const [csrfSecret, state] = this.createCsrfState(credential.id, abstract_oauth_controller_1.skipAuthOnOAuthCallback ? undefined : req.user.id);
         const signatureMethod = oauthCredentials.signatureMethod;
         const oAuthOptions = {
             consumer: {
@@ -78,57 +77,24 @@ let OAuth1CredentialController = class OAuth1CredentialController extends abstra
             if (!oauth_verifier || !oauth_token || !encodedState) {
                 return this.renderCallbackError(res, 'Insufficient parameters for OAuth1 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
             }
-            let state;
-            try {
-                state = this.decodeCsrfState(encodedState);
-            }
-            catch (error) {
-                return this.renderCallbackError(res, error.message);
-            }
-            const credentialId = state.cid;
-            const credential = await this.getCredentialWithoutUser(credentialId);
-            if (!credential) {
-                const errorMessage = 'OAuth1 callback failed because of insufficient permissions';
-                this.logger.error(errorMessage, { credentialId });
-                return this.renderCallbackError(res, errorMessage);
-            }
-            const additionalData = await this.getAdditionalData();
-            const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
-            const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
-            if (this.verifyCsrfState(decryptedDataOriginal, state)) {
-                const errorMessage = 'The OAuth1 callback state is invalid!';
-                this.logger.debug(errorMessage, { credentialId });
-                return this.renderCallbackError(res, errorMessage);
-            }
-            const options = {
-                method: 'POST',
-                url: oauthCredentials.accessTokenUrl,
-                params: {
-                    oauth_token,
-                    oauth_verifier,
-                },
-            };
-            let oauthToken;
-            try {
-                oauthToken = await axios_1.default.request(options);
-            }
-            catch (error) {
-                this.logger.error('Unable to fetch tokens for OAuth1 callback', { credentialId });
-                const errorResponse = new not_found_error_1.NotFoundError('Unable to get access tokens!');
-                return (0, response_helper_1.sendErrorResponse)(res, errorResponse);
-            }
+            const [credential, decryptedDataOriginal, oauthCredentials] = await this.resolveCredential(req);
+            const oauthToken = await axios_1.default.post(oauthCredentials.accessTokenUrl, {
+                oauth_token,
+                oauth_verifier,
+            });
             const paramParser = new URLSearchParams(oauthToken.data);
             const oauthTokenJson = Object.fromEntries(paramParser.entries());
+            delete decryptedDataOriginal.csrfSecret;
             decryptedDataOriginal.oauthTokenData = oauthTokenJson;
             await this.encryptAndSaveData(credential, decryptedDataOriginal);
             this.logger.debug('OAuth1 callback successful for new credential', {
-                credentialId,
+                credentialId: credential.id,
             });
             return res.render('oauth-callback');
         }
-        catch (error) {
-            this.logger.error('OAuth1 callback failed because of insufficient user permissions');
-            return (0, response_helper_1.sendErrorResponse)(res, error);
+        catch (e) {
+            const error = (0, n8n_workflow_1.ensureError)(e);
+            return this.renderCallbackError(res, error.message, 'body' in error ? (0, n8n_workflow_1.jsonStringify)(error.body) : undefined);
         }
     }
 };
@@ -140,7 +106,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], OAuth1CredentialController.prototype, "getAuthUri", null);
 __decorate([
-    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: true }),
+    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: abstract_oauth_controller_1.skipAuthOnOAuthCallback }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)

package/dist/controllers/oauth/oauth1-credential.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth1-credential.controller.js","sourceRoot":"","sources":["../../../src/controllers/oauth/oauth1-credential.controller.ts"],"names":[],"mappings":"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"}

package/dist/controllers/oauth/oauth2-credential.controller.js

@@ -43,9 +43,9 @@ const split_1 = __importDefault(require("lodash/split"));
 const n8n_workflow_1 = require("n8n-workflow");
 const pkce_challenge_1 = __importDefault(require("pkce-challenge"));
 const qs = __importStar(require("querystring"));
+const constants_1 = require("../../constants");
 const decorators_1 = require("../../decorators");
 const abstract_oauth_controller_1 = require("./abstract-oauth.controller");
-const constants_1 = require("../../constants");
 let OAuth2CredentialController = class OAuth2CredentialController extends abstract_oauth_controller_1.AbstractOAuthController {
     constructor() {
         super(...arguments);
@@ -61,7 +61,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             delete decryptedDataOriginal.scope;
         }
         const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
-        const [csrfSecret, state] = this.createCsrfState(credential.id);
+        const [csrfSecret, state] = this.createCsrfState(credential.id, abstract_oauth_controller_1.skipAuthOnOAuthCallback ? undefined : req.user.id);
         const oAuthOptions = {
             ...this.convertCredentialToOptions(oauthCredentials),
             state,
@@ -95,28 +95,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             if (!code || !encodedState) {
                 return this.renderCallbackError(res, 'Insufficient parameters for OAuth2 callback.', `Received following query parameters: ${JSON.stringify(req.query)}`);
             }
-            let state;
-            try {
-                state = this.decodeCsrfState(encodedState);
-            }
-            catch (error) {
-                return this.renderCallbackError(res, error.message);
-            }
-            const credentialId = state.cid;
-            const credential = await this.getCredentialWithoutUser(credentialId);
-            if (!credential) {
-                const errorMessage = 'OAuth2 callback failed because of insufficient permissions';
-                this.logger.error(errorMessage, { credentialId });
-                return this.renderCallbackError(res, errorMessage);
-            }
-            const additionalData = await this.getAdditionalData();
-            const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
-            const oauthCredentials = this.applyDefaultsAndOverwrites(credential, decryptedDataOriginal, additionalData);
-            if (this.verifyCsrfState(decryptedDataOriginal, state)) {
-                const errorMessage = 'The OAuth2 callback state is invalid!';
-                this.logger.debug(errorMessage, { credentialId });
-                return this.renderCallbackError(res, errorMessage);
-            }
+            const [credential, decryptedDataOriginal, oauthCredentials] = await this.resolveCredential(req);
             let options = {};
             const oAuthOptions = this.convertCredentialToOptions(oauthCredentials);
             if (oauthCredentials.grantType === 'pkce') {
@@ -140,11 +119,6 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             if (Object.keys(req.query).length > 2) {
                 (0, set_1.default)(oauthToken.data, 'callbackQueryString', (0, omit_1.default)(req.query, 'state', 'code'));
             }
-            if (oauthToken === undefined) {
-                const errorMessage = 'Unable to get OAuth2 access tokens!';
-                this.logger.error(errorMessage, { credentialId });
-                return this.renderCallbackError(res, errorMessage);
-            }
             if (decryptedDataOriginal.oauthTokenData) {
                 Object.assign(decryptedDataOriginal.oauthTokenData, oauthToken.data);
             }
@@ -154,7 +128,7 @@ let OAuth2CredentialController = class OAuth2CredentialController extends abstra
             delete decryptedDataOriginal.csrfSecret;
             await this.encryptAndSaveData(credential, decryptedDataOriginal);
             this.logger.debug('OAuth2 callback successful for credential', {
-                credentialId,
+                credentialId: credential.id,
             });
             return res.render('oauth-callback');
         }
@@ -184,7 +158,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], OAuth2CredentialController.prototype, "getAuthUri", null);
 __decorate([
-    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: true }),
+    (0, decorators_1.Get)('/callback', { usesTemplates: true, skipAuth: abstract_oauth_controller_1.skipAuthOnOAuthCallback }),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, Object]),
     __metadata("design:returntype", Promise)