Skip to content

Ask user confirmation before attempting http authentication #303

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

Ask user confirmation before attempting http authentication #303

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
34 changes: 32 additions & 2 deletions js/background/inject/inject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,36 @@ $j(document).ready(function () {

_this.copyText = copyText;

function httpAuthRequest(args, sender, sendResponse) {
var login = args.data.login;
var requestDetails = args.data.requestDetails;
var username = (login.username) ? login.username : login.email;
var identity;

if (login.username && login.email)
{
identity = login.username + " (" + login.email + ")";
} else {
identity = username;
}

var useLogin = confirm("Passman: Login as " + identity + " on " + requestDetails.url + "?");
var credentials = null;

if (useLogin) {
credentials = {
username: username,
password: login.password
};
}

sendResponse({
credentials: credentials
});
}

_this.httpAuthRequest = httpAuthRequest;

function init() {
checkForMined();
initForms();
Expand All @@ -403,10 +433,10 @@ $j(document).ready(function () {
}
}, 10);

API.runtime.onMessage.addListener(function (msg, sender) {
API.runtime.onMessage.addListener(function (msg, sender, sendResponse) {
//console.log('Method call', msg.method);
if (_this[msg.method]) {
_this[msg.method](msg.args, sender);
_this[msg.method](msg.args, sender, sendResponse);
}
});
});
45 changes: 36 additions & 9 deletions js/background/service/httpAuth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
}

var auth_tries = [];
var provideCredentialsSync = function (requestDetails) {
var provideCredentialsSync = function (requestDetails, asyncCallback) {
if (!auth_tries[requestDetails.requestId]) {
auth_tries[requestDetails.requestId] = 0;
}
Expand All @@ -48,23 +48,50 @@
// assume our credentials were bad, and give up.
if (pendingRequests.indexOf(requestDetails.requestId) === -1) {
pendingRequests.push(requestDetails.requestId);
return {
authCredentials: {
username: (login.username) ? login.username : login.email ,
password: login.password
}
};
if (login) {
var data = {
login: login,
requestDetails: requestDetails
};
API.tabs.sendMessage(requestDetails.tabId, {
method: 'httpAuthRequest',
args: {
data: data
}
}).then(function (response) {
var result;
if (response != null) {
var credentials = response.credentials;
if (credentials != null) {
result = {
authCredentials: credentials
};
}
} else {
var username = (login.username) ? login.username : login.email;
result = {
authCredentials: {
username: username,
password: login.password
}
};
}
asyncCallback(result);
});
} else {
asyncCallback(undefined);
}

} else {
console.warn("bad credentials for: " + requestDetails.url + ', Showing login dialog');
//return {cancel: true};
return undefined;
asyncCallback(undefined);
}

};


API.webRequest.onAuthRequired.addListener(provideCredentialsSync, {urls: ["<all_urls>"]}, ["blocking"]);
API.webRequest.onAuthRequired.addListener(provideCredentialsSync, {urls: ["<all_urls>"]}, ["asyncBlocking"]);

API.webRequest.onCompleted.addListener(
completed,
Expand Down