refactor - 2

pubnub · Sep 26, 2023 · 7be4f39 · 7be4f39
1 parent a3f5930
commit 7be4f39
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/crypto/modules/NodeCryptoModule/nodeCryptoModule.ts b/src/crypto/modules/NodeCryptoModule/nodeCryptoModule.ts
@@ -277,16 +277,18 @@ class CryptorHeader {
     } else {
       throw new PubNubError('decryption error');
     }
-    let headerSize = null;
-    if (encryptedData.length > pos + 1) {
-      headerSize = encryptedData[pos];
+    let metadataLength = null;
+    if (encryptedData.length >= pos + 1) {
+      metadataLength = encryptedData[pos];
+    } else {
+      throw new PubNubError('decryption error');
     }
     pos += 1;
-    if (headerSize === 255 && encryptedData.length >= pos + 2) {
-      headerSize = new Uint16Array(encryptedData.slice(pos, pos + 3)).reduce((acc, val) => (acc << 8) + val, 0);
+    if (metadataLength === 255 && encryptedData.length >= pos + 2) {
+      metadataLength = new Uint16Array(encryptedData.slice(pos, pos + 2)).reduce((acc, val) => (acc << 8) + val, 0);
       pos += 2;
     }
-    return new CryptorHeaderV1(identifier.toString('utf8'), headerSize!);
+    return new CryptorHeaderV1(identifier.toString('utf8'), metadataLength);
   }
 }
 

diff --git a/src/crypto/modules/WebCryptoModule/webCryptoModule.ts b/src/crypto/modules/WebCryptoModule/webCryptoModule.ts
@@ -185,16 +185,18 @@ class CryptorHeader {
     } else {
       throw new PubNubError('decryption error');
     }
-    let headerSize = null;
-    if (encryptedData.byteLength > pos + 1) {
-      headerSize = (encryptedData as Uint8Array)[pos];
+    let metadataLength = null;
+    if (encryptedData.byteLength >= pos + 1) {
+      metadataLength = (encryptedData as Uint8Array)[pos];
+    } else {
+      throw new PubNubError('decryption error');
     }
     pos += 1;
-    if (headerSize === 255 && encryptedData.byteLength >= pos + 2) {
-      headerSize = new Uint16Array(encryptedData.slice(pos, pos + 3)).reduce((acc, val) => (acc << 8) + val, 0);
+    if (metadataLength === 255 && encryptedData.byteLength >= pos + 2) {
+      metadataLength = new Uint16Array(encryptedData.slice(pos, pos + 2)).reduce((acc, val) => (acc << 8) + val, 0);
       pos += 2;
     }
-    return new CryptorHeaderV1(identifier.toString('utf8'), headerSize!);
+    return new CryptorHeaderV1(identifier.toString('utf8'), metadataLength);
   }
 }