From 2d160855ae3c79d30792301450158056b4120d9c Mon Sep 17 00:00:00 2001 From: varjolintu Date: Wed, 28 Feb 2018 11:28:09 +0200 Subject: [PATCH 1/7] Fixes checking an input type --- keepassxc-browser/keepassxc-browser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js index 2e0e208..b86ad3e 100755 --- a/keepassxc-browser/keepassxc-browser.js +++ b/keepassxc-browser/keepassxc-browser.js @@ -1446,7 +1446,7 @@ cip.fillInFromActiveElement = function(suppressWarnings, passOnly = false) { cipFields.setUniqueId(jQuery(el)); const fieldId = cipFields.prepareId(jQuery(el).attr('data-cip-id')); let combination = null; - if ($(el).toType === 'password') { + if ($(el).attr('type') === 'password') { combination = cipFields.getCombination('password', fieldId); } else { @@ -1695,7 +1695,7 @@ cip.contextMenuRememberCredentials = function() { cipFields.setUniqueId(jQuery(el)); const fieldId = cipFields.prepareId(jQuery(el).attr('data-cip-id')); let combination = null; - if ($(el).toType === 'password') { + if ($(el).attr('type') === 'password') { combination = cipFields.getCombination('password', fieldId); } else { From 89efaa40cb25676f5ab15930a3f564100d4ad116 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Thu, 1 Mar 2018 12:53:43 +0200 Subject: [PATCH 2/7] Update the required KeePassXC version to 2.3.0 --- keepassxc-browser/background/keepass.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js index e734ca1..74859d0 100755 --- a/keepassxc-browser/background/keepass.js +++ b/keepassxc-browser/background/keepass.js @@ -11,7 +11,7 @@ keepass.isDatabaseClosed = false; keepass.isKeePassXCAvailable = false; keepass.isEncryptionKeyUnrecognized = false; keepass.currentKeePassXC = {'version': 0, 'versionParsed': 0}; -keepass.requiredKeePassXC = 220; +keepass.requiredKeePassXC = 230; keepass.nativeHostName = 'org.keepassxc.keepassxc_browser'; keepass.nativePort = null; keepass.keySize = 24; From 521dfbf363b154ae63abd039c57d330ff2902634 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sat, 3 Mar 2018 11:52:18 +0200 Subject: [PATCH 3/7] Add support to Firefox ESR --- keepassxc-browser/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json index ee7c688..1d949ef 100755 --- a/keepassxc-browser/manifest.json +++ b/keepassxc-browser/manifest.json @@ -104,7 +104,7 @@ "applications": { "gecko": { "id": "keepassxc-browser@keepassxc.org", - "strict_min_version": "55.0" + "strict_min_version": "52.0" } } } From 5b5a3fcc840dc5132d5639c7517cf6f5eba8fbb0 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Wed, 28 Feb 2018 10:39:13 +0200 Subject: [PATCH 4/7] Choose credential fields works with multiple windows visible --- keepassxc-browser/popups/popup_functions.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/keepassxc-browser/popups/popup_functions.js b/keepassxc-browser/popups/popup_functions.js index f78182c..206938b 100644 --- a/keepassxc-browser/popups/popup_functions.js +++ b/keepassxc-browser/popups/popup_functions.js @@ -15,11 +15,16 @@ function initSettings() { }); $('#settings #btn-choose-credential-fields').click(function() { - browser.runtime.getBackgroundPage().then((global) => { - browser.tabs.sendMessage(global.page.currentTabId, { - action: 'choose_credential_fields' + browser.windows.getCurrent().then((win) => { + browser.tabs.query({ 'active': true, 'currentWindow': true }).then((tabs) => { + const tab = tabs[0]; + browser.runtime.getBackgroundPage().then((global) => { + browser.tabs.sendMessage(tab.id, { + action: 'choose_credential_fields' + }); + close(); + }); }); - close(); }); }); } From 0eb65ec2a10868fa085dac1c9fe00e589d0d66f7 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sun, 4 Mar 2018 08:53:44 +0200 Subject: [PATCH 5/7] Fixes the custom placeholders --- keepassxc-browser/keepassxc-browser.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js index b86ad3e..842bc7b 100755 --- a/keepassxc-browser/keepassxc-browser.js +++ b/keepassxc-browser/keepassxc-browser.js @@ -1504,15 +1504,16 @@ cip.setValue = function(field, value) { } }; -cip.fillInStringFields = function(fields, StringFields, filledInFields) { +cip.fillInStringFields = function(fields, stringFields, filledInFields) { let $filledIn = false; filledInFields.list = []; - if (fields && StringFields && fields.length > 0 && StringFields.length > 0) { + if (fields && stringFields && fields.length > 0 && stringFields.length > 0) { for (let i = 0; i < fields.length; i++) { const $sf = _fs(fields[i]); - if ($sf && StringFields[i]) { - cip.setValue($sf, StringFields[i].Value); + const stringFieldValue = Object.values(stringFields[i]); + if ($sf && stringFieldValue[0]) { + cip.setValue($sf, stringFieldValue[0]); filledInFields.list.push(fields[i]); $filledIn = true; } From c31243fec10ca5a22f6c0df578841ceefb6ca35a Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sun, 4 Mar 2018 09:34:49 +0200 Subject: [PATCH 6/7] Prevents password fill if input already has some data --- keepassxc-browser/keepassxc-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js index 842bc7b..88c7064 100755 --- a/keepassxc-browser/keepassxc-browser.js +++ b/keepassxc-browser/keepassxc-browser.js @@ -148,7 +148,7 @@ cipAutocomplete.onBlur = function() { else { const fieldId = cipFields.prepareId(jQuery(this).attr('data-cip-id')); const fields = cipFields.getCombination('username', fieldId); - if (_f(fields.password) && _f(fields.password).data('unchanged') !== true && jQuery(this).val() !== '') { + if (_f(fields.password) && _f(fields.password).data('unchanged') !== true && jQuery(this).val() !== '' && _detectedFields > 1) { cip.fillInCredentials(fields, true, true); } } From 063c048625bdc3df2ad6bcfed982c83feb596dc9 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Sun, 4 Mar 2018 23:38:23 +0100 Subject: [PATCH 7/7] Update version to 1.0.1 --- CHANGELOG | 7 +++++++ keepassxc-browser/manifest.json | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 69175e5..12e6727 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +1.0.1 (04-03-2018) +========================= +- Don't fill password fields if they already have data +- Fix custom placeholders +- Fix input type checks +- Fix custom input fields with multiple tabs + 1.0.0 (27-02-2018) ========================= - First stable release diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json index 1d949ef..0838780 100755 --- a/keepassxc-browser/manifest.json +++ b/keepassxc-browser/manifest.json @@ -1,8 +1,8 @@ { "manifest_version": 2, "name": "KeePassXC-Browser", - "version": "1.0.0", - "version_name": "1.0.0", + "version": "1.0.1", + "version_name": "1.0.1", "description": "KeePassXC integration for modern web browsers", "author": "KeePassXC Team", "icons": {