Skip to content

Separate cookie actions "add" and "modify" #62

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
thomazz-nl wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Separate cookie actions "add" and "modify" #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7c8e70
Separate the cookie add/modify actions in dropdown.
thomazz-nl Jul 7, 2024
42caea4
Separate add/modify cookie actions
thomazz-nl Jul 7, 2024
e2c5966
Update and rename manifestV3..json to manifestV3.json
thomazz-nl Jul 7, 2024
23b7bfa
Update config.js indent issue
thomazz-nl Jul 7, 2024
812a926
F-up in background.js
thomazz-nl Jul 7, 2024
8e8afe8
Add cookie key/value when Cookie header is present, but key is missing
thomazz-nl Jul 7, 2024
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
56 changes: 47 additions & 9 deletions background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ function storeInBrowserStorage(item, callback_function) {
chrome.storage.local.set(item, callback_function);
}

function hasCookieKey(cookie, key) {
let cookieArray = cookie.value.split(';').filter((e) => e.trim().length > 0);
let cookieKeyIndex = cookieArray.findIndex((kv) => kv.trim().startsWith(key + '='));
return cookieKeyIndex !== -1;
}

/*
* This function set a key-value pair in HTTP header "Cookie",
* and returns the value of HTTP header after modification.
Expand Down Expand Up @@ -230,7 +236,7 @@ function rewriteRequestHeader(e) {
'Delete request header : name=' + to_modify.header_name.toLowerCase() + ' for url ' + e.url
);
}
} else if (to_modify.action === 'cookie_add_or_modify') {
} else if (to_modify.action === 'cookie_add') {
let header_cookie = e.requestHeaders.find((header) => header.name.toLowerCase() === 'cookie');
let new_cookie = cookie_keyvalues_set(
header_cookie === undefined ? '' : header_cookie.value,
Expand All @@ -241,16 +247,33 @@ function rewriteRequestHeader(e) {
e.requestHeaders.push({name: 'Cookie', value: new_cookie});
if (config.debug_mode)
log(
'cookie_add_or_modify.req new_header : name=Cookie,value=' +
'cookie_add.req new_header : name=Cookie,value=' +
new_cookie +
' for url ' +
e.url
);
} else {
} else if ( ! hasCookieKey(header_cookie, to_modify.header_name)) {
header_cookie.value = new_cookie;
if (config.debug_mode)
log(
'cookie_modify.req modify_header : name=Cookie,value=' +
new_cookie +
' for url ' +
e.url
);
}
} else if (to_modify.action === 'cookie_modify') {
let header_cookie = e.requestHeaders.find((header) => header.name.toLowerCase() === 'cookie');
let new_cookie = cookie_keyvalues_set(
header_cookie === undefined ? '' : header_cookie.value,
to_modify.header_name,
to_modify.header_value
);
if (header_cookie != undefined) {
header_cookie.value = new_cookie;
if (config.debug_mode)
log(
'cookie_add_or_modify.req modify_header : name=Cookie,value=' +
'cookie_modify.req modify_header : name=Cookie,value=' +
new_cookie +
' for url ' +
e.url
Expand Down Expand Up @@ -346,7 +369,7 @@ function rewriteResponseHeader(e) {
e.url
);
}
} else if (to_modify.action === 'cookie_add_or_modify') {
} else if (to_modify.action === 'cookie_add') {
let header_cookie = e.responseHeaders.find(
(header) =>
header.name.toLowerCase() === 'set-cookie' &&
Expand All @@ -362,21 +385,36 @@ function rewriteResponseHeader(e) {
);
if (header_cookie === undefined) {
log(
"SimpleModifyHeaders.Warning: you're using cookie_add_or_modify in Response. While adding new cookie in response, this plugin only generates `Set-Cookie: cookie-name=cookie-value `, without ANY additional attributes. Add a `Set-Cookie` header if you need them. "
"SimpleModifyHeaders.Warning: you're using cookie_add in Response. While adding new cookie in response, this plugin only generates `Set-Cookie: cookie-name=cookie-value `, without ANY additional attributes. Add a `Set-Cookie` header if you need them. "
);
e.responseHeaders.push({name: 'Set-Cookie', value: new_header_value});
if (config.debug_mode)
log(
'cookie_add_or_modify.resp new_header : name=Cookie,value=' +
'cookie_add.resp new_header : name=Cookie,value=' +
new_header_value +
' for url ' +
e.url
);
} else {
}
} else if (to_modify.action === 'cookie_modify') {
let header_cookie = e.responseHeaders.find(
(header) =>
header.name.toLowerCase() === 'set-cookie' &&
header.value
.toLowerCase()
.trim()
.startsWith(to_modify.header_name.toLowerCase() + '=')
);
let new_header_value = set_cookie_modify_cookie_value(
header_cookie === undefined ? '' : header_cookie.value,
to_modify.header_name,
to_modify.header_value
);
if (header_cookie != undefined) {
header_cookie.value = new_header_value;
if (config.debug_mode)
log(
'cookie_add_or_modify.resp modify_header : name=Cookie,value=' +
'cookie_modify.resp modify_header : name=Cookie,value=' +
new_header_value +
' for url ' +
e.url
Expand Down
2 changes: 1 addition & 1 deletion manifestV3..json → manifestV3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
"background": {
"service_worker": "service-worker.js"
}
}
}
3 changes: 2 additions & 1 deletion popup/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ function appendLine(url_contains, action, header_name, header_value, comment, ap
if (!useManifestV3) {
// Not available in Manifest V3
html += `
<option value="cookie_add_or_modify">Cookie Add/Modify</option>
<option value="cookie_add">Cookie Add</option>
<option value="cookie_modify">Cookie Modify</option>
<option value="cookie_delete">Cookie Delete</option> `;
}
html += `
Expand Down