fix(web-crypto): fix issues with cross SDK compatibility

pubnub · Apr 19, 2024 · 6bc21fa · 6bc21fa
1 parent 7850412
commit 6bc21fa
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 12 deletions.
diff --git a/dist/web/pubnub.js b/dist/web/pubnub.js
@@ -1060,24 +1060,29 @@
 	        return new PubNubFile(file);
 	    }
 	    constructor(file) {
+	        let contentLength;
 	        let fileMimeType;
 	        let fileName;
 	        let fileData;
 	        if (file instanceof File) {
 	            fileData = file;
 	            fileName = file.name;
 	            fileMimeType = file.type;
+	            contentLength = file.size;
 	        }
 	        else if ('data' in file) {
 	            const contents = file.data;
 	            fileMimeType = file.mimeType;
 	            fileName = file.name;
 	            fileData = new File([contents], fileName, { type: fileMimeType });
+	            contentLength = fileData.size;
 	        }
 	        if (fileData === undefined)
 	            throw new Error("Couldn't construct a file out of supplied options.");
 	        if (fileName === undefined)
 	            throw new Error("Couldn't guess filename out of the options. Please provide one.");
+	        if (contentLength)
+	            this.contentLength = contentLength;
 	        this.mimeType = fileMimeType;
 	        this.data = fileData;
 	        this.name = fileName;
@@ -2251,6 +2256,8 @@
 	    // --------------------------------------------------------
 	    // region Decryption
 	    decrypt(encryptedData) {
+	        if (typeof encryptedData.data === 'string')
+	            throw new Error('Decryption error: data for decryption should be ArrayBuffed.');
 	        const iv = this.bufferToWordArray(new Uint8ClampedArray(encryptedData.metadata));
 	        const data = this.bufferToWordArray(new Uint8ClampedArray(encryptedData.data));
 	        return AesCbcCryptor.encoder.encode(this.CryptoJS.AES.decrypt({ ciphertext: data }, this.encryptedKey, {
@@ -2260,6 +2267,8 @@
 	    }
 	    decryptFileData(encryptedData) {
 	        return __awaiter(this, void 0, void 0, function* () {
+	            if (typeof encryptedData.data === 'string')
+	                throw new Error('Decryption error: data for decryption should be ArrayBuffed.');
 	            const key = yield this.getKey();
 	            return crypto.subtle.decrypt({ name: this.algo, iv: encryptedData.metadata }, key, encryptedData.data);
 	        });
@@ -2679,7 +2688,7 @@
 	    encryptFile(key, file, File) {
 	        return __awaiter(this, void 0, void 0, function* () {
 	            var _a, _b;
-	            if ((_a = file.contentLength) !== null && _a !== void 0 ? _a : 0 <= 0)
+	            if (((_a = file.contentLength) !== null && _a !== void 0 ? _a : 0) <= 0)
 	                throw new Error('encryption error. empty content');
 	            const bKey = yield this.getKey(key);
 	            const abPlaindata = yield file.toArrayBuffer();
@@ -2826,7 +2835,7 @@
 	    encrypt(data) {
 	        const stringData = typeof data === 'string' ? data : LegacyCryptor.decoder.decode(data);
 	        return {
-	            data: LegacyCryptor.encoder.encode(this.cryptor.encrypt(stringData)),
+	            data: this.cryptor.encrypt(stringData),
 	            metadata: null,
 	        };
 	    }
@@ -2925,6 +2934,8 @@
 	            : this.defaultCryptor.encrypt(data);
 	        if (!encrypted.metadata)
 	            return encrypted.data;
+	        else if (typeof encrypted.data === 'string')
+	            throw new Error('Encryption error: encrypted data should be ArrayBuffed.');
 	        const headerData = this.getHeaderData(encrypted);
 	        return this.concatArrayBuffer(headerData, encrypted.data);
 	    }
@@ -2938,6 +2949,8 @@
 	                return this.defaultCryptor.encryptFile(file, File);
 	            const fileData = yield this.getFileData(file);
 	            const encrypted = yield this.defaultCryptor.encryptFileData(fileData);
+	            if (typeof encrypted.data === 'string')
+	                throw new Error('Encryption error: encrypted data should be ArrayBuffed.');
 	            return File.create({
 	                name: file.name,
 	                mimeType: 'application/octet-stream',

diff --git a/dist/web/pubnub.min.js b/dist/web/pubnub.min.js
diff --git a/lib/crypto/modules/NodeCryptoModule/nodeCryptoModule.js b/lib/crypto/modules/NodeCryptoModule/nodeCryptoModule.js
@@ -64,7 +64,7 @@ export class CryptoModule extends AbstractCryptoModule {
                 });
             }
             if (file.data instanceof Readable) {
-                if (file.contentLength === 0)
+                if (!file.contentLength || file.contentLength === 0)
                     throw new Error('Encryption error: empty content');
                 const encryptedStream = yield this.defaultCryptor.encryptStream(file.data);
                 const header = CryptorHeader.from(this.defaultCryptor.identifier, encryptedStream.metadata);

diff --git a/lib/crypto/modules/node.js b/lib/crypto/modules/node.js
@@ -65,7 +65,7 @@ class NodeCryptography {
                 });
             }
             if (file.data instanceof Readable) {
-                if (file.contentLength === 0)
+                if (!file.contentLength || file.contentLength === 0)
                     throw new Error('Encryption error: empty content.');
                 return File.create({
                     name: file.name,

diff --git a/lib/file/modules/react-native.js b/lib/file/modules/react-native.js
@@ -12,19 +12,22 @@ export class PubNubFile {
         return new PubNubFile(file);
     }
     constructor(file) {
+        let fileData;
+        let contentLength;
         let fileMimeType;
         let fileName;
-        let fileData;
         if (file instanceof File) {
             fileData = file;
             fileName = file.name;
             fileMimeType = file.type;
+            contentLength = file.size;
         }
         else if ('data' in file) {
             const contents = file.data;
             fileMimeType = file.mimeType;
             fileName = file.name;
             fileData = new File([contents], fileName, { type: fileMimeType });
+            contentLength = fileData.size;
         }
         else if ('uri' in file) {
             fileMimeType = file.mimeType;
@@ -41,6 +44,8 @@ export class PubNubFile {
             throw new Error("Couldn't construct a file out of supplied options.");
         if (fileName === undefined)
             throw new Error("Couldn't guess filename out of the options. Please provide one.");
+        if (contentLength)
+            this.contentLength = contentLength;
         this.mimeType = fileMimeType;
         this.data = fileData;
         this.name = fileName;

diff --git a/src/crypto/modules/NodeCryptoModule/nodeCryptoModule.ts b/src/crypto/modules/NodeCryptoModule/nodeCryptoModule.ts
@@ -123,7 +123,7 @@ export class CryptoModule extends AbstractCryptoModule<CryptorType> {
     }
 
     if (file.data instanceof Readable) {
-      if (file.contentLength === 0) throw new Error('Encryption error: empty content');
+      if (!file.contentLength || file.contentLength === 0) throw new Error('Encryption error: empty content');
 
       const encryptedStream = await (this.defaultCryptor as ICryptor).encryptStream(file.data);
       const header = CryptorHeader.from(this.defaultCryptor.identifier, encryptedStream.metadata!);

diff --git a/src/crypto/modules/WebCryptoModule/ICryptor.ts b/src/crypto/modules/WebCryptoModule/ICryptor.ts
@@ -9,7 +9,7 @@ export type EncryptedDataType = {
   /**
    * Encrypted data.
    */
-  data: ArrayBuffer;
+  data: ArrayBuffer | string;
 
   /**
    * Used cryptor's metadata.

diff --git a/src/crypto/modules/WebCryptoModule/aesCbcCryptor.ts b/src/crypto/modules/WebCryptoModule/aesCbcCryptor.ts
@@ -80,6 +80,9 @@ export default class AesCbcCryptor implements ICryptor {
   // region Decryption
 
   decrypt(encryptedData: EncryptedDataType) {
+    if (typeof encryptedData.data === 'string')
+      throw new Error('Decryption error: data for decryption should be ArrayBuffed.');
+
     const iv = this.bufferToWordArray(new Uint8ClampedArray(encryptedData.metadata!));
     const data = this.bufferToWordArray(new Uint8ClampedArray(encryptedData.data));
 
@@ -92,6 +95,9 @@ export default class AesCbcCryptor implements ICryptor {
   }
 
   async decryptFileData(encryptedData: EncryptedDataType): Promise<ArrayBuffer> {
+    if (typeof encryptedData.data === 'string')
+      throw new Error('Decryption error: data for decryption should be ArrayBuffed.');
+
     const key = await this.getKey();
     return crypto.subtle.decrypt({ name: this.algo, iv: encryptedData.metadata! }, key, encryptedData.data);
   }

diff --git a/src/crypto/modules/WebCryptoModule/legacyCryptor.ts b/src/crypto/modules/WebCryptoModule/legacyCryptor.ts
@@ -56,7 +56,7 @@ export default class LegacyCryptor implements ILegacyCryptor {
     const stringData = typeof data === 'string' ? data : LegacyCryptor.decoder.decode(data);
 
     return {
-      data: LegacyCryptor.encoder.encode(this.cryptor.encrypt(stringData)),
+      data: this.cryptor.encrypt(stringData),
       metadata: null,
     };
   }

diff --git a/src/crypto/modules/WebCryptoModule/webCryptoModule.ts b/src/crypto/modules/WebCryptoModule/webCryptoModule.ts
@@ -87,6 +87,8 @@ export class WebCryptoModule extends AbstractCryptoModule<CryptorType> {
         : (this.defaultCryptor as ICryptor).encrypt(data);
 
     if (!encrypted.metadata) return encrypted.data;
+    else if (typeof encrypted.data === 'string')
+      throw new Error('Encryption error: encrypted data should be ArrayBuffed.');
 
     const headerData = this.getHeaderData(encrypted);
 
@@ -103,6 +105,7 @@ export class WebCryptoModule extends AbstractCryptoModule<CryptorType> {
 
     const fileData = await this.getFileData(file);
     const encrypted = await (this.defaultCryptor as ICryptor).encryptFileData(fileData);
+    if (typeof encrypted.data === 'string') throw new Error('Encryption error: encrypted data should be ArrayBuffed.');
 
     return File.create({
       name: file.name,

diff --git a/src/crypto/modules/node.ts b/src/crypto/modules/node.ts
@@ -116,7 +116,7 @@ export default class NodeCryptography implements Cryptography<string | ArrayBuff
     }
 
     if (file.data instanceof Readable) {
-      if (file.contentLength === 0) throw new Error('Encryption error: empty content.');
+      if (!file.contentLength || file.contentLength === 0) throw new Error('Encryption error: empty content.');
 
       return File.create({
         name: file.name,

diff --git a/src/crypto/modules/web.ts b/src/crypto/modules/web.ts
@@ -109,7 +109,7 @@ export default class WebCryptography implements Cryptography<ArrayBuffer | strin
     file: PubNubFile,
     File: PubNubFileConstructor<PubNubFile, PubNubFileParameters>,
   ) {
-    if (file.contentLength ?? 0 <= 0) throw new Error('encryption error. empty content');
+    if ((file.contentLength ?? 0) <= 0) throw new Error('encryption error. empty content');
     const bKey = await this.getKey(key);
     const abPlaindata = await file.toArrayBuffer();
     const abCipherdata = await this.encryptArrayBuffer(bKey, abPlaindata);

diff --git a/src/file/modules/react-native.ts b/src/file/modules/react-native.ts
@@ -100,21 +100,24 @@ export class PubNubFile implements PubNubFileInterface {
   }
 
   constructor(file: PubNubFileParameters) {
+    let fileData: PubNubFile['data'] | undefined;
+    let contentLength: number | undefined;
     let fileMimeType: string | undefined;
     let fileName: string | undefined;
-    let fileData: PubNubFile['data'] | undefined;
 
     if (file instanceof File) {
       fileData = file;
 
       fileName = file.name;
       fileMimeType = file.type;
+      contentLength = file.size;
     } else if ('data' in file) {
       const contents = file.data;
 
       fileMimeType = file.mimeType;
       fileName = file.name;
       fileData = new File([contents], fileName, { type: fileMimeType });
+      contentLength = fileData.size;
     } else if ('uri' in file) {
       fileMimeType = file.mimeType;
       fileName = file.name;
@@ -128,6 +131,7 @@ export class PubNubFile implements PubNubFileInterface {
     if (fileData === undefined) throw new Error("Couldn't construct a file out of supplied options.");
     if (fileName === undefined) throw new Error("Couldn't guess filename out of the options. Please provide one.");
 
+    if (contentLength) this.contentLength = contentLength;
     this.mimeType = fileMimeType!;
     this.data = fileData;
     this.name = fileName;

diff --git a/src/file/modules/web.ts b/src/file/modules/web.ts
@@ -93,6 +93,7 @@ export class PubNubFile implements PubNubFileInterface {
   }
 
   constructor(file: PubNubFileParameters) {
+    let contentLength: number | undefined;
     let fileMimeType: string | undefined;
     let fileName: string | undefined;
     let fileData: File | undefined;
@@ -102,17 +103,20 @@ export class PubNubFile implements PubNubFileInterface {
 
       fileName = file.name;
       fileMimeType = file.type;
+      contentLength = file.size;
     } else if ('data' in file) {
       const contents = file.data;
 
       fileMimeType = file.mimeType;
       fileName = file.name;
       fileData = new File([contents], fileName, { type: fileMimeType });
+      contentLength = fileData.size;
     }
 
     if (fileData === undefined) throw new Error("Couldn't construct a file out of supplied options.");
     if (fileName === undefined) throw new Error("Couldn't guess filename out of the options. Please provide one.");
 
+    if (contentLength) this.contentLength = contentLength;
     this.mimeType = fileMimeType!;
     this.data = fileData;
     this.name = fileName;