badmfck-api-server 5.0.10 → 5.0.11

package/dist/apiServer/monitor/MonitorAuth.d.ts

@@ -42,6 +42,7 @@ export declare class MonitorAuth {
     private static base32Decode;
     private static hotp;
     static verifyTotp(login: string, secretBase32: string, code: string): string | null;
+    private static base32Encode;
     static generateTotpSecret(login: string, issuer?: string): {
         secret: string;
         uri: string;

package/dist/apiServer/monitor/MonitorAuth.js

@@ -191,12 +191,23 @@ class MonitorAuth {
         }
         return "TOTP code is invalid";
     }
-    static generateTotpSecret(login, issuer = "Monitor") {
+    static base32Encode(buf) {
         const A = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-        const raw = crypto_1.default.randomBytes(20);
-        let secret = "";
-        for (let i = 0; i < raw.length; i++)
-            secret += A[raw[i] % 32];
+        let bits = 0, value = 0, out = "";
+        for (const b of buf) {
+            value = (value << 8) | b;
+            bits += 8;
+            while (bits >= 5) {
+                out += A[(value >>> (bits - 5)) & 31];
+                bits -= 5;
+            }
+        }
+        if (bits > 0)
+            out += A[(value << (5 - bits)) & 31];
+        return out;
+    }
+    static generateTotpSecret(login, issuer = "Monitor") {
+        const secret = MonitorAuth.base32Encode(crypto_1.default.randomBytes(20));
         const safeIssuer = String(issuer || "").replace(/[:\u0000-\u001f]/g, " ").trim() || "Monitor";
         const label = encodeURIComponent(`${safeIssuer}:${login}`);
         const uri = `otpauth://totp/${label}?secret=${secret}&issuer=${encodeURIComponent(safeIssuer)}&algorithm=SHA1&digits=6&period=30`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "badmfck-api-server",
-  "version": "5.0.10",
+  "version": "5.0.11",
   "description": "Simple API http server based on express",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",