Skip to content
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

Fixed bug when multiple headers have the same name #16

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

Fixed bug when multiple headers have the same name #16

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
61 changes: 60 additions & 1 deletion background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,39 @@ var alteredCount = 0;
*/
var displayCount = true;

/**
* List of appendable headers
* @source https://github.com/WebKit/webkit/blob/5277f6fb92b0c03958265d24a7692142f7bdeaf8/Source/WebCore/platform/network/curl/ResourceHandleManager.cpp#L354
*/
var APPENDABLE_HEADERS = [
'access-control-allow-headers',
'access-control-allow-methods',
'access-control-allow-origin',
'access-control-expose-headers',
'allow',
'cache-control',
'connection',
'content-encoding',
'content-language',
'if-match',
'if-none-match',
'keep-alive',
'pragma',
'proxy-authenticate',
'public',
'server',
'set-cookie',
'te',
'trailer',
'transfer-encoding',
'upgrade',
'user-agent',
'vary',
'via',
'warning',
'www-authenticate'
];

/**
* Returns the index of a given header object in the provided array
* @param headerArray The Array to search in
Expand All @@ -39,7 +72,33 @@ function getHeaderIndex(headerArray, newHeader) {
function mergeNewHeaders(originalHeaders, newHeaders) {
//copy the headers for our own usage
var mergedHeaders = originalHeaders.slice();
for (var i = 0, len = newHeaders.length; i < len; i++) {
var headerRefMap = {};
var i, len;

// Pre-process headers by merging duplicate entries
for (i = 0, len = mergedHeaders.length; i < len; ) {
var header = mergedHeaders[i];
var name = header.name.toLowerCase();

if (!headerRefMap.hasOwnProperty(name)) {
headerRefMap[name] = header;
i++;
} else {
// Header already set ! Remove it from the list
// and modify the original header reference by
// concataining its value or replacing it.
if (APPENDABLE_HEADERS.indexOf(name) > -1) {
headerRefMap[name].value += ', ' + header.value;
} else {
headerRefMap[name].value = header.value;
}

mergedHeaders.splice(i, 1);
len--;
}
}

for (i = 0, len = newHeaders.length; i < len; i++) {
var index = getHeaderIndex(mergedHeaders, newHeaders[i]);

//if a matching header is defined, replace it
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name":"ForceCORS",
"author":"Chris Deely",
"version":"1.1",
"version":"1.2",
"description":"Allows forcing Cross-Origin Resource Sharing headers on any desired URL; helpful when accessing remote services from a local host.",
"homepage_url":"https://github.com/chrisdeely/ForceCORS",
"icons": {
Expand Down