prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #652 from keepassxreboot/fix/handle_iframe_inputs

Browse source 
Handle cross-domain iframe inputs correctly
This commit is contained in:
Sami Vänttinen 2019-11-01 08:58:59 +02:00 committed by GitHub
commit 94d2c730a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
keepassxc-browser/content/keepassxc-browser.js
View file

@ -878,6 +878,33 @@ kpxc.detectDatabaseChange = async function(response) {
}
};
// Checks if the site has been ignored using Site Preferences
kpxc.siteIgnored = function() {
kpxc.initializeSitePreferences();
if (kpxc.settings.sitePreferences) {
let currentLocation;
try {
currentLocation = window.top.location.href;
} catch (err) {
// Cross-domain security error inspecting window.top.location.href.
// This catches an error when an iframe is being accessed from another (sub)domain -> use the iframe URL instead.
currentLocation = window.self.location.href;
}
for (const site of kpxc.settings.sitePreferences) {
if (siteMatch(site.url, currentLocation) || site.url === currentLocation) {
if (site.ignore === IGNORE_FULL) {
return true;
}
_singleInputEnabledForPage = site.usernameOnly;
}
}
}
return false;
};
kpxc.initCredentialFields = async function(forceCall) {
if (_called.initCredentialFields && !forceCall) {
return;
@ -891,22 +918,8 @@ kpxc.initCredentialFields = async function(forceCall) {
_called.clearLogins = true;
// Check site preferences
kpxc.initializeSitePreferences();
if (kpxc.settings.sitePreferences) {
for (const site of kpxc.settings.sitePreferences) {
try {
if (siteMatch(site.url, window.top.location.href) || site.url === window.top.location.href) {
if (site.ignore === IGNORE_FULL) {
return;
}
_singleInputEnabledForPage = site.usernameOnly;
}
} catch (err) {
return;
}
}
if (kpxc.siteIgnored()) {
return;
}
const inputs = kpxcFields.getAllFields();