n8n 2.43.4 → 2.44.1

package/dist/modules/n8n-packages/spec/serialized/agent.schema.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serializedAgentMetadataSchema = exports.serializedAgentSchema = exports.serializedAgentTaskSchema = exports.serializedAgentToolSchema = void 0;
+const api_types_1 = require("@n8n/api-types");
+const is_record_1 = require("@n8n/utils/is-record");
+const zod_1 = require("zod");
+const skillIdSchema = api_types_1.AgentJsonConfigBaseSchema.shape.skills.unwrap().innerType().element.shape.id;
+const taskIdSchema = api_types_1.AgentJsonConfigBaseSchema.shape.tasks
+    .unwrap()
+    .element.shape.id.max(api_types_1.AGENT_TASK_ID_MAX_LENGTH);
+const customToolIdSchema = zod_1.z.string().min(1).regex(api_types_1.CUSTOM_TOOL_ID_REGEX);
+const toolDescriptorSchema = zod_1.z
+    .object({
+    name: zod_1.z.string(),
+    description: zod_1.z.string(),
+    systemInstruction: zod_1.z.string().nullable(),
+    inputSchema: zod_1.z.custom(is_record_1.isRecord).nullable(),
+    outputSchema: zod_1.z.custom(is_record_1.isRecord).nullable(),
+    hasSuspend: zod_1.z.boolean(),
+    hasResume: zod_1.z.boolean(),
+    hasToMessage: zod_1.z.boolean(),
+    requireApproval: zod_1.z.boolean(),
+    outputTrust: zod_1.z.literal('untrusted').nullish(),
+    providerOptions: zod_1.z.record(zod_1.z.unknown()).nullable(),
+})
+    .strict();
+exports.serializedAgentToolSchema = zod_1.z
+    .object({
+    code: zod_1.z.string(),
+    descriptor: toolDescriptorSchema,
+})
+    .strict();
+exports.serializedAgentTaskSchema = api_types_1.agentTaskSchema
+    .extend({
+    timezone: api_types_1.agentTaskSchema.shape.timezone.default(null),
+})
+    .strict();
+exports.serializedAgentSchema = zod_1.z
+    .object({
+    id: zod_1.z.string().min(1),
+    name: zod_1.z.string().min(1).max(128),
+    config: api_types_1.AgentJsonConfigSchema.nullable(),
+    availableInMCP: zod_1.z.boolean(),
+    skills: zod_1.z.record(skillIdSchema, api_types_1.agentSkillSchema),
+    tools: zod_1.z.record(customToolIdSchema, exports.serializedAgentToolSchema),
+    tasks: zod_1.z.record(taskIdSchema, exports.serializedAgentTaskSchema),
+})
+    .strict();
+exports.serializedAgentMetadataSchema = zod_1.z
+    .object({
+    versionId: zod_1.z.string().min(1).nullable(),
+    publishedVersionId: zod_1.z.string().min(1).nullable(),
+})
+    .strict();
+//# sourceMappingURL=agent.schema.js.map

package/dist/modules/n8n-packages/spec/serialized/agent.schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent.schema.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/spec/serialized/agent.schema.ts"],"names":[],"mappings":";;;AACA,8CAOwB;AACxB,oDAAgD;AAChD,6BAAwB;AAExB,MAAM,aAAa,GAAG,qCAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;AACnG,MAAM,YAAY,GAAG,qCAAyB,CAAC,KAAK,CAAC,KAAK;KACxD,MAAM,EAAE;KACR,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,oCAAwB,CAAC,CAAC;AACjD,MAAM,kBAAkB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,gCAAoB,CAAC,CAAC;AAEzE,MAAM,oBAAoB,GAAG,OAAC;KAC5B,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,iBAAiB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxC,WAAW,EAAE,OAAC,CAAC,MAAM,CAA6C,oBAAQ,CAAC,CAAC,QAAQ,EAAE;IACtF,YAAY,EAAE,OAAC,CAAC,MAAM,CAA8C,oBAAQ,CAAC,CAAC,QAAQ,EAAE;IACxF,UAAU,EAAE,OAAC,CAAC,OAAO,EAAE;IACvB,SAAS,EAAE,OAAC,CAAC,OAAO,EAAE;IACtB,YAAY,EAAE,OAAC,CAAC,OAAO,EAAE;IACzB,eAAe,EAAE,OAAC,CAAC,OAAO,EAAE;IAC5B,WAAW,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;IAC7C,eAAe,EAAE,OAAC,CAAC,MAAM,CAAC,OAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;CACjD,CAAC;KACD,MAAM,EAAsC,CAAC;AAElC,QAAA,yBAAyB,GAAG,OAAC;KACxC,MAAM,CAAC;IACP,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,UAAU,EAAE,oBAAoB;CAChC,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,yBAAyB,GAAG,2BAAe;KACtD,MAAM,CAAC;IACP,QAAQ,EAAE,2BAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;CACtD,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,qBAAqB,GAAG,OAAC;KACpC,MAAM,CAAC;IACP,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACrB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;IAChC,MAAM,EAAE,iCAAqB,CAAC,QAAQ,EAAE;IACxC,cAAc,EAAE,OAAC,CAAC,OAAO,EAAE;IAC3B,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC,aAAa,EAAE,4BAAgB,CAAC;IACjD,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE,QAAA,yBAAyB,CAAC;IAC9D,KAAK,EAAE,OAAC,CAAC,MAAM,CAAC,YAAY,EAAE,QAAA,yBAAyB,CAAC;CACxD,CAAC;KACD,MAAM,EAAE,CAAC;AAEE,QAAA,6BAA6B,GAAG,OAAC;KAC5C,MAAM,CAAC;IACP,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACvC,kBAAkB,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAChD,CAAC;KACD,MAAM,EAAE,CAAC"}

package/dist/modules/n8n-packages/spec/serialized/data-table.schema.d.ts

