@raketa-cloud/admin 0.0.94 → 0.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.94",
+  "version": "0.0.95",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/setupAuthentication.js

@@ -5,31 +5,30 @@ import currentPath from "./currentPath.cjs";
 import AuthHelper from "./helpers/AuthHelper";
 // TODO: Maybe change the encryption mechanism?
 import simpleCipher from "./simpleCipher";
-import getConfig from "../../../apps/admin/src/getConfig";
 
 // Generate a random signing secret on every server restart
 // const SIGNING_SECRET = randomBytes(64).toString("hex");
 const DELIMITER = ",";
 
-function calculateHash(text) {
-  return createHmac("sha256", getConfig().secrets.signing_secret)
+function calculateHash(text, config) {
+  return createHmac("sha256", config.secrets.signing_secret)
     .update(text)
     .digest("hex");
 }
 
-function obfuscateToken(token) {
+function obfuscateToken(token, config) {
   const date = new Date();
   const timestamp = date.getTime() + 2 * 60000;
   const timestamped = [token, timestamp].join(DELIMITER);
-  const hash = calculateHash(timestamped);
+  const hash = calculateHash(timestamped, config);
   const signed = [hash, timestamped].join(DELIMITER);
 
-  return Buffer.from(simpleCipher.encrypt(signed)).toString("base64");
+  return Buffer.from(simpleCipher.encrypt(signed, config)).toString("base64");
 }
 
-function extractToken(text) {
+function extractToken(text, config) {
   const encrypted = Buffer.from(text, "base64").toString("ascii");
-  const signed = simpleCipher.decrypt(encrypted);
+  const signed = simpleCipher.decrypt(encrypted, config);
   const [hash, token, timestamp] = signed.split(DELIMITER);
   const tDate = new Date(Number.parseInt(timestamp, 10));
 
@@ -37,7 +36,7 @@ function extractToken(text) {
     return null;
   }
 
-  if (hash !== calculateHash([token, timestamp].join(DELIMITER))) {
+  if (hash !== calculateHash([token, timestamp].join(DELIMITER), config)) {
     return null;
   }
 
@@ -141,9 +140,7 @@ const setupAuthentication = (app, config) => {
       return c.redirect("/login");
     }
 
-    const ot = obfuscateToken(token);
-
-    console.log({ ot });
+    const ot = obfuscateToken(token, config);
 
     return c.redirect(
       [
@@ -151,7 +148,7 @@ const setupAuthentication = (app, config) => {
         "?redirect_to=",
         c.req.query().redirect_to,
         "&snapshot=",
-        obfuscateToken(token),
+        ot,
       ].join("")
     );
   });
@@ -159,7 +156,7 @@ const setupAuthentication = (app, config) => {
   app.post("/remote/verify", async (c) => {
     const { credentials } = await c.req.json();
 
-    const token = extractToken(credentials);
+    const token = extractToken(credentials, config);
 
     if (!token) {
       return unauthorized();

package/src/simpleCipher.js

@@ -1,5 +1,3 @@
-import getConfig from "../../../apps/admin/src/getConfig";
-
 const ALPHABET =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789,.";
 
@@ -36,10 +34,8 @@ function generateDecryptionLookup(key) {
 // const ENCRYPT_LOOKUP = generateEncryptionLookup(CIPHER_KEY);
 // const DECRYPT_LOOKUP = generateDecryptionLookup(CIPHER_KEY);
 
-function encrypt(plaintext) {
-  const ecryptLookup = generateEncryptionLookup(
-    getConfig().secrets.crypto_secret
-  );
+function encrypt(plaintext, config) {
+  const ecryptLookup = generateEncryptionLookup(config.secrets.crypto_secret);
 
   return plaintext
     .split("")
@@ -47,10 +43,8 @@ function encrypt(plaintext) {
     .join("");
 }
 
-function decrypt(ciphertext) {
-  const decryptLookup = generateDecryptionLookup(
-    getConfig().secrets.crypto_secret
-  );
+function decrypt(ciphertext, config) {
+  const decryptLookup = generateDecryptionLookup(config.secrets.crypto_secret);
 
   return ciphertext
     .split("")