5.0.8

Sneezry · web-flow · commit f6746a3969fa · 2018-03-23T10:54:55.000+08:00
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -216,7 +216,7 @@
         "description": "Dropbox token."
     },
     "dropbox_authorization": {
-        "message": "Get Code",
+        "message": "Sign in to Dropbox",
         "description": "Dropbox authorization."
     },
     "show_all_entries": {
@@ -234,5 +234,9 @@
     "local_passphrase_warning": {
         "message": "Your password is stored locally, please change it in the security menu immediately.",
         "description": "localStorage password warning."
+    },
+    "dropbox_logout": {
+        "message": "Logout of Dropbox",
+        "description": "Dropbox logout."
     }
 }
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
@@ -216,7 +216,7 @@
         "description": "Dropbox token."
     },
     "dropbox_authorization": {
-        "message": "Obtener el código de",
+        "message": "Sign in to Dropbox",
         "description": "Dropbox authorization."
     },
     "show_all_entries": {
@@ -234,5 +234,9 @@
     "local_passphrase_warning": {
         "message": "La contraseña se almacena localmente, por favor cambiarlo en el menú de seguridad inmediatamente.",
         "description": "localStorage password warning."
+    },
+    "dropbox_logout": {
+        "message": "Logout of Dropbox",
+        "description": "Dropbox logout."
     }
 }
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
@@ -216,7 +216,7 @@
         "description": "Dropbox token."
     },
     "dropbox_authorization": {
-        "message": "Obtenir le Code",
+        "message": "Sign in to Dropbox",
         "description": "Dropbox authorization."
     },
     "show_all_entries": {
@@ -234,5 +234,9 @@
     "local_passphrase_warning": {
         "message": "Votre mot de passe est stocké localement, veuillez le changer immédiatement par l'intermédiaire du menu sécurité.",
         "description": "localStorage password warning."
+    },
+    "dropbox_logout": {
+        "message": "Logout of Dropbox",
+        "description": "Dropbox logout."
     }
 }
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
@@ -216,7 +216,7 @@
         "description": "Dropbox token."
     },
     "dropbox_authorization": {
-        "message": "コードを取得",
+        "message": "Sign in to Dropbox",
         "description": "Dropbox authorization."
     },
     "show_all_entries": {
@@ -234,5 +234,9 @@
     "local_passphrase_warning": {
         "message": "パスワードをローカル環境に保存しました。すぐにメニューのセキュリティから変更してください。",
         "description": "localStorage password warning."
+    },
+    "dropbox_logout": {
+        "message": "Logout of Dropbox",
+        "description": "Dropbox logout."
     }
 }
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
@@ -216,7 +216,7 @@
         "description": "Dropbox token."
     },
     "dropbox_authorization": {
-        "message": "Получить код",
+        "message": "Sign in to Dropbox",
         "description": "Dropbox authorization."
     },
     "show_all_entries": {
@@ -234,5 +234,9 @@
     "local_passphrase_warning": {
         "message": "Ваш пароль хранится локально, пожалуйста немедленно изменить его в меню безопасность.",
         "description": "localStorage password warning."
+    },
+    "dropbox_logout": {
+        "message": "Logout of Dropbox",
+        "description": "Dropbox logout."
     }
 }
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
@@ -216,7 +216,7 @@
         "description": "Dropbox token."
     },
     "dropbox_authorization": {
-        "message": "获取授权码",
+        "message": "登录Dropbox",
         "description": "Dropbox authorization."
     },
     "show_all_entries": {
@@ -234,5 +234,9 @@
     "local_passphrase_warning": {
         "message": "您的密码保存在了本地，请立即通过安全菜单更改密码。",
         "description": "localStorage password warning."
+    },
+    "dropbox_logout": {
+        "message": "注销Dropbox",
+        "description": "Dropbox logout."
     }
 }
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
@@ -216,7 +216,7 @@
         "description": "Dropbox token."
     },
     "dropbox_authorization": {
-        "message": "獲取授權碼",
+        "message": "Sign in to Dropbox",
         "description": "Dropbox authorization."
     },
     "show_all_entries": {
@@ -234,5 +234,9 @@
     "local_passphrase_warning": {
         "message": "您的密碼儲存在了本地，請立即通過安全選單更改密碼。",
         "description": "localStorage password warning."
+    },
+    "dropbox_logout": {
+        "message": "Logout of Dropbox",
+        "description": "Dropbox logout."
     }
 }
