From 07c64a44a032158babba6acdd4fd100061529be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Sat, 30 Jun 2018 09:04:40 +0200
Subject: [PATCH] Fix addon :   * Error in wildcard domain generation   *
 Forgot some console.log in code (replace it with debug function)

---
 ChangeLog                          | 10 ++++++++++
 README.md                          |  2 +-
 chrome_addon/lib/main.js           |  6 ++++--
 chrome_addon/lib/misc.js           | 20 ++++++++++----------
 chrome_addon/manifest.json         |  2 +-
 firefox_webextension/manifest.json |  2 +-
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b92b2d7..ab971c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+**v0.8.2 :**
+Server
+
+Addon
+
+  * Error in wildcard domain generation
+  * Forgot some console.log in code (replace it with debug function)
+
+CLI
+
 **v0.8.1 :**
 
 Server
diff --git a/README.md b/README.md
index a0d5a49..a7ec5e8 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ A sample configuration file is available _gpass.ini.sample_
 Version Information
 -------------------
 
-Current version is 0.8. **(not compatible with 0.7)**
+Current version is 0.8.2 **(not compatible with 0.7)**
 
 Firefox will remove support for addons, so the gPass addon code is not supported since v0.8, please migrate to webextension.
 
diff --git a/chrome_addon/lib/main.js b/chrome_addon/lib/main.js
index a56d9cc..fbec0c8 100644
--- a/chrome_addon/lib/main.js
+++ b/chrome_addon/lib/main.js
@@ -293,7 +293,9 @@ function wildcard_domain(domain)
     {
 	res = "*.";
 	for (i=1; i<parts.length; i++)
-	    res += parts[i];
+	    res += parts[i] + ".";
+	// Remove last "."
+	return res.substr(0, res.length-1);
     }
     // Simple xxx.com
     else if (parts.length == 2)
@@ -458,7 +460,7 @@ async function self_test()
     	console.log("Self test OK !");
 }
 
-console.log("Welcome to gPass web extension v0.8.1 !");
+console.log("Welcome to gPass web extension v0.8.2 !");
 console.log("Privacy Policy can be found at http://indefero.soutade.fr/p/gpass/source/tree/master/PrivacyPolicy.md");
 console.log("");
 
diff --git a/chrome_addon/lib/misc.js b/chrome_addon/lib/misc.js
index 9d4fcb2..514fd33 100644
--- a/chrome_addon/lib/misc.js
+++ b/chrome_addon/lib/misc.js
@@ -80,11 +80,11 @@ function crypto_pbkdf2(mkey, salt, level)
 		    return key;
 		})
 		.catch(function(err){
-		    console.log("Error derive key " + err);
+		    debug("Error derive key " + err);
 		});
 	})
 	.catch(function(err) {
-	    console.log("Error import key" + err);
+	    debug("Error import key" + err);
 	});
 }
 
@@ -112,11 +112,11 @@ function simple_pbkdf2(mkey, salt, level)
 			});
 		})
 		.catch(function(err){
-		    console.log("Error derive key " + err);
+		    debug("Error derive key " + err);
 		});
 	})
 	.catch(function(err) {
-	    console.log("Error import key" + err);
+	    debug("Error import key" + err);
 	});
 }
 
@@ -136,7 +136,7 @@ function _encrypt(mkey, iv, data)
     	    return ab2str(encrypted);
     	})
     	.catch(function(encryption) {
-    	    console.log("Encryption rejected " + encryption);
+    	    debug("Encryption rejected " + encryption);
     	});
 
     return promise;
@@ -164,7 +164,7 @@ async function _decrypt(mkey, iv, data)
     	    return ab2str(decrypted);
     	})
     	.catch(function(decryption) {
-    	    console.log("Decryption rejected " + decryption);
+    	    debug("Decryption rejected " + decryption);
     	});
 
     return promise;
@@ -174,7 +174,7 @@ async function encrypt_ecb(mkey, data)
 {
     var result = "";
     
-    console.log("Encrypt ECB " + data);
+    debug("Encrypt ECB " + data);
 
     nulliv = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
 
@@ -195,7 +195,7 @@ async function decrypt_ecb(mkey, data)
 {
     var result = "";
 
-    console.log("Decrypt ECB " + data);
+    debug("Decrypt ECB " + data);
     
     nulliv = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
 
@@ -214,7 +214,7 @@ async function decrypt_ecb(mkey, data)
 
 async function encrypt_cbc(mkey, iv, data)
 { 
-    console.log("Encrypt CBC " + data);
+    debug("Encrypt CBC " + data);
 
     var result = await _encrypt(mkey, str2ab(iv), data);
     
@@ -224,7 +224,7 @@ async function encrypt_cbc(mkey, iv, data)
 
 async function decrypt_cbc(mkey, iv, data)
 {
-    console.log("Decrypt CBC " + data);
+    debug("Decrypt CBC " + data);
 
     var result = await _decrypt(mkey, str2ab(iv), data);
 
diff --git a/chrome_addon/manifest.json b/chrome_addon/manifest.json
index 423c03c..f9e230d 100644
--- a/chrome_addon/manifest.json
+++ b/chrome_addon/manifest.json
@@ -3,7 +3,7 @@
 
     "name": "gPass",
     "short_name": "gPass",
-    "version": "0.8.1",
+    "version": "0.8.2",
     "description": "gPass : global password manager",
     "icons" : {"16":"icons/gpass_icon_16.png", "32":"icons/gpass_icon_32.png", "64":"icons/gpass_icon_64.png", "128":"icons/gpass_icon_128.png"},
     "author" : "Grégory Soutadé",
diff --git a/firefox_webextension/manifest.json b/firefox_webextension/manifest.json
index 5d9401d..277fd98 100644
--- a/firefox_webextension/manifest.json
+++ b/firefox_webextension/manifest.json
@@ -3,7 +3,7 @@
 
     "name": "gPass",
     "short_name": "gPass",
-    "version": "0.8.1",
+    "version": "0.8.2",
     "description": "gPass : global password manager",
     "icons" : {"16":"icons/gpass_icon_16.png", "32":"icons/gpass_icon_32.png", "64":"icons/gpass_icon_64.png", "128":"icons/gpass_icon_128.png"},
     "author" : "Grégory Soutadé",