Merge pull request #433 from Authenticator-Extension/algo+digits

Algorithim & digits support

Author: mymindstorm

_locales/en/messages.json

@@ -321,5 +321,11 @@
     },
     "invalid": {
         "message": "Invalid"
+    },
+    "digits": {
+        "message": "Digits"
+    },
+    "algorithm": {
+        "message": "Algorithm"
     }
 }

package-lock.json

@@ -23,7 +23,6 @@
     "@types/argon2-browser": "^1.6.0",
     "@types/chrome": "^0.0.86",
     "@types/crypto-js": "^3.1.43",
-    "@types/jssha": "2.0.0",
     "@types/uuid": "^3.4.5",
     "base64-loader": "^1.0.0",
     "fork-ts-checker-webpack-plugin": "^1.3.5",
@@ -42,7 +41,6 @@
   "dependencies": {
     "argon2-browser": "^1.12.0",
     "crypto-js": "^3.1.9-1",
-    "jssha": "^2.3.1",
     "qrcode-generator": "^1.4.3",
     "qrcode-reader": "^1.0.4",
     "uuid": "^3.3.3",

package.json

@@ -126,10 +126,12 @@ async function getTotp(text: string) {
     if (!label || !parameterPart) {
       chrome.tabs.sendMessage(id, { action: "errorqr" });
     } else {
-      let account = "";
       let secret = "";
-      let issuer = "";
-      let period: number | undefined = undefined;
+      let account: string | undefined;
+      let issuer: string | undefined;
+      let algorithm: string | undefined;
+      let period: number | undefined;
+      let digits: number | undefined;
 
       try {
         label = decodeURIComponent(label);
@@ -163,6 +165,11 @@ async function getTotp(text: string) {
             isNaN(period) || period < 0 || period > 60 || 60 % period !== 0
               ? undefined
               : period;
+        } else if (parameter[0].toLowerCase() === "digits") {
+          digits = Number(parameter[1]);
+          digits = isNaN(digits) || digits === 0 ? 6 : digits;
+        } else if (parameter[0].toLowerCase() === "algorithm") {
+          algorithm = parameter[1];
         }
       });
 
@@ -203,6 +210,12 @@ async function getTotp(text: string) {
         if (period) {
           entryData[hash].period = period;
         }
+        if (digits) {
+          entryData[hash].digits = digits;
+        }
+        if (algorithm) {
+          entryData[hash].algorithm = algorithm;
+        }
         if (
           (await EntryStorage.hasEncryptedEntry()) !==
           encryption.getEncryptionStatus()

src/background.ts

@@ -16,6 +16,19 @@
         v-model.number="newAccount.period"
         v-bind:disabled="newAccount.type === OTPType.hotp"
       />
+      <label class="combo-label">{{ i18n.digits }}</label>
+      <select v-model="newAccount.digits">
+        <option value="6">6</option>
+        <option value="8">8</option>
+      </select>
+      <br />
+      <label class="combo-label">{{ i18n.algorithm }}</label>
+      <select v-model="newAccount.algorithm">
+        <option v-bind:value="OTPAlgorithm.SHA1">SHA-1</option>
+        <option v-bind:value="OTPAlgorithm.SHA256">SHA-256</option>
+        <option v-bind:value="OTPAlgorithm.SHA512">SHA-512</option>
+      </select>
+      <br />
       <label class="combo-label">{{ i18n.type }}</label>
       <select v-model="newAccount.type">
         <option v-bind:value="OTPType.totp">{{ i18n.based_on_time }}</option>
@@ -30,7 +43,7 @@
 <script lang="ts">
 import Vue from "vue";
 import { mapState } from "vuex";
-import { OTPType, OTPEntry } from "../../models/otp";
+import { OTPType, OTPEntry, OTPAlgorithm } from "../../models/otp";
 
 export default Vue.extend({
   data: function(): {
@@ -40,6 +53,8 @@ export default Vue.extend({
       secret: string;
       type: OTPType;
       period: number | undefined;
+      digits: number;
+      algorithm: OTPAlgorithm;
     };
   } {
     return {
@@ -48,11 +63,13 @@ export default Vue.extend({
         account: "",
         secret: "",
         type: OTPType.totp,
-        period: undefined
+        period: undefined,
+        digits: 6,
+        algorithm: OTPAlgorithm.SHA1
       }
     };
   },
-  computed: mapState("accounts", ["OTPType"]),
+  computed: mapState("accounts", ["OTPType", "OTPAlgorithm"]),
   methods: {
     async addNewAccount() {
       this.newAccount.secret = this.newAccount.secret.replace(/ /g, "");
@@ -104,7 +121,9 @@ export default Vue.extend({
           encrypted: false,
           secret: this.newAccount.secret,
           counter: 0,
-          period: this.newAccount.period
+          period: this.newAccount.period,
+          digits: this.newAccount.digits,
+          algorithm: this.newAccount.algorithm
         },
         this.$store.state.accounts.encryption
       );

src/components/Popup/AddAccountPage.vue

@@ -71,7 +71,7 @@
 import Vue from "vue";
 import { mapState } from "vuex";
 import * as QRGen from "qrcode-generator";
-import { OTPEntry, OTPType, CodeState } from "../../models/otp";
+import { OTPEntry, OTPType, CodeState, OTPAlgorithm } from "../../models/otp";
 
 import IconMinusCircle from "../../../svg/minus-circle.svg";
 import IconRedo from "../../../svg/redo.svg";
@@ -248,8 +248,12 @@ function getQrUrl(entry: OTPEntry) {
     (entry.type === OTPType.hotp || entry.type === OTPType.hhex
       ? "&counter=" + entry.counter
       : "") +
-    (entry.type === OTPType.totp && entry.period
+    (entry.type === OTPType.totp && entry.period !== 30
       ? "&period=" + entry.period
+      : "") +
+    (entry.digits !== 6 ? "&digits=" + entry.digits : "") +
+    (entry.algorithm !== OTPAlgorithm.SHA1
+      ? "&algorithm=" + OTPAlgorithm[entry.algorithm]
       : "");
   const qr = QRGen(0, "L");
   qr.addData(otpauth);

src/components/Popup/EntryComponent.vue

@@ -99,11 +99,15 @@ function getOneLineOtpBackupFile(entryData: { [hash: string]: OTPStorage }) {
   const otpAuthLines: string[] = [];
   for (const hash of Object.keys(entryData)) {
     const otpStorage = entryData[hash];
-    otpStorage.issuer = removeUnsafeData(otpStorage.issuer);
-    otpStorage.account = removeUnsafeData(otpStorage.account);
+    if (otpStorage.issuer) {
+      otpStorage.issuer = removeUnsafeData(otpStorage.issuer);
+    }
+    if (otpStorage.account) {
+      otpStorage.account = removeUnsafeData(otpStorage.account);
+    }
     const label = otpStorage.issuer
-      ? otpStorage.issuer + ":" + otpStorage.account
-      : otpStorage.account;
+      ? otpStorage.issuer + ":" + (otpStorage.account || "")
+      : otpStorage.account || "";
     let type = "";
     if (otpStorage.type === "totp" || otpStorage.type === "hex") {
       type = "totp";
@@ -124,7 +128,9 @@ function getOneLineOtpBackupFile(entryData: { [hash: string]: OTPStorage }) {
       (type === "hotp" ? "&counter=" + otpStorage.counter : "") +
       (type === "totp" && otpStorage.period
         ? "&period=" + otpStorage.period
-        : "");
+        : "") +
+      (otpStorage.digits ? "&digits=" + otpStorage.digits : "") +
+      (otpStorage.algorithm ? "&algorithm=" + otpStorage.algorithm : "");
 
     otpAuthLines.push(otpAuthLine);
   }