colin/browserpass-extension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assume current domain is valid, even if the TLD is not (#107)

Browse Source
This commit is contained in:
Erayd
2019-04-15 01:21:51 +12:00
committed by GitHub
parent 0f068a4591
commit bb29fb3122
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/background.js
View File

@@ -57,17 +57,23 @@ chrome.runtime.onInstalled.addListener(onExtensionInstalled);
* *
* @since 3.0.0 * @since 3.0.0
* *
* @param string path Path to parse * @param string path Path to parse
* @param string currentHost Current hostname for the active tab
* @return string|null Extracted domain * @return string|null Extracted domain
*/ */
function pathToDomain(path) { function pathToDomain(path, currentHost) {
var parts = path.split(/\//).reverse(); var parts = path.split(/\//).reverse();
for (var key in parts) { for (var key in parts) {
if (parts[key].indexOf("@") >= 0) { if (parts[key].indexOf("@") >= 0) {
continue; continue;
} }
var t = TldJS.parse(parts[key]); var t = TldJS.parse(parts[key]);
if (t.isValid && t.tldExists && t.domain !== null) { if (
t.isValid &&
((t.tldExists && t.domain !== null) ||
t.hostname === currentHost ||
currentHost.endsWith(`.${t.hostname}`))
) {
return t.hostname; return t.hostname;
} }
} }
@@ -104,7 +110,7 @@ async function updateMatchingPasswordsCount(tabId) {
for (var storeId in response.data.files) { for (var storeId in response.data.files) {
for (var key in response.data.files[storeId]) { for (var key in response.data.files[storeId]) {
const login = response.data.files[storeId][key].replace(/\.gpg$/i, ""); const login = response.data.files[storeId][key].replace(/\.gpg$/i, "");
const domain = pathToDomain(storeId + "/" + login); const domain = pathToDomain(storeId + "/" + login, currentDomain);
const inCurrentDomain = const inCurrentDomain =
currentDomain === domain || currentDomain.endsWith("." + domain); currentDomain === domain || currentDomain.endsWith("." + domain);
const recent = settings.recent[sha1(currentDomain + sha1(storeId + sha1(login)))]; const recent = settings.recent[sha1(currentDomain + sha1(storeId + sha1(login)))];

14
src/popup/popup.js
View File

@@ -34,17 +34,23 @@ function handleError(error, type = "error") {
* *
* @since 3.0.0 * @since 3.0.0
* *
* @param string path Path to parse * @param string path Path to parse
* @param string currentHost Current hostname for the active tab
* @return string|null Extracted domain * @return string|null Extracted domain
*/ */
function pathToDomain(path) { function pathToDomain(path, currentHost) {
var parts = path.split(/\//).reverse(); var parts = path.split(/\//).reverse();
for (var key in parts) { for (var key in parts) {
if (parts[key].indexOf("@") >= 0) { if (parts[key].indexOf("@") >= 0) {
continue; continue;
} }
var t = TldJS.parse(parts[key]); var t = TldJS.parse(parts[key]);
if (t.isValid && t.tldExists && t.domain !== null) { if (
t.isValid &&
((t.tldExists && t.domain !== null) ||
t.hostname === currentHost ||
currentHost.endsWith(`.${t.hostname}`))
) {
return t.hostname; return t.hostname;
} }
} }
@@ -92,7 +98,7 @@ async function run() {
login: response.files[storeId][key].replace(/\.gpg$/i, ""), login: response.files[storeId][key].replace(/\.gpg$/i, ""),
allowFill: true allowFill: true
}; };
login.domain = pathToDomain(storeId + "/" + login.login); login.domain = pathToDomain(storeId + "/" + login.login, settings.host);
login.inCurrentDomain = login.inCurrentDomain =
settings.host == login.domain || settings.host.endsWith("." + login.domain); settings.host == login.domain || settings.host.endsWith("." + login.domain);
login.recent = login.recent =