Skip to content

fix: headers should be case-insensitive #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
victordidenko wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: headers should be case-insensitive #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 18 additions & 5 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,26 @@ export const merge = (...args) => {
};

export const mergeAndRemoveNull = (...args) => {
const result = merge(...args);
const result = {};

// Any header whose value is `null` will be removed.
Object.keys(result).forEach(k => {
if (result[k] === null) {
delete result[k];
args.forEach((headers) => {
if (!headers) {
return;
}

Object.keys(headers).forEach((header) => {
const value = headers[header];

// Lowercase the header name to be consistent.
header = header.toLowerCase();

if (value !== null) {
result[header] = value;
} else {
// Any header whose value is `null` will be removed.
delete result[header];
}
});
});

return result;
Expand Down
14 changes: 7 additions & 7 deletions test/eme.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ QUnit.test('accepts a license URL as an option', function(assert) {
requestType: 'license',
body: 'the-message',
headers: {
'Content-type': 'application/octet-stream'
'content-type': 'application/octet-stream'
}
}, 'made request with proper options');

Expand Down Expand Up @@ -453,7 +453,7 @@ QUnit.test('accepts a license URL as property', function(assert) {
requestType: 'license',
body: 'the-message',
headers: {
'Content-type': 'application/octet-stream'
'content-type': 'application/octet-stream'
}
}, 'made request with proper options');

Expand Down Expand Up @@ -1148,7 +1148,7 @@ QUnit.test('emeHeaders option sets headers on default license xhr request', func
'com.widevine.alpha': 'some-url'
},
emeHeaders: {
'Some-Header': 'some-header-value'
'some-header': 'some-header-value'
}
},
eventBus: mockEventBus
Expand All @@ -1170,8 +1170,8 @@ QUnit.test('emeHeaders option sets headers on default license xhr request', func
requestType: 'license',
body: 'the-message',
headers: {
'Content-type': 'application/octet-stream',
'Some-Header': 'some-header-value'
'content-type': 'application/octet-stream',
'some-header': 'some-header-value'
}
}, 'made request with proper emeHeaders option value');

Expand Down Expand Up @@ -1249,8 +1249,8 @@ QUnit.test('licenseHeaders keySystems property overrides emeHeaders value', func
requestType: 'license',
body: 'the-message',
headers: {
'Content-type': 'application/octet-stream',
'Some-Header': 'priority-header-value'
'content-type': 'application/octet-stream',
'some-header': 'priority-header-value'
}
}, 'made request with proper licenseHeaders value');

Expand Down
12 changes: 6 additions & 6 deletions test/fairplay.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,8 @@ QUnit.test('emeHeaders sent with license and certificate requests', function(ass
requestType: 'license',
body: undefined,
headers: {
'Content-type': 'application/octet-stream',
'Some-Header': 'some-header-value'
'content-type': 'application/octet-stream',
'some-header': 'some-header-value'
}
}, 'made license request with proper emeHeaders value');

Expand All @@ -467,7 +467,7 @@ QUnit.test('emeHeaders sent with license and certificate requests', function(ass
responseType: 'arraybuffer',
requestType: 'license',
headers: {
'Some-Header': 'some-header-value'
'some-header': 'some-header-value'
}
}, 'made certificate request with proper emeHeaders value');

Expand Down Expand Up @@ -512,8 +512,8 @@ QUnit.test('licenseHeaders and certificateHeaders properties override emeHeaders
requestType: 'license',
body: undefined,
headers: {
'Content-type': 'application/octet-stream',
'Some-Header': 'higher-priority-license-header'
'content-type': 'application/octet-stream',
'some-header': 'higher-priority-license-header'
}
}, 'made license request with proper licenseHeaders value');

Expand All @@ -522,7 +522,7 @@ QUnit.test('licenseHeaders and certificateHeaders properties override emeHeaders
responseType: 'arraybuffer',
requestType: 'license',
headers: {
'Some-Header': 'higher-priority-cert-header'
'some-header': 'higher-priority-cert-header'
}
}, 'made certificate request with proper certificateHeaders value');

Expand Down
16 changes: 8 additions & 8 deletions test/ms-prefixed.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ QUnit.test('makes request when nothing provided on key message', function(assert
assert.deepEqual(
xhrCalls[0].config.headers,
{
'Content-Type': 'text/xml; charset=utf-8',
'SOAPAction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"'
'content-type': 'text/xml; charset=utf-8',
'soapaction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"'
},
'uses headers from message'
);
Expand Down Expand Up @@ -348,8 +348,8 @@ QUnit.test(
assert.deepEqual(
xhrCalls[0].config.headers,
{
'Content-Type': 'text/xml; charset=utf-8',
'SOAPAction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"'
'content-type': 'text/xml; charset=utf-8',
'soapaction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"'
},
'uses headers from message'
);
Expand Down Expand Up @@ -416,8 +416,8 @@ QUnit.test('makes request with provided url string on key message', function(ass
assert.deepEqual(
xhrCalls[0].config.headers,
{
'Content-Type': 'text/xml; charset=utf-8',
'SOAPAction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"'
'content-type': 'text/xml; charset=utf-8',
'soapaction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"'
},
'uses headers from message'
);
Expand Down Expand Up @@ -512,8 +512,8 @@ QUnit.test('makes request with provided url on key message', function(assert) {
assert.deepEqual(
xhrCalls[0].config.headers,
{
'Content-Type': 'text/xml; charset=utf-8',
'SOAPAction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"'
'content-type': 'text/xml; charset=utf-8',
'soapaction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"'
},
'uses headers from message'
);
Expand Down
12 changes: 6 additions & 6 deletions test/playready.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ QUnit.test('emeHeaders sent with license requests', function(assert) {
uri: 'some-url',
method: 'post',
headers: {
'Content-Type': 'text/xml; charset=utf-8',
'SOAPAction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"',
'Some-Header': 'some-header-value'
'content-type': 'text/xml; charset=utf-8',
'soapaction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"',
'some-header': 'some-header-value'
},
body: challengeElement,
responseType: 'arraybuffer',
Expand Down Expand Up @@ -104,9 +104,9 @@ QUnit.test('licenseHeaders property overrides emeHeaders', function(assert) {
uri: 'some-url',
method: 'post',
headers: {
'Content-Type': 'text/xml; charset=utf-8',
'SOAPAction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"',
'Some-Header': 'priority-header-value'
'content-type': 'text/xml; charset=utf-8',
'soapaction': '"http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense"',
'some-header': 'priority-header-value'
},
body: challengeElement,
responseType: 'arraybuffer',
Expand Down