Update folder structure

frontend/components/utilities/attemptLogin.js

@@ -1,4 +1,4 @@
-import Aes256Gcm from "~/components/aes-256-gcm";
+import Aes256Gcm from "~/components/utilities/cryptography/aes-256-gcm";
 import login1 from "~/pages/api/auth/Login1";
 import login2 from "~/pages/api/auth/Login2";
 import getOrganizations from "~/pages/api/organization/getOrgs";
@@ -6,7 +6,7 @@ import getOrganizationUserProjects from "~/pages/api/organization/GetOrgUserProj
 
 import { initPostHog } from "../analytics/posthog";
 import { ENV } from "./config";
-import pushKeys from "./pushKeys";
+import pushKeys from "./secrets/pushKeys";
 import SecurityClient from "./SecurityClient";
 
 const nacl = require("tweetnacl");

frontend/components/utilities/cryptography/aes-256-gcm.js

@@ -0,0 +1,63 @@
+/**
+ * @fileoverview Provides easy encryption/decryption methods using AES 256 GCM.
+ */
+
+"use strict";
+
+const crypto = require("crypto");
+
+const ALGORITHM = "aes-256-gcm";
+const BLOCK_SIZE_BYTES = 16; // 128 bit
+
+/**
+ * Provides easy encryption/decryption methods using AES 256 GCM.
+ */
+class Aes256Gcm {
+	/**
+	 * No need to run the constructor. The class only has static methods.
+	 */
+	constructor() {}
+
+	/**
+	 * Encrypts text with AES 256 GCM.
+	 * @param {string} text - Cleartext to encode.
+	 * @param {string} secret - Shared secret key, must be 32 bytes.
+	 * @returns {object}
+	 */
+	static encrypt(text, secret) {
+		const iv = crypto.randomBytes(BLOCK_SIZE_BYTES);
+		const cipher = crypto.createCipheriv(ALGORITHM, secret, iv);
+
+		let ciphertext = cipher.update(text, "utf8", "base64");
+		ciphertext += cipher.final("base64");
+		return {
+			ciphertext,
+			iv: iv.toString("base64"),
+			tag: cipher.getAuthTag().toString("base64"),
+		};
+	}
+
+	/**
+	 * Decrypts AES 256 CGM encrypted text.
+	 * @param {string} ciphertext - Base64-encoded ciphertext.
+	 * @param {string} iv - The base64-encoded initialization vector.
+	 * @param {string} tag - The base64-encoded authentication tag generated by getAuthTag().
+	 * @param {string} secret - Shared secret key, must be 32 bytes.
+	 * @returns {string}
+	 */
+	static decrypt(ciphertext, iv, tag, secret) {
+		const decipher = crypto.createDecipheriv(
+			ALGORITHM,
+			secret,
+			Buffer.from(iv, "base64")
+		);
+		decipher.setAuthTag(Buffer.from(tag, "base64"));
+
+		let cleartext = decipher.update(ciphertext, "base64", "utf8");
+		cleartext += decipher.final("utf8");
+
+		return cleartext;
+	}
+}
+
+module.exports = Aes256Gcm;

frontend/components/utilities/cryptography/changePassword.js

@@ -1,7 +1,7 @@
 import changePassword2 from "~/pages/api/auth/ChangePassword2";
 import SRP1 from "~/pages/api/auth/SRP1";
 
-import Aes256Gcm from "../aes-256-gcm";
+import Aes256Gcm from "./aes-256-gcm";
 
 const nacl = require("tweetnacl");
 nacl.util = require("tweetnacl-util");
@@ -63,6 +63,7 @@ const changePassword = async (
 					async () => {
 						clientNewPassword.createVerifier(
 							async (err, result) => {
+								// The Blob part here is needed to account for symbols that count as 2+ bytes (e.g., é, å, ø)
 								let { ciphertext, iv, tag } = Aes256Gcm.encrypt(
 									localStorage.getItem("PRIVATE_KEY"),
 									newPassword

frontend/components/utilities/cryptography/crypto.js

@@ -1,6 +1,6 @@
 const nacl = require("tweetnacl");
 nacl.util = require("tweetnacl-util");
-const aes = require("../aes-256-gcm");
+const aes = require("./aes-256-gcm");
 
 /**
  * Return assymmetrically encrypted [plaintext] using [publicKey] where

frontend/components/utilities/cryptography/issueBackupKey.js

@@ -1,8 +1,8 @@
 import issueBackupPrivateKey from "~/pages/api/auth/IssueBackupPrivateKey";
 import SRP1 from "~/pages/api/auth/SRP1";
 
-import Aes256Gcm from "../aes-256-gcm";
-import generateBackupPDF from "./generateBackupPDF";
+import Aes256Gcm from "./aes-256-gcm";
+import generateBackupPDF from "../generateBackupPDF";
 
 const nacl = require("tweetnacl");
 nacl.util = require("tweetnacl-util");

frontend/components/utilities/secrets/getSecretsForProject.js

@@ -1,11 +1,11 @@
 import getSecrets from "~/pages/api/files/GetSecrets";
 
-import guidGenerator from "./randomId";
+import guidGenerator from "../randomId";
 
 const {
 	decryptAssymmetric,
 	decryptSymmetric,
-} = require("../../components/utilities/crypto");
+} = require("../cryptography/crypto");
 const nacl = require("tweetnacl");
 nacl.util = require("tweetnacl-util");
 

frontend/components/utilities/secrets/pushKeys.js

@@ -8,7 +8,7 @@ const {
 	decryptSymmetric,
 	encryptSymmetric,
 	encryptAssymmetric,
-} = require("../../components/utilities/crypto");
+} = require("../cryptography/crypto");
 const nacl = require("tweetnacl");
 nacl.util = require("tweetnacl-util");
 

frontend/components/utilities/secrets/pushKeysIntegration.js

@@ -2,7 +2,7 @@ import publicKeyInfical from "~/pages/api/auth/publicKeyInfisical";
 import changeHerokuConfigVars from "~/pages/api/integrations/ChangeHerokuConfigVars";
 
 const crypto = require("crypto");
-const { encryptSymmetric, encryptAssymmetric } = require("./crypto");
+const { encryptSymmetric, encryptAssymmetric } = require("../cryptography/crypto");
 const nacl = require("tweetnacl");
 nacl.util = require("tweetnacl-util");