@@ -1,13 +1,16 @@
 import { z } from 'zod';
 export declare const serializedDataTableColumnSchema: z.ZodObject<{
+    id: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
     type: z.ZodEnum<["string", "number", "boolean", "date"]>;
     index: z.ZodNumber;
 }, "strict", z.ZodTypeAny, {
+    id?: string | undefined;
     name: string;
     type: "boolean" | "date" | "number" | "string";
     index: number;
 }, {
+    id?: string | undefined;
     name: string;
     type: "boolean" | "date" | "number" | "string";
     index: number;
@@ -16,14 +19,17 @@ export declare const serializedDataTableSchema: z.ZodEffects<z.ZodObject<{
     id: z.ZodString;
     name: z.ZodString;
     columns: z.ZodArray<z.ZodObject<{
+        id: z.ZodOptional<z.ZodString>;
         name: z.ZodString;
         type: z.ZodEnum<["string", "number", "boolean", "date"]>;
         index: z.ZodNumber;
     }, "strict", z.ZodTypeAny, {
+        id?: string | undefined;
         name: string;
         type: "boolean" | "date" | "number" | "string";
         index: number;
     }, {
+        id?: string | undefined;
         name: string;
         type: "boolean" | "date" | "number" | "string";
         index: number;
@@ -32,6 +38,7 @@ export declare const serializedDataTableSchema: z.ZodEffects<z.ZodObject<{
     id: string;
     name: string;
     columns: {
+        id?: string | undefined;
         name: string;
         type: "boolean" | "date" | "number" | "string";
         index: number;
@@ -40,6 +47,7 @@ export declare const serializedDataTableSchema: z.ZodEffects<z.ZodObject<{
     id: string;
     name: string;
     columns: {
+        id?: string | undefined;
         name: string;
         type: "boolean" | "date" | "number" | "string";
         index: number;
@@ -48,6 +56,7 @@ export declare const serializedDataTableSchema: z.ZodEffects<z.ZodObject<{
     id: string;
     name: string;
     columns: {
+        id?: string | undefined;
         name: string;
         type: "boolean" | "date" | "number" | "string";
         index: number;
@@ -56,6 +65,7 @@ export declare const serializedDataTableSchema: z.ZodEffects<z.ZodObject<{
     id: string;
     name: string;
     columns: {
+        id?: string | undefined;
         name: string;
         type: "boolean" | "date" | "number" | "string";
         index: number;

package/dist/modules/n8n-packages/spec/serialized/data-table.schema.js

@@ -7,6 +7,7 @@ const zod_1 = require("zod");
 const reservedColumnNames = new Set([...n8n_workflow_1.DATA_TABLE_SYSTEM_COLUMNS, n8n_workflow_1.DATA_TABLE_SYSTEM_TESTING_COLUMN].map((name) => name.toLowerCase()));
 exports.serializedDataTableColumnSchema = zod_1.z
     .object({
+    id: api_types_1.dataTableIdSchema.min(1).optional(),
     name: api_types_1.dataTableColumnNameSchema,
     type: api_types_1.dataTableColumnTypeSchema,
     index: zod_1.z.number().int(),

package/dist/modules/n8n-packages/spec/serialized/data-table.schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-table.schema.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/spec/serialized/data-table.schema.ts"],"names":[],"mappings":";;;AAAA,8CAKwB;AACxB,+CAA2F;AAC3F,6BAAwB;AAExB,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAClC,CAAC,GAAG,wCAAyB,EAAE,+CAAgC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC7E,IAAI,CAAC,WAAW,EAAE,CAClB,CACD,CAAC;AAEW,QAAA,+BAA+B,GAAG,OAAC;KAC9C,MAAM,CAAC;IACP,IAAI,EAAE,qCAAyB;IAC/B,IAAI,EAAE,qCAAyB;IAC/B,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;CACvB,CAAC;KACD,MAAM,EAAE,CAAC;AAIE,QAAA,yBAAyB,GAAG,OAAC;KACxC,MAAM,CAAC;IACP,EAAE,EAAE,6BAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,IAAI,EAAE,+BAAmB;IACzB,OAAO,EAAE,OAAC,CAAC,KAAK,CAAC,QAAA,+BAA+B,CAAC;CACjD,CAAC;KACD,MAAM,EAAE;KACR,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;IACjC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACjC,IAAI,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,QAAQ,CAAC;gBACZ,IAAI,EAAE,OAAC,CAAC,YAAY,CAAC,MAAM;gBAC3B,IAAI,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC;gBAChC,OAAO,EAAE,IAAI,MAAM,CAAC,IAAI,oCAAoC;aAC5D,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,QAAQ,CAAC;gBACZ,IAAI,EAAE,OAAC,CAAC,YAAY,CAAC,MAAM;gBAC3B,IAAI,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC;gBAChC,OAAO,EAAE,0BAA0B,MAAM,CAAC,IAAI,GAAG;aACjD,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"data-table.schema.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/spec/serialized/data-table.schema.ts"],"names":[],"mappings":";;;AAAA,8CAKwB;AACxB,+CAA2F;AAC3F,6BAAwB;AAExB,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAClC,CAAC,GAAG,wCAAyB,EAAE,+CAAgC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC7E,IAAI,CAAC,WAAW,EAAE,CAClB,CACD,CAAC;AAEW,QAAA,+BAA+B,GAAG,OAAC;KAC9C,MAAM,CAAC;IAEP,EAAE,EAAE,6BAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACvC,IAAI,EAAE,qCAAyB;IAC/B,IAAI,EAAE,qCAAyB;IAC/B,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;CACvB,CAAC;KACD,MAAM,EAAE,CAAC;AAIE,QAAA,yBAAyB,GAAG,OAAC;KACxC,MAAM,CAAC;IACP,EAAE,EAAE,6BAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5B,IAAI,EAAE,+BAAmB;IACzB,OAAO,EAAE,OAAC,CAAC,KAAK,CAAC,QAAA,+BAA+B,CAAC;CACjD,CAAC;KACD,MAAM,EAAE;KACR,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;IACjC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACjC,IAAI,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,QAAQ,CAAC;gBACZ,IAAI,EAAE,OAAC,CAAC,YAAY,CAAC,MAAM;gBAC3B,IAAI,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC;gBAChC,OAAO,EAAE,IAAI,MAAM,CAAC,IAAI,oCAAoC;aAC5D,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,QAAQ,CAAC;gBACZ,IAAI,EAAE,OAAC,CAAC,YAAY,CAAC,MAAM;gBAC3B,IAAI,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC;gBAChC,OAAO,EAAE,0BAA0B,MAAM,CAAC,IAAI,GAAG;aACjD,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/dist/modules/n8n-packages/utils/import-package-upload.d.ts

@@ -1,15 +1,3 @@
-import type { GlobalConfig } from '@n8n/config';
-import multer from 'multer';
-export declare const IMPORT_PACKAGE_BODY_FIELD_SET: Set<string>;
-export declare const IMPORT_PACKAGE_SELECTION_BODY_FIELD_SET: Set<string>;
-export declare function createN8nPackageMulterOptions(globalConfig: GlobalConfig): multer.Options;
-export declare function listUploadFiles(req: {
-    files?: Express.Multer.File[] | Record<string, Express.Multer.File[]>;
-}): Express.Multer.File[];
-export declare function getPackageUploadFile(req: {
-    files?: Express.Multer.File[] | Record<string, Express.Multer.File[]>;
-}): Express.Multer.File | undefined;
-export declare function resolveImportPackageUpload(req: {
-    files?: Express.Multer.File[] | Record<string, Express.Multer.File[]>;
-    body?: Record<string, unknown>;
-}, allowedBodyFields?: Set<string>): Express.Multer.File;
+export declare const IMPORT_PACKAGE_FIELD_SIZE_BYTES: number;
+export declare const IMPORT_PACKAGE_MAX_PARTS: number;
+export declare const IMPORT_PACKAGE_SELECTION_MAX_PARTS: number;

package/dist/modules/n8n-packages/utils/import-package-upload.js

@@ -1,64 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IMPORT_PACKAGE_SELECTION_BODY_FIELD_SET = exports.IMPORT_PACKAGE_BODY_FIELD_SET = void 0;
-exports.createN8nPackageMulterOptions = createN8nPackageMulterOptions;
-exports.listUploadFiles = listUploadFiles;
-exports.getPackageUploadFile = getPackageUploadFile;
-exports.resolveImportPackageUpload = resolveImportPackageUpload;
+exports.IMPORT_PACKAGE_SELECTION_MAX_PARTS = exports.IMPORT_PACKAGE_MAX_PARTS = exports.IMPORT_PACKAGE_FIELD_SIZE_BYTES = void 0;
 const api_types_1 = require("@n8n/api-types");
-const multer_1 = __importDefault(require("multer"));
-const errors_1 = require("@n8n/errors");
-exports.IMPORT_PACKAGE_BODY_FIELD_SET = new Set([
-    ...api_types_1.IMPORT_PACKAGE_REQUEST_FORM_FIELDS,
-    'package',
-]);
-exports.IMPORT_PACKAGE_SELECTION_BODY_FIELD_SET = new Set([
-    ...api_types_1.IMPORT_PACKAGE_SELECTION_REQUEST_FORM_FIELDS,
-    'package',
-]);
-const IMPORT_PACKAGE_FIELD_SIZE_BYTES = 64 * 1024;
-const IMPORT_PACKAGE_MAX_PARTS = api_types_1.IMPORT_PACKAGE_REQUEST_FORM_FIELDS.length + 2;
-function createN8nPackageMulterOptions(globalConfig) {
-    const maxFileSizeBytes = globalConfig.endpoints.payloadSizeMax * 1024 * 1024;
-    return {
-        storage: multer_1.default.memoryStorage(),
-        limits: {
-            fileSize: maxFileSizeBytes,
-            files: 1,
-            parts: IMPORT_PACKAGE_MAX_PARTS,
-            fieldSize: IMPORT_PACKAGE_FIELD_SIZE_BYTES,
-        },
-    };
-}
-function listUploadFiles(req) {
-    if (!req.files)
-        return [];
-    if (Array.isArray(req.files))
-        return req.files;
-    return Object.values(req.files).flat();
-}
-function getPackageUploadFile(req) {
-    const files = listUploadFiles(req);
-    return files.find((file) => file.fieldname === 'package');
-}
-function resolveImportPackageUpload(req, allowedBodyFields = exports.IMPORT_PACKAGE_BODY_FIELD_SET) {
-    const packageFile = getPackageUploadFile(req);
-    if (!packageFile?.buffer?.length) {
-        throw new errors_1.BadRequestError('Multipart field "package" is required');
-    }
-    for (const file of listUploadFiles(req)) {
-        if (file.fieldname !== 'package') {
-            throw new errors_1.BadRequestError('Unexpected file upload field; only "package" is allowed');
-        }
-    }
-    for (const key of Object.keys(req.body ?? {})) {
-        if (!allowedBodyFields.has(key)) {
-            throw new errors_1.BadRequestError(`Unexpected form field "${key}"`);
-        }
-    }
-    return packageFile;
-}
+exports.IMPORT_PACKAGE_FIELD_SIZE_BYTES = 64 * 1024;
+exports.IMPORT_PACKAGE_MAX_PARTS = api_types_1.IMPORT_PACKAGE_REQUEST_FORM_FIELDS.length + 2;
+exports.IMPORT_PACKAGE_SELECTION_MAX_PARTS = api_types_1.IMPORT_PACKAGE_SELECTION_REQUEST_FORM_FIELDS.length + 2;
 //# sourceMappingURL=import-package-upload.js.map

package/dist/modules/n8n-packages/utils/import-package-upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"import-package-upload.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/utils/import-package-upload.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,8CAGwB;AAExB,oDAA4B;AAE5B,wCAA8C;AAMjC,QAAA,6BAA6B,GAAG,IAAI,GAAG,CAAS;IAC5D,GAAG,8CAAkC;IACrC,SAAS;CACT,CAAC,CAAC;AAGU,QAAA,uCAAuC,GAAG,IAAI,GAAG,CAAS;IACtE,GAAG,wDAA4C;IAC/C,SAAS;CACT,CAAC,CAAC;AAGH,MAAM,+BAA+B,GAAG,EAAE,GAAG,IAAI,CAAC;AAMlD,MAAM,wBAAwB,GAAG,8CAAkC,CAAC,MAAM,GAAG,CAAC,CAAC;AAE/E,uCAA8C,YAA0B;IACvE,MAAM,gBAAgB,GAAG,YAAY,CAAC,SAAS,CAAC,cAAc,GAAG,IAAI,GAAG,IAAI,CAAC;IAC7E,OAAO;QACN,OAAO,EAAE,gBAAM,CAAC,aAAa,EAAE;QAC/B,MAAM,EAAE;YACP,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,wBAAwB;YAC/B,SAAS,EAAE,+BAA+B;SAC1C;KACD,CAAC;AACH,CAAC;AAED,yBAAgC,GAE/B;IACA,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC;IAC/C,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AACxC,CAAC;AAED,8BAAqC,GAEpC;IACA,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACnC,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC;AAC3D,CAAC;AAED,oCACC,GAGC,EACD,iBAAiB,GAAgB,QAAA,6BAA6B;IAE9D,MAAM,WAAW,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAClC,MAAM,IAAI,wBAAe,CAAC,uCAAuC,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC;QACzC,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,IAAI,wBAAe,CAAC,yDAAyD,CAAC,CAAC;QACtF,CAAC;IACF,CAAC;IAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;QAC/C,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,wBAAe,CAAC,0BAA0B,GAAG,GAAG,CAAC,CAAC;QAC7D,CAAC;IACF,CAAC;IAED,OAAO,WAAW,CAAC;AACpB,CAAC"}
+{"version":3,"file":"import-package-upload.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/utils/import-package-upload.ts"],"names":[],"mappings":";;;AAAA,8CAGwB;AAGX,QAAA,+BAA+B,GAAG,EAAE,GAAG,IAAI,CAAC;AAM5C,QAAA,wBAAwB,GAAG,8CAAkC,CAAC,MAAM,GAAG,CAAC,CAAC;AAMzE,QAAA,kCAAkC,GAC9C,wDAA4C,CAAC,MAAM,GAAG,CAAC,CAAC"}

package/dist/modules/oauth-server/oauth-local-authorization-server.d.ts

@@ -0,0 +1,14 @@
+import { UrlService } from '@n8n/backend-services';
+import { LocalAuthorizationServer, type AuthorizationServerMetadata, type Jwk } from '@n8n/inbound-auth';
+import { ProtectedResourceRegistry } from '../../services/protected-resource.registry';
+import { OAuthSigningJwksProvider } from './oauth-signing-jwks.provider';
+export declare class OAuthServerLocalAuthorizationServer extends LocalAuthorizationServer {
+    private readonly urlService;
+    private readonly resourceRegistry;
+    private readonly jwksProvider;
+    constructor(urlService: UrlService, resourceRegistry: ProtectedResourceRegistry, jwksProvider: OAuthSigningJwksProvider);
+    getMetadata(): Promise<AuthorizationServerMetadata>;
+    getJwks(): Promise<{
+        keys: Jwk[];
+    }>;
+}

package/dist/modules/oauth-server/oauth-local-authorization-server.js

@@ -0,0 +1,55 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OAuthServerLocalAuthorizationServer = void 0;
+const backend_services_1 = require("@n8n/backend-services");
+const di_1 = require("@n8n/di");
+const inbound_auth_1 = require("@n8n/inbound-auth");
+const protected_resource_registry_1 = require("../../services/protected-resource.registry");
+const oauth_signing_jwks_provider_1 = require("./oauth-signing-jwks.provider");
+let OAuthServerLocalAuthorizationServer = class OAuthServerLocalAuthorizationServer extends inbound_auth_1.LocalAuthorizationServer {
+    constructor(urlService, resourceRegistry, jwksProvider) {
+        super();
+        this.urlService = urlService;
+        this.resourceRegistry = resourceRegistry;
+        this.jwksProvider = jwksProvider;
+    }
+    async getMetadata() {
+        const baseUrl = this.urlService.getInstanceBaseUrl();
+        const allScopes = this.resourceRegistry.getAllScopes();
+        const metadata = {
+            issuer: baseUrl,
+            authorization_endpoint: `${baseUrl}/mcp-oauth/authorize`,
+            token_endpoint: `${baseUrl}/mcp-oauth/token`,
+            registration_endpoint: `${baseUrl}/mcp-oauth/register`,
+            revocation_endpoint: `${baseUrl}/mcp-oauth/revoke`,
+            jwks_uri: this.urlService.getInstanceJwksUri(),
+            response_types_supported: ['code'],
+            grant_types_supported: ['authorization_code', 'refresh_token'],
+            token_endpoint_auth_methods_supported: ['none', 'client_secret_post', 'client_secret_basic'],
+            code_challenge_methods_supported: ['S256'],
+            authorization_response_iss_parameter_supported: true,
+        };
+        if (allScopes.length > 0) {
+            metadata.scopes_supported = allScopes;
+        }
+        return metadata;
+    }
+    async getJwks() {
+        return { keys: inbound_auth_1.JwkSchema.array().parse(await this.jwksProvider.getPublicJwks()) };
+    }
+};
+exports.OAuthServerLocalAuthorizationServer = OAuthServerLocalAuthorizationServer;
+exports.OAuthServerLocalAuthorizationServer = OAuthServerLocalAuthorizationServer = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [backend_services_1.UrlService, protected_resource_registry_1.ProtectedResourceRegistry, oauth_signing_jwks_provider_1.OAuthSigningJwksProvider])
+], OAuthServerLocalAuthorizationServer);
+//# sourceMappingURL=oauth-local-authorization-server.js.map

package/dist/modules/oauth-server/oauth-local-authorization-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauth-local-authorization-server.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-local-authorization-server.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4DAAmD;AACnD,gCAAkC;AAClC,oDAK2B;AAE3B,wFAAmF;AAEnF,+EAAyE;AAOlE,IAAM,mCAAmC,GAAzC,MAAM,mCAAoC,SAAQ,uCAAwB;IAChF,YACkB,UAAsB,EACtB,gBAA2C,EAC3C,YAAsC;QAEvD,KAAK,EAAE,CAAC;0BAJS,UAAU;gCACV,gBAAgB;4BAChB,YAAY;IAG9B,CAAC;IAWD,KAAK,CAAC,WAAW;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;QACvD,MAAM,QAAQ,GAAgC;YAC7C,MAAM,EAAE,OAAO;YACf,sBAAsB,EAAE,GAAG,OAAO,sBAAsB;YACxD,cAAc,EAAE,GAAG,OAAO,kBAAkB;YAC5C,qBAAqB,EAAE,GAAG,OAAO,qBAAqB;YACtD,mBAAmB,EAAE,GAAG,OAAO,mBAAmB;YAElD,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE;YAC9C,wBAAwB,EAAE,CAAC,MAAM,CAAC;YAClC,qBAAqB,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;YAC9D,qCAAqC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,qBAAqB,CAAC;YAC5F,gCAAgC,EAAE,CAAC,MAAM,CAAC;YAE1C,8CAA8C,EAAE,IAAI;SACpD,CAAC;QAEF,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,QAAQ,CAAC,gBAAgB,GAAG,SAAS,CAAC;QACvC,CAAC;QAED,OAAO,QAAQ,CAAC;IACjB,CAAC;IAGD,KAAK,CAAC,OAAO;QACZ,OAAO,EAAE,IAAI,EAAE,wBAAS,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC;IACnF,CAAC;CACD,CAAA;;8CAhDY,mCAAmC;IAD/C,IAAA,YAAO,GAAE;qCAGqB,6BAAU,EACJ,uDAAyB,EAC7B,sDAAwB;GAJ5C,mCAAmC,CAgD/C"}

package/dist/modules/oauth-server/oauth-server.module.js

@@ -27,6 +27,9 @@ let OAuthServerModule = class OAuthServerModule {
             const { OAuthSigningJwksProvider } = await import('./oauth-signing-jwks.provider.js');
             di_1.Container.get(JwksRegistry).register(di_1.Container.get(OAuthSigningJwksProvider));
         }
+        const { LocalAuthorizationServer } = await import('@n8n/inbound-auth');
+        const { OAuthServerLocalAuthorizationServer } = await import('./oauth-local-authorization-server.js');
+        di_1.Container.set(LocalAuthorizationServer, di_1.Container.get(OAuthServerLocalAuthorizationServer));
         const { OAuthTokenVerifierProxy } = await import('../../services/oauth-token-verifier-proxy.service.js');
         const { OAuthTokenService } = await import('./oauth-token.service.js');
         di_1.Container.get(OAuthTokenVerifierProxy).registerProvider(di_1.Container.get(OAuthTokenService));

package/dist/modules/oauth-server/oauth-server.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-server.module.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-server.module.ts"],"names":[],"mappings":";;;;;;;;;AACA,gDAAgD;AAChD,gCAAoC;AACpC,uCAA4C;AAerC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC7B,KAAK,CAAC,IAAI;QACT,MAAM,EAAE,YAAY,EAAE,GAAG,cAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC;QAGzD,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;YAC7B,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;YACtC,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;YAC9C,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;QAC/C,CAAC;QAKD,IAAI,YAAY,KAAK,MAAM,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC3D,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAAC,gCAAgC,CAAC,CAAC;YAClF,MAAM,cAAS,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,UAAU,EAAE,CAAC;QAC1D,CAAC;QAGD,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;YAC7B,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;YACjE,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAAC,kCAAkC,CAAC,CAAC;YACtF,cAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,cAAS,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;QAC/E,CAAC;QAKD,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,MAAM,CAC/C,kDAAkD,CAClD,CAAC;QACF,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QACvE,cAAS,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,gBAAgB,CAAC,cAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAE1F,MAAM,EAAE,kCAAkC,EAAE,GAAG,MAAM,MAAM,CAC1D,yCAAyC,CACzC,CAAC;QACF,kCAAkC,EAAE,CAAC;QAErC,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,yCAAyC,CAAC,CAAC;QACpF,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QACtE,cAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,gBAAgB,CAAC,cAAS,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,4CAA4C,CAAC,CAAC;QACnF,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CACzC,wDAAwD,CACxD,CAAC;QACF,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,kDAAkD,CAAC,CAAC;QACzF,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,mDAAmD,CAAC,CAAC;QAC3F,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,kDAAkD,CAAC,CAAC;QAEzF,OAAO,CAAC,WAAW,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,CAAU,CAAC;IAC1F,CAAC;CACD,CAAA;;4BAxDY,iBAAiB;IAD7B,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC;GACzE,iBAAiB,CAwD7B"}
+{"version":3,"file":"oauth-server.module.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-server.module.ts"],"names":[],"mappings":"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"}

package/dist/modules/oauth-server/oauth-signing-key.constants.d.ts

@@ -2,6 +2,8 @@ export { OAUTH_SIGNING_KEY_TYPE } from '@n8n/db';
 export declare const OAUTH_SIGNING_ALGORITHM = "ES256";
 export declare const OAUTH_SIGNING_KEY_USE = "sig";
 export declare const OAUTH_SIGNING_CURVE = "P-256";
-export declare const OAUTH_SIGNING_KEYS_CACHE_KEY = "oauth-server:signing-keys";
+export declare const SIGNING_KEYS_REFRESH_MS: number;
+export declare const UNKNOWN_KID_REFRESH_MS: number;
+export declare const ACCESS_TOKEN_TYPES: readonly ['at+jwt', 'application/at+jwt'];
 export declare const OAUTH_ACCESS_TOKEN_TTL_SECONDS: number;
 export declare const RETIRED_SIGNING_KEY_GRACE_MS: number;

package/dist/modules/oauth-server/oauth-signing-key.constants.js

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RETIRED_SIGNING_KEY_GRACE_MS = exports.OAUTH_ACCESS_TOKEN_TTL_SECONDS = exports.OAUTH_SIGNING_KEYS_CACHE_KEY = exports.OAUTH_SIGNING_CURVE = exports.OAUTH_SIGNING_KEY_USE = exports.OAUTH_SIGNING_ALGORITHM = exports.OAUTH_SIGNING_KEY_TYPE = void 0;
+exports.RETIRED_SIGNING_KEY_GRACE_MS = exports.OAUTH_ACCESS_TOKEN_TTL_SECONDS = exports.ACCESS_TOKEN_TYPES = exports.UNKNOWN_KID_REFRESH_MS = exports.SIGNING_KEYS_REFRESH_MS = exports.OAUTH_SIGNING_CURVE = exports.OAUTH_SIGNING_KEY_USE = exports.OAUTH_SIGNING_ALGORITHM = exports.OAUTH_SIGNING_KEY_TYPE = void 0;
 const constants_1 = require("@n8n/constants");
 var db_1 = require("@n8n/db");
 Object.defineProperty(exports, "OAUTH_SIGNING_KEY_TYPE", { enumerable: true, get: function () { return db_1.OAUTH_SIGNING_KEY_TYPE; } });
 exports.OAUTH_SIGNING_ALGORITHM = 'ES256';
 exports.OAUTH_SIGNING_KEY_USE = 'sig';
 exports.OAUTH_SIGNING_CURVE = 'P-256';
-exports.OAUTH_SIGNING_KEYS_CACHE_KEY = 'oauth-server:signing-keys';
+exports.SIGNING_KEYS_REFRESH_MS = 5 * constants_1.Time.minutes.toMilliseconds;
+exports.UNKNOWN_KID_REFRESH_MS = 30 * constants_1.Time.seconds.toMilliseconds;
+exports.ACCESS_TOKEN_TYPES = ['at+jwt', 'application/at+jwt'];
 exports.OAUTH_ACCESS_TOKEN_TTL_SECONDS = 1 * constants_1.Time.hours.toSeconds;
 exports.RETIRED_SIGNING_KEY_GRACE_MS = exports.OAUTH_ACCESS_TOKEN_TTL_SECONDS * constants_1.Time.seconds.toMilliseconds + 5 * constants_1.Time.minutes.toMilliseconds;
 //# sourceMappingURL=oauth-signing-key.constants.js.map

package/dist/modules/oauth-server/oauth-signing-key.constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-signing-key.constants.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-signing-key.constants.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAEtC,8BAAiD;AAAxC,4GAAA,sBAAsB,OAAA;AAGlB,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,qBAAqB,GAAG,KAAK,CAAC;AAC9B,QAAA,mBAAmB,GAAG,OAAO,CAAC;AAM9B,QAAA,4BAA4B,GAAG,2BAA2B,CAAC;AAE3D,QAAA,8BAA8B,GAAG,CAAC,GAAG,gBAAI,CAAC,KAAK,CAAC,SAAS,CAAC;AAG1D,QAAA,4BAA4B,GACxC,QAAA,8BAA8B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC"}
+{"version":3,"file":"oauth-signing-key.constants.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-signing-key.constants.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAEtC,8BAAiD;AAAxC,4GAAA,sBAAsB,OAAA;AAGlB,QAAA,uBAAuB,GAAG,OAAO,CAAC;AAClC,QAAA,qBAAqB,GAAG,KAAK,CAAC;AAC9B,QAAA,mBAAmB,GAAG,OAAO,CAAC;AAG9B,QAAA,uBAAuB,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAM1D,QAAA,sBAAsB,GAAG,EAAE,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAG1D,QAAA,kBAAkB,GAAG,CAAC,QAAQ,EAAE,oBAAoB,CAAU,CAAC;AAE/D,QAAA,8BAA8B,GAAG,CAAC,GAAG,gBAAI,CAAC,KAAK,CAAC,SAAS,CAAC;AAG1D,QAAA,4BAA4B,GACxC,QAAA,8BAA8B,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC"}

package/dist/modules/oauth-server/oauth-signing-key.service.d.ts

@@ -1,22 +1,34 @@
 import { Logger } from '@n8n/backend-common';
-import { CacheService } from '@n8n/backend-services';
 import { DeploymentKeyRepository } from '@n8n/db';
 import type { JWK } from 'jose';
 import { Cipher } from 'n8n-core';
-import { JwtService } from '../../services/jwt.service';
+import { JwtService, type JwtPayload } from '../../services/jwt.service';
+type VerifyAccessTokenOptions = {
+    kid: unknown;
+    audiences: string[];
+    issuer: string;
+};
 export declare class OAuthSigningKeyService {
     private readonly deploymentKeyRepository;
     private readonly cipher;
-    private readonly cacheService;
     private readonly logger;
     private readonly jwtService;
     private activeKey;
-    constructor(deploymentKeyRepository: DeploymentKeyRepository, cipher: Cipher, cacheService: CacheService, logger: Logger, jwtService: JwtService);
+    private publishedKeys;
+    private pendingRead;
+    private keysGeneration;
+    constructor(deploymentKeyRepository: DeploymentKeyRepository, cipher: Cipher, logger: Logger, jwtService: JwtService);
     initialize(): Promise<void>;
     signAccessToken(payload: object, audience: string): string;
     getPublicJwks(): Promise<JWK[]>;
+    verifyAccessToken(token: string, { kid, audiences, issuer }: VerifyAccessTokenOptions): Promise<JwtPayload>;
+    private findPublishedKey;
     private loadPublishedKeys;
     private readPublishedKeys;
+    private readPublishedKeyRows;
     private readPrivateJwk;
     private generateAndPersist;
+    private broadcastReloadSigningKeysCommand;
+    reloadPublishedKeys(): void;
 }
+export {};

package/dist/modules/oauth-server/oauth-signing-key.service.js

@@ -11,10 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuthSigningKeyService = void 0;
 const backend_common_1 = require("@n8n/backend-common");
-const backend_services_1 = require("@n8n/backend-services");
 const db_1 = require("@n8n/db");
+const decorators_1 = require("@n8n/decorators");
 const di_1 = require("@n8n/di");
 const generate_nano_id_1 = require("@n8n/utils/generate-nano-id");
+const jsonwebtoken_1 = require("jsonwebtoken");
 const n8n_core_1 = require("n8n-core");
 const n8n_workflow_1 = require("n8n-workflow");
 const node_crypto_1 = require("node:crypto");
@@ -24,13 +25,15 @@ const oauth_signing_key_constants_1 = require("./oauth-signing-key.constants");
 const generateKeyPairAsync = (0, node_util_1.promisify)(node_crypto_1.generateKeyPair);
 const PUBLIC_JWK_FIELDS = ['kty', 'crv', 'x', 'y', 'kid', 'alg', 'use'];
 let OAuthSigningKeyService = class OAuthSigningKeyService {
-    constructor(deploymentKeyRepository, cipher, cacheService, logger, jwtService) {
+    constructor(deploymentKeyRepository, cipher, logger, jwtService) {
         this.deploymentKeyRepository = deploymentKeyRepository;
         this.cipher = cipher;
-        this.cacheService = cacheService;
         this.logger = logger;
         this.jwtService = jwtService;
         this.activeKey = null;
+        this.publishedKeys = null;
+        this.pendingRead = null;
+        this.keysGeneration = 0;
     }
     async initialize() {
         let row = await this.deploymentKeyRepository.findActiveOAuthSigningKey(oauth_signing_key_constants_1.OAUTH_SIGNING_ALGORITHM);
@@ -52,7 +55,7 @@ let OAuthSigningKeyService = class OAuthSigningKeyService {
             throw new n8n_workflow_1.UnexpectedError('OAuth signing key is not initialized');
         }
         const { kid, privateKey } = this.activeKey;
-        return this.jwtService.signForResourceWithKey(payload, audience, privateKey, {
+        return this.jwtService.signForResource(payload, audience, privateKey, {
             algorithm: oauth_signing_key_constants_1.OAUTH_SIGNING_ALGORITHM,
             header: { alg: oauth_signing_key_constants_1.OAUTH_SIGNING_ALGORITHM, typ: 'at+jwt', kid },
         });
@@ -61,24 +64,73 @@ let OAuthSigningKeyService = class OAuthSigningKeyService {
         const keys = await this.loadPublishedKeys();
         return keys.map((key) => key.publicJwk);
     }
-    async loadPublishedKeys() {
-        const keys = await this.cacheService.get(oauth_signing_key_constants_1.OAUTH_SIGNING_KEYS_CACHE_KEY, {
-            refreshFn: async () => await this.readPublishedKeys(),
-        });
+    async verifyAccessToken(token, { kid, audiences, issuer }) {
+        if (typeof kid !== 'string' || kid.length === 0) {
+            throw new jsonwebtoken_1.JsonWebTokenError('kid is invalid');
+        }
+        const key = await this.findPublishedKey(kid);
+        if (!key) {
+            throw new jsonwebtoken_1.JsonWebTokenError('kid is unknown');
+        }
+        const verified = this.jwtService.verifyForResource(token, audiences, key.publicKey, { algorithms: [oauth_signing_key_constants_1.OAUTH_SIGNING_ALGORITHM], issuer });
+        const { typ } = verified.header;
+        if (typeof typ !== 'string' || !oauth_signing_key_constants_1.ACCESS_TOKEN_TYPES.some((t) => t === typ.toLowerCase())) {
+            throw new jsonwebtoken_1.JsonWebTokenError('typ is invalid');
+        }
+        const { payload } = verified;
+        if (typeof payload !== 'object' || typeof payload.exp !== 'number') {
+            throw new jsonwebtoken_1.JsonWebTokenError('exp is missing');
+        }
+        return payload;
+    }
+    async findPublishedKey(kid) {
+        const keys = await this.loadPublishedKeys(oauth_signing_key_constants_1.SIGNING_KEYS_REFRESH_MS);
+        const key = keys.find((k) => k.kid === kid);
+        if (key)
+            return key;
+        const refreshed = await this.loadPublishedKeys(oauth_signing_key_constants_1.UNKNOWN_KID_REFRESH_MS);
+        return refreshed.find((k) => k.kid === kid);
+    }
+    async loadPublishedKeys(maxAgeMs = oauth_signing_key_constants_1.SIGNING_KEYS_REFRESH_MS) {
+        let list = this.publishedKeys;
+        if (!list || Date.now() - list.readAt >= maxAgeMs) {
+            list = await this.readPublishedKeys();
+        }
         const now = Date.now();
-        return (keys ?? []).filter((key) => key.active || now - key.updatedAt <= oauth_signing_key_constants_1.RETIRED_SIGNING_KEY_GRACE_MS);
+        return list.keys.filter((key) => key.active || now - key.updatedAt <= oauth_signing_key_constants_1.RETIRED_SIGNING_KEY_GRACE_MS);
     }
     async readPublishedKeys() {
+        if (!this.pendingRead) {
+            const generation = this.keysGeneration;
+            this.pendingRead = this.readPublishedKeyRows()
+                .then((list) => {
+                if (generation === this.keysGeneration)
+                    this.publishedKeys = list;
+                return list;
+            })
+                .finally(() => {
+                if (generation === this.keysGeneration)
+                    this.pendingRead = null;
+            });
+        }
+        return await this.pendingRead;
+    }
+    async readPublishedKeyRows() {
         const rows = await this.deploymentKeyRepository.findOAuthSigningKeys();
         const keys = rows
             .filter((row) => row.algorithm === oauth_signing_key_constants_1.OAUTH_SIGNING_ALGORITHM)
-            .map((row) => ({
-            kid: row.id,
-            publicJwk: toPublicJwk(this.readPrivateJwk(row)),
-            active: row.status === 'active',
-            updatedAt: new Date(row.updatedAt).getTime(),
-        }));
-        return keys.length > 0 ? keys : undefined;
+            .map((row) => {
+            const publicJwk = toPublicJwk(this.readPrivateJwk(row));
+            const { kty, crv, x, y } = publicJwk;
+            return {
+                kid: row.id,
+                publicJwk,
+                publicKey: (0, node_crypto_1.createPublicKey)({ key: { kty, crv, x, y }, format: 'jwk' }),
+                active: row.status === 'active',
+                updatedAt: new Date(row.updatedAt).getTime(),
+            };
+        });
+        return { keys, readAt: Date.now() };
     }
     readPrivateJwk(row) {
         const privateJwk = (0, n8n_workflow_1.jsonParse)(this.cipher.decryptDEKWithInstanceKey(row.value), {
@@ -103,20 +155,44 @@ let OAuthSigningKeyService = class OAuthSigningKeyService {
         const encryptedPrivate = this.cipher.encryptDEKWithInstanceKey(JSON.stringify(privateJwk));
         try {
             await this.deploymentKeyRepository.insertActiveOAuthSigningKey(id, encryptedPrivate, oauth_signing_key_constants_1.OAUTH_SIGNING_ALGORITHM);
-            await this.cacheService.delete(oauth_signing_key_constants_1.OAUTH_SIGNING_KEYS_CACHE_KEY);
-            this.logger.info('Generated new OAuth access-token signing key', { kid: id });
         }
         catch (error) {
             if (!(0, db_1.isUniqueConstraintError)(error))
                 throw error;
             this.logger.debug('OAuth signing key insert raced with another process; re-reading winner');
+            return;
         }
+        this.logger.info('Generated new OAuth access-token signing key', { kid: id });
+        this.reloadPublishedKeys();
+        await this.broadcastReloadSigningKeysCommand();
+    }
+    async broadcastReloadSigningKeysCommand() {
+        try {
+            const { Publisher } = await import('../../scaling/pubsub/publisher.service.js');
+            await di_1.Container.get(Publisher).publishCommand({ command: 'reload-oauth-signing-keys' });
+        }
+        catch (error) {
+            this.logger.warn('Failed to tell other processes about the new OAuth signing key', {
+                error,
+            });
+        }
+    }
+    reloadPublishedKeys() {
+        this.keysGeneration++;
+        this.publishedKeys = null;
+        this.pendingRead = null;
     }
 };
 exports.OAuthSigningKeyService = OAuthSigningKeyService;
+__decorate([
+    (0, decorators_1.OnPubSubEvent)('reload-oauth-signing-keys'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], OAuthSigningKeyService.prototype, "reloadPublishedKeys", null);
 exports.OAuthSigningKeyService = OAuthSigningKeyService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [db_1.DeploymentKeyRepository, n8n_core_1.Cipher, backend_services_1.CacheService, backend_common_1.Logger, jwt_service_1.JwtService])
+    __metadata("design:paramtypes", [db_1.DeploymentKeyRepository, n8n_core_1.Cipher, backend_common_1.Logger, jwt_service_1.JwtService])
 ], OAuthSigningKeyService);
 function toPublicJwk(privateJwk) {
     const entries = PUBLIC_JWK_FIELDS.filter((field) => privateJwk[field] !== undefined).map((field) => [field, privateJwk[field]]);

package/dist/modules/oauth-server/oauth-signing-key.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-signing-key.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-signing-key.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,4DAAqD;AACrD,gCAA2E;AAE3E,gCAAkC;AAClC,kEAA6D;AAE7D,uCAAkC;AAClC,+CAA0D;AAE1D,6CAAgE;AAChE,yCAAsC;AAEtC,wDAAoD;AAEpD,+EAMuC;AAEvC,MAAM,oBAAoB,GAAG,IAAA,qBAAS,EAAC,6BAAe,CAAC,CAAC;AAiBxD,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAU,CAAC;AAa1E,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAGlC,YACkB,uBAAgD,EAChD,MAAc,EACd,YAA0B,EAC1B,MAAc,EACd,UAAsB;QAJtB,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,WAAM,GAAN,MAAM,CAAQ;QACd,iBAAY,GAAZ,YAAY,CAAc;QAC1B,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAY;QAPhC,cAAS,GAA4B,IAAI,CAAC;IAQ/C,CAAC;IAOJ,KAAK,CAAC,UAAU;QACf,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,yBAAyB,CAAC,qDAAuB,CAAC,CAAC;QAEhG,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAChC,GAAG,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,yBAAyB,CAAC,qDAAuB,CAAC,CAAC;QAC7F,CAAC;QAED,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,MAAM,IAAI,8BAAe,CAAC,8CAA8C,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,GAAG;YAChB,GAAG,EAAE,GAAG,CAAC,EAAE;YACX,UAAU,EAAE,IAAA,8BAAgB,EAAC,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SAChE,CAAC;IACH,CAAC;IAGD,eAAe,CAAC,OAAe,EAAE,QAAgB;QAChD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,8BAAe,CAAC,sCAAsC,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC;QAC3C,OAAO,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE;YAC5E,SAAS,EAAE,qDAAuB;YAClC,MAAM,EAAE,EAAE,GAAG,EAAE,qDAAuB,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE;SAC5D,CAAC,CAAC;IACJ,CAAC;IAOD,KAAK,CAAC,aAAa;QAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAwB,0DAA4B,EAAE;YAC7F,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,iBAAiB,EAAE;SACrD,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CACzB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,GAAG,GAAG,CAAC,SAAS,IAAI,0DAA4B,CAC1E,CAAC;IACH,CAAC;IAGO,KAAK,CAAC,iBAAiB;QAC9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,EAAE,CAAC;QACvE,MAAM,IAAI,GAAG,IAAI;aACf,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,qDAAuB,CAAC;aAC1D,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACd,GAAG,EAAE,GAAG,CAAC,EAAE;YACX,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;YAChD,MAAM,EAAE,GAAG,CAAC,MAAM,KAAK,QAAQ;YAC/B,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE;SAC5C,CAAC,CAAC,CAAC;QAEL,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3C,CAAC;IAEO,cAAc,CAAC,GAAkB;QACxC,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAa,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC1F,YAAY,EAAE,mCAAmC;SACjD,CAAC,CAAC;QAEH,IAAI,UAAU,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,EAAE,CAAC;YAC/B,MAAM,IAAI,8BAAe,CAAC,4DAA4D,CAAC,CAAC;QACzF,CAAC;QAED,OAAO,UAAU,CAAC;IACnB,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE;YACvD,UAAU,EAAE,iDAAmB;SAC/B,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG,IAAA,iCAAc,GAAE,CAAC;QAE5B,MAAM,UAAU,GAAe;YAC9B,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YACvC,GAAG,EAAE,EAAE;YACP,GAAG,EAAE,qDAAuB;YAC5B,GAAG,EAAE,mDAAqB;SAC1B,CAAC;QAGF,MAAM,gBAAgB,GAAG,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;QAE3F,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,uBAAuB,CAAC,2BAA2B,CAC7D,EAAE,EACF,gBAAgB,EAChB,qDAAuB,CACvB,CAAC;YAEF,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,0DAA4B,CAAC,CAAC;YAE7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,IAAA,4BAAuB,EAAC,KAAK,CAAC;gBAAE,MAAM,KAAK,CAAC;YAEjD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAC;QAC7F,CAAC;IACF,CAAC;CACD,CAAA;;iCAjIY,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAKkC,4BAAuB,EACxC,iBAAM,EACA,+BAAY,EAClB,uBAAM,EACF,wBAAU;GAR5B,sBAAsB,CAiIlC;AAGD,SAAS,WAAW,CAAC,UAAsB;IAC1C,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC,GAAG,CACvF,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,CAAU,CAC9C,CAAC;IACF,OAAO,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC"}
+{"version":3,"file":"oauth-signing-key.service.js","sourceRoot":"","sources":["../../../src/modules/oauth-server/oauth-signing-key.service.ts"],"names":[],"mappings":"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"}