Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export type { ExpressReceiverOptions } from './receivers/ExpressReceiver';
export * as HTTPModuleFunctions from './receivers/HTTPModuleFunctions';
export {
ReceiverDispatchErrorHandlerArgs,
ReceiverInvalidRequestSignatureHandlerArgs,
ReceiverProcessEventErrorHandlerArgs,
ReceiverUnhandledRequestHandlerArgs,
RequestVerificationOptions,
Expand Down
16 changes: 15 additions & 1 deletion src/receivers/ExpressReceiver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ export interface ExpressReceiverOptions {
// we can add a different name function for it.
unhandledRequestHandler?: (args: httpFunc.ReceiverUnhandledRequestHandlerArgs) => void;
unhandledRequestTimeoutMillis?: number;
invalidRequestSignatureHandler?: (args: httpFunc.ReceiverInvalidRequestSignatureHandlerArgs) => void;
}

// Additional Installer Options
Expand Down Expand Up @@ -192,6 +193,7 @@ export default class ExpressReceiver implements Receiver {
processEventErrorHandler = httpFunc.defaultProcessEventErrorHandler,
unhandledRequestHandler = httpFunc.defaultUnhandledRequestHandler,
unhandledRequestTimeoutMillis = 3001,
invalidRequestSignatureHandler = httpFunc.defaultInvalidRequestSignatureHandler,
}: ExpressReceiverOptions) {
this.app = app !== undefined ? app : express();

Expand All @@ -204,7 +206,7 @@ export default class ExpressReceiver implements Receiver {

this.signatureVerification = signatureVerification;
const bodyParser = this.signatureVerification
? buildVerificationBodyParserMiddleware(this.logger, signingSecret)
? buildVerificationBodyParserMiddleware(this.logger, signingSecret, invalidRequestSignatureHandler)
: buildBodyParserMiddleware(this.logger);
const expressMiddleware: RequestHandler[] = [
bodyParser,
Expand Down Expand Up @@ -455,6 +457,7 @@ export function verifySignatureAndParseRawBody(
function buildVerificationBodyParserMiddleware(
logger: Logger,
signingSecret: string | (() => PromiseLike<string>),
invalidRequestSignatureHandler?: (args: httpFunc.ReceiverInvalidRequestSignatureHandlerArgs) => void,
): RequestHandler {
return async (req, res, next): Promise<void> => {
// *** Parsing body ***
Expand All @@ -474,6 +477,17 @@ function buildVerificationBodyParserMiddleware(
if (error) {
if (error instanceof ReceiverAuthenticityError) {
logError(logger, 'Request verification failed', error);
if (invalidRequestSignatureHandler) {
const signature = req.headers['x-slack-signature'];
const ts = req.headers['x-slack-request-timestamp'];
invalidRequestSignatureHandler({
signature: Array.isArray(signature) ? signature[0] : signature,
ts: ts ? Number(Array.isArray(ts) ? ts[0] : ts) : undefined,
body: stringBody,
request: req,
response: res,
});
}
res.status(401).send();
return;
}
Expand Down
20 changes: 20 additions & 0 deletions src/receivers/HTTPModuleFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -263,3 +263,23 @@ export interface ReceiverUnhandledRequestHandlerArgs {
request: IncomingMessage;
response: ServerResponse;
}

// The arguments for the invalidRequestSignatureHandler,
// which handles requests with invalid signatures.
export interface ReceiverInvalidRequestSignatureHandlerArgs {
signature: string | undefined;
ts: number | undefined;
body: string;
request: IncomingMessage;
response: ServerResponse;
}

// The default invalidRequestSignatureHandler implementation:
// Developers can customize this behavior by passing invalidRequestSignatureHandler to the constructor
export const defaultInvalidRequestSignatureHandler = (args: ReceiverInvalidRequestSignatureHandlerArgs): void => {
const { signature, ts } = args;
// Intentionally does nothing by default. The receiver already responds with 401.
// This hook allows developers to add custom logging, metrics, or alerting.
void signature;
void ts;
};
14 changes: 14 additions & 0 deletions src/receivers/HTTPReceiver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export interface HTTPReceiverOptions {
// NOTE: As we use setTimeout under the hood, this cannot be async
unhandledRequestHandler?: (args: httpFunc.ReceiverUnhandledRequestHandlerArgs) => void;
unhandledRequestTimeoutMillis?: number;
invalidRequestSignatureHandler?: (args: httpFunc.ReceiverInvalidRequestSignatureHandlerArgs) => void;
}

// All the available argument for OAuth flow enabled apps
Expand Down Expand Up @@ -169,6 +170,8 @@ export default class HTTPReceiver implements Receiver {

private unhandledRequestTimeoutMillis: number;

private invalidRequestSignatureHandler: (args: httpFunc.ReceiverInvalidRequestSignatureHandlerArgs) => void;

public constructor({
signingSecret = '',
endpoints = ['/slack/events'],
Expand All @@ -190,6 +193,7 @@ export default class HTTPReceiver implements Receiver {
processEventErrorHandler = httpFunc.defaultProcessEventErrorHandler,
unhandledRequestHandler = httpFunc.defaultUnhandledRequestHandler,
unhandledRequestTimeoutMillis = 3001,
invalidRequestSignatureHandler = httpFunc.defaultInvalidRequestSignatureHandler,
}: HTTPReceiverOptions) {
// Initialize instance variables, substituting defaults for each value
this.signingSecret = signingSecret;
Expand Down Expand Up @@ -254,6 +258,7 @@ export default class HTTPReceiver implements Receiver {
this.processEventErrorHandler = processEventErrorHandler;
this.unhandledRequestHandler = unhandledRequestHandler;
this.unhandledRequestTimeoutMillis = unhandledRequestTimeoutMillis;
this.invalidRequestSignatureHandler = invalidRequestSignatureHandler;

// Assign the requestListener property by binding the unboundRequestListener to this instance
this.requestListener = this.unboundRequestListener.bind(this);
Expand Down Expand Up @@ -448,6 +453,15 @@ export default class HTTPReceiver implements Receiver {
const e = err as Error;
if (this.signatureVerification) {
this.logger.warn(`Failed to parse and verify the request data: ${e.message}`);
const signature = req.headers['x-slack-signature'];
const ts = req.headers['x-slack-request-timestamp'];
this.invalidRequestSignatureHandler({
signature: Array.isArray(signature) ? signature[0] : signature,
ts: ts ? Number(Array.isArray(ts) ? ts[0] : ts) : undefined,
body: '',
request: req,
response: res,
});
} else {
this.logger.warn(`Failed to parse the request body: ${e.message}`);
}
Expand Down