curtain-web-api 1.0.40 → 1.0.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "curtain-web-api",
-  "version": "1.0.40",
+  "version": "1.0.41",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

package/src/classes/curtain-api.ts

@@ -1,6 +1,12 @@
 import {User} from "./curtain-user";
 import axios, {AxiosHeaders} from "axios";
-import {arrayBufferToBase64String, CurtainEncryption, encryptDataRSA} from "./curtain-encryption";
+import {
+    arrayBufferToBase64String, base64ToArrayBuffer,
+    CurtainEncryption,
+    encryptAESData, encryptAESKey,
+    encryptDataRSA, exportAESKey,
+    generateAESKey
+} from "./curtain-encryption";
 
 const base: string = "https://celsus.muttsu.xyz/"
 
@@ -222,9 +228,18 @@ export class CurtainWebAPI {
         }
 
         if (encryption.encrypted && encryption.e2e && encryption.publicKey !== undefined) {
-            const response = await encryptDataRSA(data, encryption.publicKey)
-            const base64String = arrayBufferToBase64String(response)
-            form.append("file", new Blob([base64String], {type: 'text/json'}), "curtain-settings.json")
+            const aesKey = await generateAESKey()
+            const encryptedData = await encryptAESData(aesKey, data)
+            const encryptedKey = await encryptAESKey(encryption.publicKey, await exportAESKey(aesKey))
+            const encryptedIV = await encryptAESKey(encryption.publicKey, base64ToArrayBuffer(encryptedData.iv))
+            const payload = {
+                encryptedData: encryptedData.encrypted,
+                encryptedKey: arrayBufferToBase64String(encryptedKey),
+                encryptedIV: arrayBufferToBase64String(encryptedIV)
+            }
+            form.append("encryptedKey", payload.encryptedKey)
+            form.append("encryptedIV", payload.encryptedIV)
+            form.append("file", new Blob([payload.encryptedData], {type: 'text/json'}), "curtain-settings.json")
         } else {
             form.append("file", new Blob([data], {type: 'text/json'}), "curtain-settings.json")
         }
@@ -236,8 +251,10 @@ export class CurtainWebAPI {
         headers["Content-Type"] = "multipart/form-data";
         if (onUploadProgress !== undefined) {
             return await this.axiosInstance.post(this.baseURL + "curtain/", form, {headers: headers, responseType:"json", onUploadProgress: onUploadProgress})
+        } else {
+            return await this.axiosInstance.post(this.baseURL + "curtain/", form, {headers: headers, responseType:"json"})
         }
-        return await this.axiosInstance.post(this.baseURL + "curtain/", form, {headers: headers, responseType:"json"})
+
     }
 
     postSettings(id: string, token: string, onDownloadProgress: any = undefined) {
@@ -467,5 +484,19 @@ export class CurtainWebAPI {
         headers["Content-Type"] = "application/json";
         return this.axiosInstance.get(this.baseURL + `stats/summary/${lastNDays}/`, {responseType:"json", headers})
     }
+
+    postEncryptionFactors(encryptedAESKey: string, encryptedIV: string, linkId: string) {
+        let headers = new AxiosHeaders();
+        headers["Accept"] = "application/json";
+        headers["Content-Type"] = "application/json";
+        return this.axiosInstance.post(this.baseURL + "curtain/" + linkId + "/set_encryption_factors/", {encryption_key: encryptedAESKey, encryption_iv: encryptedIV}, {headers: headers, responseType: "json"}).then((response) => {return response;});
+    }
+
+    getEncryptionFactors(linkId: string) {
+        let headers = new AxiosHeaders();
+        headers["Accept"] = "application/json";
+        headers["Content-Type"] = "application/json";
+        return this.axiosInstance.get(this.baseURL + "curtain/" + linkId + "/get_encryption_factors/", {headers: headers, responseType: "json"}).then((response) => {return response;});
+    }
 }
 

package/src/classes/curtain-encryption.ts

@@ -103,4 +103,68 @@ export function pemToArrayBuffer(pem: string) {
   b64Final = b64Final.replace('-----END PUBLIC KEY-----', '');
 
   return base64ToArrayBuffer(b64Final);
-}
+}
+
+// a function to generate to encrypt an aes key arraybuffer with a public key
+export async function encryptAESKey(publicKey: CryptoKey, aesKey: ArrayBuffer) {
+  return await crypto.subtle.encrypt({name: "RSA-OAEP"}, publicKey, aesKey)
+}
+
+// a function to generate an aes key in GCM mode with a length of 256 bits
+export async function generateAESKey() {
+  return await crypto.subtle.generateKey(
+    {
+      name: "AES-GCM",
+      length: 256,
+    },
+    true,
+    ["encrypt", "decrypt"],
+  )
+}
+
+// a function to encrypt a string with an aes key
+export async function encryptAESData(aesKey: CryptoKey, data: string) {
+  const iv = crypto.getRandomValues(new Uint8Array(12))
+  const enc = new TextEncoder()
+  const encoded = enc.encode(data)
+  const encrypted = await crypto.subtle.encrypt({name: "AES-GCM", iv: iv}, aesKey, encoded)
+  return {encrypted: arrayBufferToBase64String(encrypted), iv: arrayBufferToBase64String(iv)}
+}
+
+// a function to decrypt a string with an aes key
+export async function decryptAESData(aesKey: CryptoKey, data: string, iv: string) {
+  const dec = new TextDecoder()
+  const decrypted = await crypto.subtle.decrypt({name: "AES-GCM", iv: base64ToArrayBuffer(iv)}, aesKey, base64ToArrayBuffer(data))
+  return dec.decode(decrypted)
+}
+
+// a function to decrypt an aes key with a private key
+export async function decryptAESKey(privateKey: CryptoKey, encryptedKey: ArrayBuffer) {
+  return await crypto.subtle.decrypt({name: "RSA-OAEP"}, privateKey, encryptedKey)
+}
+
+// a function to export an aes key to a string
+export async function exportAESKey(key: CryptoKey) {
+  return await crypto.subtle.exportKey("raw", key)
+}
+// a function to import an aes key from a string
+export async function importAESKey(key: ArrayBuffer) {
+  return await crypto.subtle.importKey("raw", key, "AES-GCM", true, ["encrypt", "decrypt"])
+}
+
+// a function to encrypt aes key with a public key and also use the aes key to encrypt a large string then return the encrypted aes key and the encrypted string
+export async function encryptDataAES(data: string, publicKey: CryptoKey) {
+  const aesKey = await generateAESKey()
+  const encryptedKey = await encryptAESKey(publicKey, await exportAESKey(aesKey))
+  const encryptedData = await encryptAESData(aesKey, data)
+  return {encryptedKey: arrayBufferToBase64String(encryptedKey), encryptedData: encryptedData}
+}
+
+// a function to decrypt an aes key with a private key and use the aes key to decrypt a large string
+export async function decryptDataAES(encryptedKey: ArrayBuffer, encryptedData: string, iv: string, privateKey: CryptoKey) {
+  const aesKey = await decryptAESKey(privateKey, encryptedKey)
+  //import aes key
+  return await decryptAESData(await importAESKey(aesKey), encryptedData, iv)
+}
+
+