9.2.4

hectorm · May 5, 2024 · f4a5356 · f4a5356
1 parent ffeabc6
commit f4a5356
Show file tree

Hide file tree

Showing 19 changed files with 104 additions and 68 deletions.
diff --git a/dist/otpauth.esm.js b/dist/otpauth.esm.js
@@ -756,6 +756,7 @@ const globalScope = (() => {
     });
     try {
       // @ts-ignore
+      // eslint-disable-next-line no-undef
       if (typeof __GLOBALTHIS__ !== "undefined") return __GLOBALTHIS__;
     } finally {
       // @ts-ignore
@@ -1253,7 +1254,7 @@ class HOTP {
     // Return early if the token length does not match the digit number.
     if (token.length !== digits) return null;
     let delta = null;
-    for (let i = counter - window; i <= counter + window; ++i) {
+    const check = ( /** @type {number} */i) => {
       const generatedToken = HOTP.generate({
         secret,
         algorithm,
@@ -1263,6 +1264,13 @@ class HOTP {
       if (timingSafeEqual(token, generatedToken)) {
         delta = i - counter;
       }
+    };
+    check(counter);
+    for (let i = 1; i <= window && delta === null; ++i) {
+      check(counter - i);
+      if (delta !== null) break;
+      check(counter + i);
+      if (delta !== null) break;
     }
     return delta;
   }
@@ -1538,7 +1546,8 @@ class URI {
     let uriGroups;
     try {
       uriGroups = uri.match(OTPURI_REGEX);
-    } catch (error) {
+      // eslint-disable-next-line no-unused-vars
+    } catch (_) {
       /* Handled below */
     }
     if (!Array.isArray(uriGroups)) {
@@ -1649,6 +1658,6 @@ class URI {
  * Library version.
  * @type {string}
  */
-const version = "9.2.3";
+const version = "9.2.4";
 
 export { HOTP, Secret, TOTP, URI, version };
diff --git a/dist/otpauth.esm.min.js b/dist/otpauth.esm.min.js
diff --git a/dist/otpauth.esm.min.js.map b/dist/otpauth.esm.min.js.map
diff --git a/dist/otpauth.node.cjs b/dist/otpauth.node.cjs
@@ -57,6 +57,7 @@ const globalScope = (() => {
     });
     try {
       // @ts-ignore
+      // eslint-disable-next-line no-undef
       if (typeof __GLOBALTHIS__ !== "undefined") return __GLOBALTHIS__;
     } finally {
       // @ts-ignore
@@ -562,7 +563,7 @@ class HOTP {
     // Return early if the token length does not match the digit number.
     if (token.length !== digits) return null;
     let delta = null;
-    for (let i = counter - window; i <= counter + window; ++i) {
+    const check = ( /** @type {number} */i) => {
       const generatedToken = HOTP.generate({
         secret,
         algorithm,
@@ -572,6 +573,13 @@ class HOTP {
       if (timingSafeEqual(token, generatedToken)) {
         delta = i - counter;
       }
+    };
+    check(counter);
+    for (let i = 1; i <= window && delta === null; ++i) {
+      check(counter - i);
+      if (delta !== null) break;
+      check(counter + i);
+      if (delta !== null) break;
     }
     return delta;
   }
@@ -847,7 +855,8 @@ class URI {
     let uriGroups;
     try {
       uriGroups = uri.match(OTPURI_REGEX);
-    } catch (error) {
+      // eslint-disable-next-line no-unused-vars
+    } catch (_) {
       /* Handled below */
     }
     if (!Array.isArray(uriGroups)) {
@@ -958,7 +967,7 @@ class URI {
  * Library version.
  * @type {string}
  */
-const version = "9.2.3";
+const version = "9.2.4";
 
 exports.HOTP = HOTP;
 exports.Secret = Secret;

diff --git a/dist/otpauth.node.min.cjs b/dist/otpauth.node.min.cjs
diff --git a/dist/otpauth.node.min.cjs.map b/dist/otpauth.node.min.cjs.map
diff --git a/dist/otpauth.node.min.mjs b/dist/otpauth.node.min.mjs
diff --git a/dist/otpauth.node.min.mjs.map b/dist/otpauth.node.min.mjs.map
diff --git a/dist/otpauth.node.mjs b/dist/otpauth.node.mjs
@@ -36,6 +36,7 @@ const globalScope = (() => {
     });
     try {
       // @ts-ignore
+      // eslint-disable-next-line no-undef
       if (typeof __GLOBALTHIS__ !== "undefined") return __GLOBALTHIS__;
     } finally {
       // @ts-ignore
@@ -541,7 +542,7 @@ class HOTP {
     // Return early if the token length does not match the digit number.
     if (token.length !== digits) return null;
     let delta = null;
-    for (let i = counter - window; i <= counter + window; ++i) {
+    const check = ( /** @type {number} */i) => {
       const generatedToken = HOTP.generate({
         secret,
         algorithm,
@@ -551,6 +552,13 @@ class HOTP {
       if (timingSafeEqual(token, generatedToken)) {
         delta = i - counter;
       }
+    };
+    check(counter);
+    for (let i = 1; i <= window && delta === null; ++i) {
+      check(counter - i);
+      if (delta !== null) break;
+      check(counter + i);
+      if (delta !== null) break;
     }
     return delta;
   }
@@ -826,7 +834,8 @@ class URI {
     let uriGroups;
     try {
       uriGroups = uri.match(OTPURI_REGEX);
-    } catch (error) {
+      // eslint-disable-next-line no-unused-vars
+    } catch (_) {
       /* Handled below */
     }
     if (!Array.isArray(uriGroups)) {
@@ -937,6 +946,6 @@ class URI {
  * Library version.
  * @type {string}
  */
-const version = "9.2.3";
+const version = "9.2.4";
 
 export { HOTP, Secret, TOTP, URI, version };
diff --git a/dist/otpauth.umd.js b/dist/otpauth.umd.js
@@ -762,6 +762,7 @@
       });
       try {
         // @ts-ignore
+        // eslint-disable-next-line no-undef
         if (typeof __GLOBALTHIS__ !== "undefined") return __GLOBALTHIS__;
       } finally {
         // @ts-ignore
@@ -1259,7 +1260,7 @@
       // Return early if the token length does not match the digit number.
       if (token.length !== digits) return null;
       let delta = null;
-      for (let i = counter - window; i <= counter + window; ++i) {
+      const check = ( /** @type {number} */i) => {
         const generatedToken = HOTP.generate({
           secret,
           algorithm,
@@ -1269,6 +1270,13 @@
         if (timingSafeEqual(token, generatedToken)) {
           delta = i - counter;
         }
+      };
+      check(counter);
+      for (let i = 1; i <= window && delta === null; ++i) {
+        check(counter - i);
+        if (delta !== null) break;
+        check(counter + i);
+        if (delta !== null) break;
       }
       return delta;
     }
@@ -1544,7 +1552,8 @@
       let uriGroups;
       try {
         uriGroups = uri.match(OTPURI_REGEX);
-      } catch (error) {
+        // eslint-disable-next-line no-unused-vars
+      } catch (_) {
         /* Handled below */
       }
       if (!Array.isArray(uriGroups)) {
@@ -1655,7 +1664,7 @@
    * Library version.
    * @type {string}
    */
-  const version = "9.2.3";
+  const version = "9.2.4";
 
   exports.HOTP = HOTP;
   exports.Secret = Secret;

diff --git a/dist/otpauth.umd.min.js b/dist/otpauth.umd.min.js
diff --git a/dist/otpauth.umd.min.js.map b/dist/otpauth.umd.min.js.map
diff --git a/docs/classes/HOTP.html b/docs/classes/HOTP.html