Merge pull request #1599 from keepassxreboot/fix/password_generator_with_older_keepassxc1.7.12release/1.7.x

Fix password generator with KeePassXC version 2.7.0

4 files changed, 18 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index a304aad..3354294 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+1.7.12 (07-04-2022)
+=========================
+- Add support for the new password generator with KeePassXC 2.7.0.
+
 1.7.11 (11-12-2021)
 =========================
 - Add new Predefined Sites (FNAC, HP) [#1469]
diff --git a/keepassxc-browser/background/keepass.js b/keepassxc-browser/background/keepass.js
index e8b0d73..ab299cb 100755
--- a/keepassxc-browser/background/keepass.js
+++ b/keepassxc-browser/background/keepass.js
@@ -334,12 +334,16 @@ keepass.generatePassword = async function(tab) {
         const kpAction = kpActions.GENERATE_PASSWORD;
         const [ nonce, incrementedNonce ] = keepass.getNonces();
 
-        const request = {
+        const messageData = {
             action: kpAction,
             nonce: nonce,
-            clientID: keepass.clientID
+            clientID: keepass.clientID,
+            requestID: keepass.getRequestId(),
         };
 
+        const request = keepass.buildRequest(kpAction, keepass.encrypt(messageData, nonce), nonce, messageData.clientID);
+        request["requestID"] = messageData.requestID;
+
         const response = await keepass.sendNativeMessage(request);
         if (response.message && response.nonce) {
             const res = keepass.decrypt(response.message, response.nonce);
@@ -902,6 +906,11 @@ keepass.generateNewKeyPair = function() {
     //console.log(nacl.util.encodeBase64(keepass.keyPair.publicKey) + ' ' + nacl.util.encodeBase64(keepass.keyPair.secretKey));
 };
 
+// Creates a random 8 character string for Request ID
+keepass.getRequestId = function() {
+    return Math.random().toString(16).substring(2, 10);
+};
+
 keepass.isConfigured = async function() {
     if (typeof(keepass.databaseHash) === 'undefined') {
         const hash = keepass.getDatabaseHash();
diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json
index fda696e..c77f472 100755
--- a/keepassxc-browser/manifest.json
+++ b/keepassxc-browser/manifest.json
@@ -1,8 +1,8 @@
 {
     "manifest_version": 2,
     "name": "KeePassXC-Browser",
-    "version": "1.7.11",
-    "version_name": "1.7.11",
+    "version": "1.7.12",
+    "version_name": "1.7.12",
     "description": "__MSG_extensionDescription__",
     "author": "KeePassXC Team",
     "icons": {
diff --git a/package.json b/package.json
index 6045325..0b252aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "KeePassXC-Browser",
-  "version": "1.7.11",
+  "version": "1.7.12",
   "description": "KeePassXC-Browser",
   "main": "build.js",
   "devDependencies": {