Skip to content
Merged
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
5 changes: 5 additions & 0 deletions .changeset/new-eels-deliver.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue where enabling trace method calls setting was crashing the server.
10 changes: 8 additions & 2 deletions apps/meteor/app/lib/server/functions/getModifiedHttpHeaders.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
export const getModifiedHttpHeaders = (httpHeaders: Headers) => {
const modifiedHttpHeaders = { ...Object.fromEntries(httpHeaders.entries()) };
export const getModifiedHttpHeaders = (httpHeaders: Headers | Record<string, string>) => {
let modifiedHttpHeaders: { [k: string]: string };

if (httpHeaders instanceof Headers) {
modifiedHttpHeaders = { ...Object.fromEntries(httpHeaders.entries()) };
} else {
modifiedHttpHeaders = { ...httpHeaders };
}

if ('x-auth-token' in modifiedHttpHeaders) {
modifiedHttpHeaders['x-auth-token'] = '[redacted]';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,73 @@ import { expect } from 'chai';

import { getModifiedHttpHeaders } from '../../../../../../app/lib/server/functions/getModifiedHttpHeaders';

const inputVariants = [
{
label: 'HTTP path (Headers instance)',
makeInput: (headers: Record<string, string>) => new Headers(headers),
},
{
label: 'DDP path (plain object)',
makeInput: (headers: Record<string, string>) => headers,
},
];

describe('getModifiedHttpHeaders', () => {
it('should redact x-auth-token if present', () => {
const inputHeaders = {
'x-auth-token': '12345',
'some-other-header': 'value',
};
const result = getModifiedHttpHeaders(new Headers(inputHeaders));
expect(result['x-auth-token']).to.equal('[redacted]');
expect(result['some-other-header']).to.equal('value');
});

it('should not modify headers if x-auth-token is not present', () => {
const inputHeaders = {
'some-other-header': 'value',
};
const result = getModifiedHttpHeaders(new Headers(inputHeaders));
expect(result).to.deep.equal(inputHeaders);
});

it('should redact rc_token in cookies if present', () => {
const inputHeaders = {
cookie: 'session_id=abc123; rc_token=98765; other_cookie=value',
};
const expectedCookies = 'session_id=abc123; rc_token=[redacted]; other_cookie=value';
const result = getModifiedHttpHeaders(new Headers(inputHeaders));
expect(result.cookie).to.equal(expectedCookies);
});

it('should not modify cookies if rc_token is not present', () => {
const inputHeaders = {
cookie: 'session_id=abc123; other_cookie=value',
};
const result = getModifiedHttpHeaders(new Headers(inputHeaders));
expect(result.cookie).to.equal(inputHeaders.cookie);
});

it('should return headers unchanged if neither x-auth-token nor cookie are present', () => {
const inputHeaders = {
'some-other-header': 'value',
};
const result = getModifiedHttpHeaders(new Headers(inputHeaders));
expect(result).to.deep.equal(inputHeaders);
});

it('should handle cases with both x-auth-token and rc_token in cookie', () => {
const inputHeaders = {
'x-auth-token': '12345',
'cookie': 'session_id=abc123; rc_token=98765; other_cookie=value',
};
const expectedCookies = 'session_id=abc123; rc_token=[redacted]; other_cookie=value';
const result = getModifiedHttpHeaders(new Headers(inputHeaders));
expect(result['x-auth-token']).to.equal('[redacted]');
expect(result.cookie).to.equal(expectedCookies);
});
for (const { label, makeInput } of inputVariants) {
describe(label, () => {
it('should redact x-auth-token if present', () => {
const inputHeaders = {
'x-auth-token': '12345',
'some-other-header': 'value',
};
const result = getModifiedHttpHeaders(makeInput(inputHeaders));
expect(result['x-auth-token']).to.equal('[redacted]');
expect(result['some-other-header']).to.equal('value');
});

it('should not modify headers if x-auth-token is not present', () => {
const inputHeaders = {
'some-other-header': 'value',
};
const result = getModifiedHttpHeaders(makeInput(inputHeaders));
expect(result).to.deep.equal(inputHeaders);
});

it('should redact rc_token in cookies if present', () => {
const inputHeaders = {
cookie: 'session_id=abc123; rc_token=98765; other_cookie=value',
};
const expectedCookies = 'session_id=abc123; rc_token=[redacted]; other_cookie=value';
const result = getModifiedHttpHeaders(makeInput(inputHeaders));
expect(result.cookie).to.equal(expectedCookies);
});

it('should not modify cookies if rc_token is not present', () => {
const inputHeaders = {
cookie: 'session_id=abc123; other_cookie=value',
};
const result = getModifiedHttpHeaders(makeInput(inputHeaders));
expect(result.cookie).to.equal(inputHeaders.cookie);
});

it('should return headers unchanged if neither x-auth-token nor cookie are present', () => {
const inputHeaders = {
'some-other-header': 'value',
};
const result = getModifiedHttpHeaders(makeInput(inputHeaders));
expect(result).to.deep.equal(inputHeaders);
});

it('should handle cases with both x-auth-token and rc_token in cookie', () => {
const inputHeaders = {
'x-auth-token': '12345',
'cookie': 'session_id=abc123; rc_token=98765; other_cookie=value',
};
const expectedCookies = 'session_id=abc123; rc_token=[redacted]; other_cookie=value';
const result = getModifiedHttpHeaders(makeInput(inputHeaders));
expect(result['x-auth-token']).to.equal('[redacted]');
expect(result.cookie).to.equal(expectedCookies);
});
});
}
});
Loading