Skip to content

Use URL() instead Regexp on protocol #8

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
eeoun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use URL() instead Regexp on protocol #8

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
22 changes: 15 additions & 7 deletions lib/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

const HTTP_PROTOCOL="http:"
const HTTPS_PROTOCOL="https:"

var httpObject = config.http.object, httpsObject = config.https.object;

window.setTimeout(function () {
Expand Down Expand Up @@ -169,7 +172,7 @@ var errorHandler = function (error, details, force, host) {
window.setTimeout(function () {
app.tabQuery(details, function (tab) {
if (tab) {
if (force || /^https:\/\//i.test(details.url)) {
if (force || new URL(details.url).protocol==HTTPS_PROTOCOL) {
config.http.proxy[domain].error = true;
config.http.proxy[domain].incognito = tab.incognito;
config.http.object = httpObject;
Expand Down Expand Up @@ -211,7 +214,7 @@ var handleExtraErrors = function (top, details) {
else callback({"error": ('net::ERR_XHR_STATUS_' + xhr.status), "details": xhr._details});
}
else { /* if the response URL is HTTP, we still have the error */
if (/^http:\/\//i.test(xhr.responseURL)) callback({"error": 'net::ERR_XHR_REDIRECT', "details": xhr._details});
if (new URL(xhr.responseURL).protocol==HTTP_PROTOCOL) callback({"error": 'net::ERR_XHR_REDIRECT', "details": xhr._details});
else callback({"error": '', "details": xhr._details});
}
}
Expand All @@ -234,9 +237,12 @@ var handleExtraErrors = function (top, details) {
};

app.onBeforeRequest(function (details) {
var top = details.url;
if (/^http:\/\//i.test(top)) {
var newURL = top.replace(/^http:\/\//i, 'https://');
let top = details.url;
let urlObj=new URL(details.url);
if (urlObj.protocol==HTTP_PROTOCOL) {
urlObj.protocol=HTTPS_PROTOCOL;
let newURL= urlObj.toString();
// var newURL = top.replace(/^http:\/\//i, 'https://');
httpObject = config.http.object;
httpsObject = config.https.object;
var domain = app.toHostname(top);
Expand All @@ -259,7 +265,8 @@ app.onBeforeRequest(function (details) {

app.onHeadersReceived(function (domain, details) {
if (config.addon.typemissmatch) {
if (/^http:\/\//i.test(details.url)) {
let urlObj=new URL(details.url);
if (urlObj.protocol==HTTP_PROTOCOL) {
if (config.http.proxy[domain]) {
if (!config.http.proxy[domain].error) {
errorHandler("net::ERR_TYPE_MISMATCH", details, true, domain);
Expand All @@ -272,6 +279,7 @@ app.onHeadersReceived(function (domain, details) {
app.onCompleted(function (e) {
var _check = function (details) {
var top = details.url;
let urlObj=new URL(details.url);
var domain = app.toHostname(top);
var msg1 = " - HTTPS is OK (" + domain + "), cleaning whitelist table";
var msg2 = " - HTTPS had Error (" + domain + "), but removed from whitelist because whitelisting is disabled";
Expand All @@ -289,7 +297,7 @@ app.onCompleted(function (e) {
httpsObject = config.https.object;
if (config.http.proxy[domain]) {
if (!details.error || config.https.proxy[domain]) {
var flag = /^https:\/\//i.test(details.url) && !config.http.proxy[domain].error;
var flag = urlObj.protocol==HTTPS_PROTOCOL && !config.http.proxy[domain].error;
if (flag) _clean(domain, msg1);
else if (config.addon.dwhitelisting) _clean(domain, msg2);
else if (config.http.proxy[domain].incognito && config.addon.incognito) _clean(domain, msg4);
Expand Down