diff --git a/css/popup.css b/css/popup.css
@@ -351,12 +351,13 @@ body {
 #add_qr,
 #add_secret,
 #add_button,
+#dropbox_get_code,
+#dropbox_logout,
 #download_backup,
 #import_backup,
 #upload_backup,
 #security_save,
 #passphrase_ok,
-#dropbox_get_code,
 #message_close,
 #exportButton,
 #resize_save {
@@ -372,6 +373,10 @@ body {
     cursor: pointer;
 }
 
+#dropbox_logout {
+    margin-bottom: 30px;
+}
+
 .buttons {
     text-align: center;
 }
@@ -400,7 +405,6 @@ body {
 #exportButton,
 #security_save,
 #passphrase_ok,
-#dropbox_get_code,
 #resize_save {
     font-size: 12px;
     margin: 20px 100px;
@@ -652,6 +656,7 @@ body {
 #security_save:hover,
 #passphrase_ok:hover,
 #dropbox_get_code:hover,
+#dropbox_logout:hover,
 #export:hover,
 #resizeClose:hover,
 #resize_save:hover,
@@ -857,3 +862,12 @@ body {
     left: 0;
     z-index: 900;
 }
+
+#token_input {
+    margin: 10px;
+    width: 260px;
+    height: 50px;
+    resize: none;
+    padding: 5px;
+    border: 1px solid #ccc;
+}
diff --git a/manifest-chrome.json b/manifest-chrome.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "__MSG_extName__",
     "short_name": "__MSG_extShortName__",
-    "version": "5.0.7",
+    "version": "5.0.8",
     "default_locale": "en",
     "description": "__MSG_extDesc__",
     "icons": {
@@ -51,7 +51,8 @@
     },
     "permissions": [
         "activeTab",
-        "storage"
+        "storage",
+        "identity"
     ],
     "optional_permissions": [
         "clipboardWrite",
diff --git a/manifest-firefox.json b/manifest-firefox.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "__MSG_extName__",
     "short_name": "__MSG_extShortName__",
-    "version": "5.0.7",
+    "version": "5.0.8",
     "default_locale": "en",
     "description": "__MSG_extDesc__",
     "applications": {
@@ -58,7 +58,8 @@
         "activeTab",
         "<all_urls>",
         "clipboardWrite",
-        "storage"
+        "storage",
+        "identity"
     ],
     "optional_permissions": [
         "clipboardWrite",
diff --git a/popup.html b/popup.html
@@ -141,9 +141,10 @@
             <div v-show="info === 'dropbox'">
                 <div id="dropbox_box">
                     <div id="dropbox_risk">{{ i18n.dropbox_risk }}</div>
+                    <div id="dropbox_get_code" v-on:click="getDropboxToken()">{{ i18n.dropbox_authorization }}</div>
+                    <div id="dropbox_logout" v-on:click="logoutDropbox()">{{ i18n.dropbox_logout }}</div>
                     <label for="token_input">{{ i18n.dropbox_token }}</label>
-                    <input type="text" id="token_input" v-model="dropboxToken" disabled>
-                    <div id="dropbox_get_code" v-on:click="openLink(dropboxTokenUrl)" target="_blank">{{ i18n.dropbox_authorization }}</div>
+                    <textarea type="text" id="token_input" v-model="dropboxToken" disabled></textarea></textarea>
                 </div>
             </div>
             <!-- RESIZE -->
diff --git a/src/background.ts b/src/background.ts
@@ -18,6 +18,8 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
     cachedPassphrase = message.value;
   } else if (message.action === 'passphrase') {
     sendResponse(cachedPassphrase);
+  } else if (message.action === 'dropbox') {
+    getDropboxToken();
   }
 });
 
