algorithm support

Author: mymindstorm

_locales/en/messages.json

@@ -324,5 +324,8 @@
     },
     "digits": {
         "message": "Digits"
+    },
+    "algorithm": {
+        "message": "Algorithm"
     }
 }

src/TODO

@@ -4,6 +4,9 @@
   - from import normal
   - from import otpauth
   - from manual
-  - export normal
-  - export otpauth
-- algo
+- algo
+  - export
+  - from qr
+  - from import normal
+  - from import otpauth
+  - from manual

src/background.ts

@@ -129,6 +129,7 @@ async function getTotp(text: string) {
       let secret = "";
       let account: string | undefined;
       let issuer: string | undefined;
+      let algorithm: string | undefined;
       let period: number | undefined;
       let digits: number | undefined;
 
@@ -167,6 +168,8 @@ async function getTotp(text: string) {
         } else if (parameter[0].toLowerCase() === "digits") {
           digits = Number(parameter[1]);
           digits = isNaN(digits) ? 6 : digits;
+        } else if (parameter[0].toLowerCase() === "algorithm") {
+          algorithm = parameter[1];
         }
       });
 
@@ -210,6 +213,9 @@ async function getTotp(text: string) {
         if (digits) {
           entryData[hash].digits = digits;
         }
+        if (algorithm) {
+          entryData[hash].algorithm = algorithm;
+        }
         if (
           (await EntryStorage.hasEncryptedEntry()) !==
           encryption.getEncryptionStatus()

src/components/Popup/AddAccountPage.vue

@@ -22,6 +22,13 @@
         <option v-bind: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>
@@ -36,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(): {
@@ -47,6 +54,7 @@ export default Vue.extend({
       type: OTPType;
       period: number | undefined;
       digits: number;
+      algorithm: OTPAlgorithm;
     };
   } {
     return {
@@ -56,11 +64,12 @@ export default Vue.extend({
         secret: "",
         type: OTPType.totp,
         period: undefined,
-        digits: 6
+        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, "");
@@ -113,7 +122,8 @@ export default Vue.extend({
           secret: this.newAccount.secret,
           counter: 0,
           period: this.newAccount.period,
-          digits: this.newAccount.digits
+          digits: this.newAccount.digits,
+          algorithm: this.newAccount.algorithm
         },
         this.$store.state.accounts.encryption
       );

src/components/Popup/EntryComponent.vue

@@ -251,7 +251,8 @@ function getQrUrl(entry: OTPEntry) {
     (entry.type === OTPType.totp && entry.period !== 30
       ? "&period=" + entry.period
       : "") +
-    (entry.digits !== 6 ? "&digits=" + entry.digits : "");
+    (entry.digits !== 6 ? "&digits=" + entry.digits : "") +
+    (entry.algorithm ? "&algorithm=" + entry.algorithm : "");
   const qr = QRGen(0, "L");
   qr.addData(otpauth);
   qr.make();

src/components/Popup/ExportPage.vue

@@ -129,7 +129,8 @@ function getOneLineOtpBackupFile(entryData: { [hash: string]: OTPStorage }) {
       (type === "totp" && otpStorage.period
         ? "&period=" + otpStorage.period
         : "") +
-      (otpStorage.digits ? "&digits=" + otpStorage.digits : "");
+      (otpStorage.digits ? "&digits=" + otpStorage.digits : "") +
+      (otpStorage.algorithm ? "&algorithm=" + otpStorage.algorithm : "");
 
     otpAuthLines.push(otpAuthLine);
   }

src/definitions/otp.d.ts

@@ -10,6 +10,7 @@ interface IOTPEntry {
   code: string;
   period: number;
   digits: number;
+  algorithm: number; // OTPAlgorithm
   create(): Promise<void>;
   update(): Promise<void>;
   next(): Promise<void>;
@@ -38,4 +39,5 @@ interface OTPStorage {
   counter?: number;
   period?: number;
   digits?: number;
+  algorithm?: string;
 }

src/import.ts

@@ -107,6 +107,7 @@ export async function getEntryDataFromOTPAuthPerLine(importCode: string) {
       let secret = "";
       let account: string | undefined;
       let issuer: string | undefined;
+      let algorithm: string | undefined;
       let period: number | undefined;
       let digits: number | undefined;
 
@@ -145,6 +146,8 @@ export async function getEntryDataFromOTPAuthPerLine(importCode: string) {
         } else if (parameter[0].toLowerCase() === "digits") {
           digits = Number(parameter[1]);
           digits = isNaN(digits) ? 6 : digits;
+        } else if (parameter[0].toLowerCase() === "algorithm") {
+          algorithm = parameter[1];
         }
       });
 
@@ -187,6 +190,9 @@ export async function getEntryDataFromOTPAuthPerLine(importCode: string) {
         if (digits) {
           exportData[hash].digits = digits;
         }
+        if (algorithm) {
+          exportData[hash].algorithm = algorithm;
+        }
       }
     }
   }

src/models/key-utilities.ts

@@ -1,4 +1,4 @@
-import { OTPType } from "./otp";
+import { OTPType, OTPAlgorithm } from "./otp";
 import * as CryptoJS from "crypto-js";
 
 // Originally based on the JavaScript implementation as provided by Russell
@@ -96,7 +96,8 @@ export class KeyUtilities {
     secret: string,
     counter: number,
     period: number,
-    len?: number
+    len?: number,
+    algorithm?: OTPAlgorithm
   ) {
     secret = secret.replace(/\s/g, "");
     if (!len) {
@@ -148,10 +149,28 @@ export class KeyUtilities {
       }
     }
 
-    const hmacObj = CryptoJS.HmacSHA1(
-      CryptoJS.enc.Hex.parse(time),
-      CryptoJS.enc.Hex.parse(key)
-    );
+    let hmacObj: CryptoJS.WordArray;
+    switch (algorithm) {
+      case OTPAlgorithm.SHA256:
+        hmacObj = CryptoJS.HmacSHA256(
+          CryptoJS.enc.Hex.parse(time),
+          CryptoJS.enc.Hex.parse(key)
+        );
+        break;
+      case OTPAlgorithm.SHA512:
+        hmacObj = CryptoJS.HmacSHA512(
+          CryptoJS.enc.Hex.parse(time),
+          CryptoJS.enc.Hex.parse(key)
+        );
+        break;
+      default:
+        hmacObj = CryptoJS.HmacSHA1(
+          CryptoJS.enc.Hex.parse(time),
+          CryptoJS.enc.Hex.parse(key)
+        );
+        break;
+    }
+
     const hmac = CryptoJS.enc.Hex.stringify(hmacObj);
 
     let offset = 0;

src/models/otp.ts

@@ -17,6 +17,12 @@ export enum CodeState {
   Encrypted = "-2"
 }
 
+export enum OTPAlgorithm {
+  SHA1 = 1,
+  SHA256,
+  SHA512
+}
+
 export class OTPEntry implements IOTPEntry {
   type: OTPType;
   index: number;
@@ -28,6 +34,7 @@ export class OTPEntry implements IOTPEntry {
   counter: number;
   period: number;
   digits: number;
+  algorithm: OTPAlgorithm;
   code = "••••••";
 
   constructor(
@@ -42,6 +49,7 @@ export class OTPEntry implements IOTPEntry {
       period?: number;
       hash?: string;
       digits?: number;
+      algorithm?: OTPAlgorithm;
     },
     encryption?: Encryption
   ) {
@@ -82,6 +90,11 @@ export class OTPEntry implements IOTPEntry {
     } else {
       this.digits = 6;
     }
+    if (entry.algorithm) {
+      this.algorithm = entry.algorithm;
+    } else {
+      this.algorithm = OTPAlgorithm.SHA1;
+    }
     if (this.type === OTPType.totp && entry.period) {
       this.period = entry.period;
     } else {
@@ -162,7 +175,8 @@ export class OTPEntry implements IOTPEntry {
           this.secret,
           this.counter,
           this.period,
-          this.digits
+          this.digits,
+          this.algorithm
         );
       } catch (error) {
         this.code = CodeState.Invalid;