Skip to content
This repository was archived by the owner on Jun 13, 2023. It is now read-only.

Commit 08d6db2

Browse files
authored
fix(amqp.js): verify headers in bunnybus (#167)
* fix(amqp.js): verify headers in bunnybus * fix(index): cr
1 parent d16310f commit 08d6db2

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/wrappers/amqp.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function amqpSubscriberMiddleware(
2929
let nodeEvent;
3030
let nodeStartTime;
3131
try {
32-
if (headers.bunnyBus) {
32+
if (typeof headers === 'object' && headers.bunnyBus) {
3333
utils.debugLog('[amqp] Skipping BunnyBus messages');
3434
return originalCallback(message, headers, deliveryInfo, messageObject);
3535
}

src/wrappers/amqplib.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ function amqplibSubscriberMiddleware(message, callback, channel) {
2626
let nodeStartTime;
2727
const tracerObj = tracer.getTrace();
2828
try {
29-
if (message.properties.headers.bunnyBus) {
29+
if (
30+
message && message.properties &&
31+
typeof message.properties.headers === 'object' &&
32+
message.properties.headers.bunnyBus
33+
) {
3034
utils.debugLog('[amqplib] Skipping BunnyBus messages');
3135
return callback(message);
3236
}
@@ -142,7 +146,11 @@ function amqplibConsumerWrapper(wrappedFunction) {
142146
let patchedCallback = callback;
143147
if (typeof callback === 'function') {
144148
patchedCallback = (message) => {
145-
if (message.properties.headers.bunnyBus) {
149+
if (
150+
message && message.properties &&
151+
typeof message.properties.headers === 'object' &&
152+
message.properties.headers.bunnyBus
153+
) {
146154
utils.debugLog('[amqplib] Skipping BunnyBus messages');
147155
return callback(message);
148156
}

0 commit comments

Comments
 (0)