@@ -31,14 +33,18 @@ function getQr(
     const qr = new Image();
     qr.src = dataUrl;
     qr.onload = () => {
+      const devicePixelRatio = qr.width / windowWidth;
       const captureCanvas = document.createElement('canvas');
-      captureCanvas.width = width;
-      captureCanvas.height = height;
+      captureCanvas.width = width * devicePixelRatio;
+      captureCanvas.height = height * devicePixelRatio;
       const ctx = captureCanvas.getContext('2d');
       if (!ctx) {
         return;
       }
-      ctx.drawImage(qr, left, top, width, height, 0, 0, width, height);
+      ctx.drawImage(
+          qr, left * devicePixelRatio, top * devicePixelRatio,
+          width * devicePixelRatio, height * devicePixelRatio, 0, 0,
+          width * devicePixelRatio, height * devicePixelRatio);
       const url = captureCanvas.toDataURL();
       qrcode.callback = (text) => {
         getTotp(text, passphrase);
@@ -128,6 +134,46 @@ async function getTotp(text: string, passphrase: string) {
   return;
 }
 
+function getDropboxToken() {
+  chrome.identity.launchWebAuthFlow(
+      {
+        url:
+            'https://www.dropbox.com/oauth2/authorize?response_type=token&client_id=013qun2m82h9jim&redirect_uri=' +
+            encodeURIComponent(chrome.identity.getRedirectURL()),
+        interactive: true
+      },
+      (url) => {
+        if (!url) {
+          return;
+        }
+        const hashMatches = url.split('#');
+        if (hashMatches.length < 2) {
+          return;
+        }
+
+        const hash = hashMatches[1];
+
+        const resData = hash.split('&');
+        for (let i = 0; i < resData.length; i++) {
+          const kv = resData[i];
+          if (/^(.*?)=(.*?)$/.test(kv)) {
+            const kvMatches = kv.match(/^(.*?)=(.*?)$/);
+            if (!kvMatches) {
+              continue;
+            }
+            const key = kvMatches[1];
+            const value = kvMatches[2];
+            if (key === 'access_token') {
+              localStorage.dropboxToken = value;
+              chrome.runtime.sendMessage({action: 'dropboxtoken', value});
+              return;
+            }
+          }
+        }
+        return;
+      });
+}
+
 // Show issue page after first install
 chrome.runtime.onInstalled.addListener((details) => {
   if (details.reason !== 'install') {
diff --git a/src/content.ts b/src/content.ts
@@ -114,18 +114,14 @@ function grayLayoutUp(event: MouseEvent, passphrase: string) {
     return;
   }
 
-  let captureBoxLeft =
+  const captureBoxLeft =
       Math.min(sessionStorage.captureBoxPositionLeft, event.clientX) + 1;
-  let captureBoxTop =
+  const captureBoxTop =
       Math.min(sessionStorage.captureBoxPositionTop, event.clientY) + 1;
-  let captureBoxWidth =
+  const captureBoxWidth =
       Math.abs(sessionStorage.captureBoxPositionLeft - event.clientX) - 1;
-  let captureBoxHeight =
+  const captureBoxHeight =
       Math.abs(sessionStorage.captureBoxPositionTop - event.clientY) - 1;
-  captureBoxLeft *= window.devicePixelRatio;
-  captureBoxTop *= window.devicePixelRatio;
-  captureBoxWidth *= window.devicePixelRatio;
-  captureBoxHeight *= window.devicePixelRatio;
 
   // make sure captureBox and grayLayout is hidden
   setTimeout(() => {
diff --git a/src/models/encryption.ts b/src/models/encryption.ts
@@ -23,7 +23,24 @@ class Encryption {
     try {
       const decryptedSecret = CryptoJS.AES.decrypt(secret, this.password)
                                   .toString(CryptoJS.enc.Utf8);
-      return decryptedSecret || 'Encrypted';
+
+      if (!decryptedSecret) {
+        return 'Encrypted';
+      }
+
+      if (decryptedSecret.length < 8) {
+        return 'Encrypted';
+      }
+
+      if (!/^[a-z2-7]+=*$/i.test(decryptedSecret) &&
+          !/^[0-9a-f]+$/i.test(decryptedSecret) &&
+          !/^blz\-/.test(decryptedSecret) && !/^bliz\-/.test(decryptedSecret) &&
+          !/^stm\-/.test(decryptedSecret)) {
+        console.log(decryptedSecret);
+        return 'Encrypted';
+      }
+
+      return decryptedSecret;
     } catch (error) {
       return 'Encrypted';
     }
diff --git a/src/models/key-utilities.ts b/src/models/key-utilities.ts
@@ -133,6 +133,14 @@ class KeyUtilities {
 
     const time = this.leftpad(this.dec2hex(counter), 16, '0');
 
+    if (key.length % 2 === 1) {
+      if (key.substr(-1) === '0') {
+        key = key.substr(0, key.length - 1);
+      } else {
+        key += '0';
+      }
+    }
+
     // external library for SHA functionality
     const hmacObj = new jsSHA('SHA-1', 'HEX');
     hmacObj.setHMACKey(key, 'HEX');
diff --git a/src/popup.ts b/src/popup.ts
diff --git a/src/qrdebug.ts b/src/qrdebug.ts
diff --git a/src/test/test.ts b/src/test/test.ts
diff --git a/src/ui/info.ts b/src/ui/info.ts
