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

Fix Stack and Cookies issues for Firefox #65

Merged
merged 2 commits into from
Feb 15, 2018
Merged

Fix Stack and Cookies issues for Firefox #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41d26e1
fix headers with cookies for firefox
gbaptista Feb 15, 2018
d7f2429
fix Maximum call stack size exceeded
gbaptista Feb 15, 2018
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: 34 additions & 27 deletions js/background/headers_and_options_listeners.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,48 +103,55 @@ var update_security_policies_and_set_cookies = function(request_details) {
if(cached_settings) {
// TODO check if cookie names exist.
var le_cookie_value = 'f';
var ld_cookie_value = 'f';

if(should_intercept_header(request_details.url)) {
le_cookie_value = 't';
}

request_details.responseHeaders.push({
name: 'Set-Cookie',
value: 'le=' + le_cookie_value + '; Path=/; Max-Age=1'
});
if(cached_settings['popup']['show_code_details']) {
ld_cookie_value = 't';
}

request_details.responseHeaders.push({
name: 'Set-Cookie',
value: 'ls=' + settings_for_url(request_details.url, true) + '; Path=/; Max-Age=1'
});
var luminous_cookies = [];

var ld_value = 'f';
luminous_cookies.push('le=' + le_cookie_value + '; Path=/; Max-Age=1;');
luminous_cookies.push(
'ls=' + settings_for_url(request_details.url, true) + '; Path=/; Max-Age=1;'
);
luminous_cookies.push('ld=' + ld_cookie_value + '; Path=/; Max-Age=1;');

if(cached_settings['popup']['show_code_details']) {
ld_value = 't';
}
var cookies_injected = false;

if(typeof browser !== 'undefined') {
// Probably a Gecko-based browser
for(let header of request_details.responseHeaders) {
if(!cookies_injected && header.name.toLowerCase() == 'set-cookie') {
cookies_injected = true;
header.value += "\n" + luminous_cookies.join("\n");
}
}

request_details.responseHeaders.push({
name: 'Set-Cookie',
value: 'ld=' + ld_value + '; Path=/; Max-Age=1'
});
if(!cookies_injected) {
request_details.responseHeaders.push({
name: 'Set-Cookie', value: luminous_cookies.join("\n")
});
}
} else {
// Probably a Chromium-based browser
for(i in luminous_cookies) {
request_details.responseHeaders.push({
name: 'Set-Cookie', value: luminous_cookies[i]
});
}
}
}

return { responseHeaders: request_details.responseHeaders };
}

chrome.webRequest.onBeforeSendHeaders.addListener(
function(request_details) {
// TODO Remove cookies from haders.

return { responseHeaders: request_details.responseHeaders };
},
{ urls: ['<all_urls>'], types: ['main_frame', 'sub_frame'] },
['requestHeaders', 'blocking']
)

chrome.webRequest.onHeadersReceived.addListener(
update_security_policies_and_set_cookies,
{ 'urls': ['<all_urls>'] },
{ urls: ['<all_urls>'], types: ['main_frame', 'sub_frame'] },
['responseHeaders', 'blocking']
);
10 changes: 5 additions & 5 deletions js/content/interceptor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ var increment_counter = function(kind, type, result, details) {
);

counters_changed = true;
}, 0);
}, 0, '__INTERNAL_LUMINOUS_CODE__');
}

var is_allowed = function(kind, type) {
Expand Down Expand Up @@ -137,7 +137,7 @@ if(!get_options()['injection_disabled']) {

if (typeof(listener) === 'function') {
return listener(event);
} else {
} else if (listener && typeof(listener.handleEvent) === 'function') {
return listener.handleEvent(event);
}
}
Expand Down Expand Up @@ -291,7 +291,7 @@ if(!get_options()['injection_disabled']) {
) {
var super_this = this;

if(get_options()['injection_disabled']) {
if(get_options()['injection_disabled'] || p1 == '__INTERNAL_LUMINOUS_CODE__') {
return original_window_setInterval.call(
super_this, function_or_code, delay,
p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12
Expand Down Expand Up @@ -359,7 +359,7 @@ if(!get_options()['injection_disabled']) {
) {
var super_this = this;

if(get_options()['injection_disabled']) {
if(get_options()['injection_disabled'] || p1 == '__INTERNAL_LUMINOUS_CODE__') {
return original_window_setTimeout.call(
super_this, function_or_code, delay,
p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12
Expand Down Expand Up @@ -411,4 +411,4 @@ original_window_setInterval(function() {

element.setAttribute('data-changed', 'true');
}
}, 300);
}, 300, '__INTERNAL_LUMINOUS_CODE__');