@shipfox/api-integration-linear 4.0.0 → 6.0.0

package/src/presentation/routes/webhooks.test.ts

@@ -1,5 +1,6 @@
 import {createHmac, randomUUID} from 'node:crypto';
 import type {IntegrationConnection} from '@shipfox/api-integration-core-dto';
+import {WEBHOOK_MAX_RAW_BODY_BYTES} from '@shipfox/api-integration-core-dto';
 import {closeApp, createApp} from '@shipfox/node-fastify';
 import type {FastifyInstance} from 'fastify';
 import {db} from '#db/db.js';
@@ -267,6 +268,42 @@ describe('Linear webhook route', () => {
     expect(recordDeliveryOnly).not.toHaveBeenCalled();
   });
 
+  it('rejects a body too large for the shared webhook request before processing it', async () => {
+    const {app, publishIntegrationEventReceived, recordDeliveryOnly} = await createTestApp();
+    const body = 'a'.repeat(WEBHOOK_MAX_RAW_BODY_BYTES + 1);
+
+    const res = await app.inject({
+      method: 'POST',
+      url: '/webhooks/integrations/linear',
+      headers: signedHeaders(body, 'Issue', randomUUID()),
+      payload: body,
+    });
+
+    expect(res.statusCode).toBe(413);
+    expect(res.json()).toEqual({code: 'body-too-large'});
+    expect(publishIntegrationEventReceived).not.toHaveBeenCalled();
+    expect(recordDeliveryOnly).not.toHaveBeenCalled();
+  });
+
+  it('rejects invalid stored request metadata before processing it', async () => {
+    const {app, publishIntegrationEventReceived, recordDeliveryOnly} = await createTestApp();
+    const body = JSON.stringify(linearPayload());
+    const headers = signedHeaders(body, 'Issue', randomUUID());
+    headers['linear-event'] = 'a'.repeat(8 * 1024 + 1);
+
+    const res = await app.inject({
+      method: 'POST',
+      url: '/webhooks/integrations/linear',
+      headers,
+      payload: body,
+    });
+
+    expect(res.statusCode).toBe(400);
+    expect(res.json()).toEqual({code: 'invalid-webhook-request'});
+    expect(publishIntegrationEventReceived).not.toHaveBeenCalled();
+    expect(recordDeliveryOnly).not.toHaveBeenCalled();
+  });
+
   it('rejects malformed JSON after signature verification', async () => {
     const {app, publishIntegrationEventReceived, recordDeliveryOnly} = await createTestApp();
     const body = '{"type":';

package/src/presentation/routes/webhooks.ts

@@ -1,39 +1,42 @@
-import {Buffer} from 'node:buffer';
+import {randomUUID} from 'node:crypto';
 import type {
   GetIntegrationConnectionByIdFn,
-  IntegrationTx,
   PublishIntegrationEventReceivedFn,
   RecordDeliveryOnlyFn,
+  StoredWebhookRequest,
+  WebhookProcessingResult,
 } from '@shipfox/api-integration-core-dto';
 import {
-  LINEAR_PROVIDER,
-  linearWebhookBaseEnvelopeSchema,
-} from '@shipfox/api-integration-linear-dto';
+  createStoredWebhookRequest,
+  WEBHOOK_MAX_RAW_BODY_BYTES,
+} from '@shipfox/api-integration-core-dto';
 import {
+  ClientError,
   defineRoute,
   type RouteGroup,
   rawBodyPlugin,
-  verifyHexHmacSignature,
   WEBHOOK_BODY_LIMIT,
 } from '@shipfox/node-fastify';
-import {logger} from '@shipfox/node-opentelemetry';
 import type {NodePgDatabase} from 'drizzle-orm/node-postgres';
-import {config} from '#config.js';
-import {handleLinearWebhook} from '#core/webhook.js';
+import {
+  createLinearWebhookProcessor,
+  type LinearWebhookProcessor,
+} from '#core/webhook-processor.js';
 
 const DELIVERY_HEADER = 'linear-delivery';
 const EVENT_HEADER = 'linear-event';
 const SIGNATURE_HEADER = 'linear-signature';
-const WEBHOOK_REPLAY_WINDOW_MS = 60_000;
 
 export interface CreateLinearWebhookRoutesOptions {
   coreDb: () => NodePgDatabase<Record<string, unknown>>;
   publishIntegrationEventReceived: PublishIntegrationEventReceivedFn;
   recordDeliveryOnly: RecordDeliveryOnlyFn;
   getIntegrationConnectionById: GetIntegrationConnectionByIdFn;
+  processor?: LinearWebhookProcessor | undefined;
 }
 
 export function createLinearWebhookRoutes(options: CreateLinearWebhookRoutesOptions): RouteGroup {
+  const processor = options.processor ?? createLinearWebhookProcessor(options);
   const webhookRoute = defineRoute({
     method: 'POST',
     path: '/',
@@ -41,6 +44,7 @@ export function createLinearWebhookRoutes(options: CreateLinearWebhookRoutesOpti
     description: 'Linear webhook receiver.',
     options: {bodyLimit: WEBHOOK_BODY_LIMIT},
     handler: async (request, reply) => {
+      const receivedAt = new Date().toISOString();
       const deliveryHeader = request.headers[DELIVERY_HEADER];
       const event = request.headers[EVENT_HEADER];
       const signature = request.headers[SIGNATURE_HEADER];
@@ -59,76 +63,22 @@ export function createLinearWebhookRoutes(options: CreateLinearWebhookRoutesOpti
       }
 
       const body = request.body;
-      if (!Buffer.isBuffer(body)) {
+      if (!(body instanceof Uint8Array)) {
         reply.code(400);
         return {error: 'expected raw JSON body'};
       }
-      const rawBody = body.toString('utf8');
-
-      if (
-        !verifyHexHmacSignature({
-          rawBody,
-          signature,
-          secret: config.LINEAR_WEBHOOK_SIGNING_SECRET,
-        })
-      ) {
-        reply.code(401);
-        return {error: 'invalid signature'};
-      }
-
-      let parsedJson: unknown;
-      try {
-        parsedJson = JSON.parse(rawBody);
-      } catch (error) {
-        logger().warn(
-          {deliveryId: deliveryHeader, err: error},
-          'linear webhook payload JSON parse failed',
-        );
-        reply.code(400);
-        return {error: 'malformed JSON'};
-      }
-
-      const payload = linearWebhookBaseEnvelopeSchema.safeParse(parsedJson);
-      if (!payload.success) {
-        logger().warn(
-          {deliveryId: deliveryHeader, issues: payload.error.issues},
-          'linear webhook envelope failed schema validation',
-        );
-        await recordSignedDeliveryOnly(options, deliveryHeader);
-        reply.code(200);
-        return null;
-      }
-
-      if (Math.abs(Date.now() - payload.data.webhookTimestamp) > WEBHOOK_REPLAY_WINDOW_MS) {
-        reply.code(401);
-        return {error: 'stale webhook timestamp'};
-      }
+      const result = await processor.process(
+        createLinearStoredWebhookRequest(
+          {
+            body,
+            headers: request.headers,
+            rawQueryString: request.raw.url?.split('?')[1] ?? '',
+          },
+          receivedAt,
+        ),
+      );
 
-      if (event !== payload.data.type) {
-        logger().warn(
-          {deliveryId: deliveryHeader, event, type: payload.data.type},
-          'linear webhook event header did not match payload type',
-        );
-        await recordSignedDeliveryOnly(options, deliveryHeader);
-        reply.code(200);
-        return null;
-      }
-
-      await options.coreDb().transaction(async (tx) => {
-        await handleLinearWebhook({
-          tx,
-          // Linear documents this header as the delivery UUID; the signed timestamp is per-send.
-          deliveryId: deliveryHeader,
-          payload: payload.data,
-          rawPayload: parsedJson,
-          publishIntegrationEventReceived: options.publishIntegrationEventReceived,
-          recordDeliveryOnly: options.recordDeliveryOnly,
-          getIntegrationConnectionById: options.getIntegrationConnectionById,
-        });
-      });
-
-      reply.code(200);
-      return null;
+      return sendLinearWebhookResponse(reply, result);
     },
   });
 
@@ -140,15 +90,67 @@ export function createLinearWebhookRoutes(options: CreateLinearWebhookRoutesOpti
   };
 }
 
-async function recordSignedDeliveryOnly(
-  options: Pick<CreateLinearWebhookRoutesOptions, 'coreDb' | 'recordDeliveryOnly'>,
-  deliveryId: string,
-): Promise<void> {
-  await options.coreDb().transaction(async (tx: IntegrationTx) => {
-    await options.recordDeliveryOnly({
-      tx,
-      provider: LINEAR_PROVIDER,
-      deliveryId,
+function createLinearStoredWebhookRequest(
+  input: {
+    body: Uint8Array;
+    headers: Record<string, string | string[] | undefined>;
+    rawQueryString: string;
+  },
+  receivedAt: string,
+): StoredWebhookRequest {
+  if (input.body.byteLength > WEBHOOK_MAX_RAW_BODY_BYTES) {
+    throw new ClientError('Webhook request body is too large', 'body-too-large', {status: 413});
+  }
+
+  try {
+    return createStoredWebhookRequest({
+      requestId: randomUUID(),
+      routeId: 'linear',
+      receivedAt,
+      rawQueryString: input.rawQueryString,
+      headers: linearWebhookHeaders(input.headers),
+      body: input.body,
     });
-  });
+  } catch (error) {
+    throw new ClientError('Webhook request metadata is invalid', 'invalid-webhook-request', {
+      cause: error,
+    });
+  }
+}
+
+function linearWebhookHeaders(headers: Record<string, string | string[] | undefined>) {
+  return Object.fromEntries(
+    ['content-type', DELIVERY_HEADER, EVENT_HEADER, SIGNATURE_HEADER, 'linear-timestamp'].flatMap(
+      (name) => {
+        const value = headers[name];
+        return typeof value === 'string' ? [[name, value]] : [];
+      },
+    ),
+  );
+}
+
+function sendLinearWebhookResponse(
+  reply: {code(statusCode: number): void},
+  result: WebhookProcessingResult,
+) {
+  if (result.outcome !== 'discarded') {
+    reply.code(200);
+    return null;
+  }
+
+  if (result.reason === 'invalid_signature') {
+    reply.code(401);
+    return {error: 'invalid signature'};
+  }
+  if (result.reason === 'stale_at_receipt') {
+    reply.code(401);
+    return {error: 'stale webhook timestamp'};
+  }
+  if (result.reason === 'malformed_payload') {
+    reply.code(400);
+    return {error: 'malformed JSON'};
+  }
+
+  reply.code(200);
+  return null;
 }

package/test/globalSetup.ts

@@ -8,15 +8,6 @@ export async function setup() {
   createPostgresClient();
 
   await runMigrations(db(), migrationsPath, '__drizzle_migrations_integrations_linear');
-  const {secretsModule} = await import('@shipfox/api-secrets');
-  if (!secretsModule.database || Array.isArray(secretsModule.database)) {
-    throw new Error('Secrets module database is not configured');
-  }
-  await runMigrations(
-    secretsModule.database.db(),
-    secretsModule.database.migrationsPath,
-    '__drizzle_migrations_secrets',
-  );
 
   closeDb();
   await closePostgresClient();