@shushed/helpers 0.0.25 → 0.0.27

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { JSONSchemaType } from 'ajv';
 import { DeepRedact } from '@hackylabs/deep-redact';
-import { DocumentReference, Firestore } from '@google-cloud/firestore';
+import { Firestore, DocumentReference } from '@google-cloud/firestore';
 import { PubSub, Topic, Subscription } from '@google-cloud/pubsub';
 import * as _google_cloud_scheduler_build_protos_protos from '@google-cloud/scheduler/build/protos/protos';
 import { CloudSchedulerClient } from '@google-cloud/scheduler';
@@ -28715,6 +28715,12 @@ declare class Runtime {
     constructor(opts: Opts);
 }
 
+declare const isPubSubRequest: (headers: Record<string, string>) => boolean;
+declare const isCronMessage: (headers: Record<string, string>) => boolean;
+declare const validateGoogleAuth: (opts: Opts & {
+    serviceAccount?: string | null;
+}, headers: Record<string, string>, firestore: Firestore) => Promise<void>;
+
 type Level = 'env' | 'workflow' | 'trigger';
 declare class EnvEngine extends Runtime {
     docRef: Record<Level, DocumentReference>;
@@ -28827,12 +28833,6 @@ declare class JWKSHelper extends Runtime {
     private fetchJWKS;
 }
 
-declare const isPubSubRequest: (headers: Record<string, string>) => boolean;
-declare const isCronMessage: (headers: Record<string, string>) => boolean;
-declare const validateGoogleAuth: (opts: Opts & {
-    serviceAccount?: string | null;
-}, headers: Record<string, string>, firestore: Firestore) => Promise<void>;
-
 type TriggerOnExecuteOptions = {
     req: {
         status?: number;

package/dist/index.js

@@ -346,8 +346,8 @@ var sanitize = new import_deep_redact.DeepRedact({
   replaceStringByLength: true
 });
 
-// src-public/env.ts
-var crypto = __toESM(require("crypto"));
+// src-public/jwks.ts
+var import_jose = require("jose");
 
 // src-public/runtime.ts
 var DEFAULT_BRANCH = "migratedprod";
@@ -373,16 +373,130 @@ var Runtime = class {
   }
 };
 
+// src-public/jwks.ts
+var CACHE_TABLE = "cache-global";
+var JWKSHelper = class extends Runtime {
+  constructor(opts, firestore) {
+    super(opts);
+    this.firestore = firestore;
+  }
+  async validateAuthorizationHeader(authorizationHeader, expectedServiceAccount = null) {
+    const splitted = authorizationHeader.split(".");
+    const keyMeta = JSON.parse(Buffer.from(splitted[0], "base64").toString("utf-8")) || {};
+    const meta = JSON.parse(Buffer.from(splitted[1], "base64").toString("utf-8")) || {};
+    if (!meta.email_verified) {
+      throw new Error("Authorization header - Email not verified");
+    }
+    if (expectedServiceAccount === null) {
+      expectedServiceAccount = `runtime@${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`;
+    }
+    if (meta.email !== expectedServiceAccount) {
+      throw new Error(`Authorization header - Wrong service account, got ${meta?.email}, expected ${expectedServiceAccount}`);
+    }
+    if (!keyMeta.kid || !keyMeta.alg) {
+      throw new Error("Malformed Authorization Header. KID is missing");
+    }
+    const key = await this.getKey(keyMeta.kid);
+    if (!key) {
+      throw new Error("Incorrect Authorization Header. The key has not been found in the Google JWKS set");
+    }
+    const importedKey = await (0, import_jose.importJWK)(key, keyMeta.alg);
+    let validationCorrect = true;
+    try {
+      await (0, import_jose.jwtVerify)(authorizationHeader, importedKey, {
+        issuer: ["https://accounts.google.com", "accounts.google.com"],
+        clockTolerance: 0,
+        audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId
+      });
+    } catch (err) {
+      validationCorrect = false;
+    }
+    if (!validationCorrect) {
+      throw new Error("Incorrect Authorization Header. The JWT is not valid");
+    }
+    return validationCorrect;
+  }
+  async getKey(keyId) {
+    const jwks = typeof global.jwks !== "undefined" ? global.jwks : null;
+    let parsedJwks = null;
+    if (jwks) {
+      try {
+        parsedJwks = JSON.parse(jwks);
+      } catch (err) {
+        err.message.toString();
+      }
+    }
+    let keyData = parsedJwks?.keys?.find((x) => x.kid === keyId);
+    let cachedItem;
+    if (!keyData) {
+      cachedItem = await this.firestore.collection(CACHE_TABLE).doc("google-jwks").get();
+      if (cachedItem.exists && cachedItem.data()?.expires_at.toDate() > /* @__PURE__ */ new Date()) {
+        keyData = cachedItem.data()?.value;
+      }
+    }
+    keyData = parsedJwks?.keys.find((x) => x.kid === keyId);
+    if (!keyData) {
+      const result = await this.fetchJWKS();
+      parsedJwks = result.jwks;
+      if (cachedItem) {
+        cachedItem.ref.set({
+          value: parsedJwks,
+          expires_at: result.expiresAt
+        }, { merge: true });
+      }
+      keyData = parsedJwks?.keys.find((x) => x.kid === keyId);
+    }
+    if (parsedJwks && cachedItem) {
+      global.jwks = JSON.stringify(parsedJwks);
+    }
+    return keyData;
+  }
+  async fetchJWKS() {
+    const date = /* @__PURE__ */ new Date();
+    let expiresAt = new Date(Date.now() + 1e3 * 60 * 60);
+    const response = await fetch("https://www.googleapis.com/oauth2/v3/certs");
+    const maxAgePair = response.headers.get("Cache-Control")?.split(",").map((x) => x.trim().split("=")).find((x) => x[0] === "max-age");
+    if (maxAgePair && maxAgePair.length === 2) {
+      expiresAt = new Date(date.getTime() + parseInt(maxAgePair[1], 10) * 1e3);
+    }
+    const jwks = await response.json();
+    return {
+      expiresAt,
+      jwks
+    };
+  }
+};
+var jwks_default = JWKSHelper;
+
+// src-public/utils.ts
+var isPubSubRequest = (headers) => (headers["User-Agent"] || headers["user-agent"]) === "CloudPubSub-Google" || (headers["User-Agent"] || headers["user-agent"] || "").indexOf("APIs-Google") !== -1;
+var isCronMessage = (headers) => (headers["User-Agent"] || headers["user-agent"]) === "Google-Cloud-Scheduler";
+var validateGoogleAuth = async (opts, headers, firestore) => {
+  const token = headers.authorization?.split(" ")[1];
+  if (!token) {
+    throw new Error(
+      "Missing authorization header or invalid format, needs to be in format: Bearer <IdToken>"
+    );
+  }
+  try {
+    const jwksHelper = new jwks_default(opts, firestore);
+    await jwksHelper.validateAuthorizationHeader(token, opts.serviceAccount || null);
+  } catch (err) {
+    throw new Error("Invalid authorization header " + err.message);
+  }
+};
+
 // src-public/env.ts
+var crypto = __toESM(require("crypto"));
 var EnvEngine = class extends Runtime {
   docRef;
   store;
   constructor(opts, firestore) {
     super(opts);
     this.docRef = {
-      env: firestore?.doc(`0/0/${this.envName}`),
-      workflow: firestore?.doc(`${this.workflowId}/0/${this.envName}`),
-      trigger: firestore?.doc(`${this.workflowId}/${this.triggerId}/${this.envName}`)
+      env: firestore?.doc(`hush-${this.envName}/0-0`),
+      workflow: firestore?.doc(`hush-${this.envName}/${this.workflowId}-0`),
+      trigger: firestore?.doc(`hush-${this.envName}/${this.workflowId}-${this.triggerId}`)
     };
     this.store = {
       env: null,
@@ -828,120 +942,6 @@ var Secrets = class extends Runtime {
   }
 };
 var secret_default = Secrets;
-
-// src-public/jwks.ts
-var import_jose = require("jose");
-var CACHE_TABLE = "cache-global";
-var JWKSHelper = class extends Runtime {
-  constructor(opts, firestore) {
-    super(opts);
-    this.firestore = firestore;
-  }
-  async validateAuthorizationHeader(authorizationHeader, expectedServiceAccount = null) {
-    const splitted = authorizationHeader.split(".");
-    const keyMeta = JSON.parse(Buffer.from(splitted[0], "base64").toString("utf-8")) || {};
-    const meta = JSON.parse(Buffer.from(splitted[1], "base64").toString("utf-8")) || {};
-    if (!meta.email_verified) {
-      throw new Error("Authorization header - Email not verified");
-    }
-    if (expectedServiceAccount === null) {
-      expectedServiceAccount = `runtime@${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`;
-    }
-    if (meta.email !== expectedServiceAccount) {
-      throw new Error(`Authorization header - Wrong service account, got ${meta?.email}, expected ${expectedServiceAccount}`);
-    }
-    if (!keyMeta.kid || !keyMeta.alg) {
-      throw new Error("Malformed Authorization Header. KID is missing");
-    }
-    const key = await this.getKey(keyMeta.kid);
-    if (!key) {
-      throw new Error("Incorrect Authorization Header. The key has not been found in the Google JWKS set");
-    }
-    const importedKey = await (0, import_jose.importJWK)(key, keyMeta.alg);
-    let validationCorrect = true;
-    try {
-      await (0, import_jose.jwtVerify)(authorizationHeader, importedKey, {
-        issuer: ["https://accounts.google.com", "accounts.google.com"],
-        clockTolerance: 0,
-        audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId
-      });
-    } catch (err) {
-      validationCorrect = false;
-    }
-    if (!validationCorrect) {
-      throw new Error("Incorrect Authorization Header. The JWT is not valid");
-    }
-    return validationCorrect;
-  }
-  async getKey(keyId) {
-    const jwks = typeof global.jwks !== "undefined" ? global.jwks : null;
-    let parsedJwks = null;
-    if (jwks) {
-      try {
-        parsedJwks = JSON.parse(jwks);
-      } catch (err) {
-        err.message.toString();
-      }
-    }
-    let keyData = parsedJwks?.keys?.find((x) => x.kid === keyId);
-    let cachedItem;
-    if (!keyData) {
-      cachedItem = await this.firestore.collection(CACHE_TABLE).doc("google-jwks").get();
-      if (cachedItem.exists && cachedItem.data()?.expires_at.toDate() > /* @__PURE__ */ new Date()) {
-        keyData = cachedItem.data()?.value;
-      }
-    }
-    keyData = parsedJwks?.keys.find((x) => x.kid === keyId);
-    if (!keyData) {
-      const result = await this.fetchJWKS();
-      parsedJwks = result.jwks;
-      if (cachedItem) {
-        cachedItem.ref.set({
-          value: parsedJwks,
-          expires_at: result.expiresAt
-        }, { merge: true });
-      }
-      keyData = parsedJwks?.keys.find((x) => x.kid === keyId);
-    }
-    if (parsedJwks && cachedItem) {
-      global.jwks = JSON.stringify(parsedJwks);
-    }
-    return keyData;
-  }
-  async fetchJWKS() {
-    const date = /* @__PURE__ */ new Date();
-    let expiresAt = new Date(Date.now() + 1e3 * 60 * 60);
-    const response = await fetch("https://www.googleapis.com/oauth2/v3/certs");
-    const maxAgePair = response.headers.get("Cache-Control")?.split(",").map((x) => x.trim().split("=")).find((x) => x[0] === "max-age");
-    if (maxAgePair && maxAgePair.length === 2) {
-      expiresAt = new Date(date.getTime() + parseInt(maxAgePair[1], 10) * 1e3);
-    }
-    const jwks = await response.json();
-    return {
-      expiresAt,
-      jwks
-    };
-  }
-};
-var jwks_default = JWKSHelper;
-
-// src-public/utils.ts
-var isPubSubRequest = (headers) => (headers["User-Agent"] || headers["user-agent"]) === "CloudPubSub-Google" || (headers["User-Agent"] || headers["user-agent"] || "").indexOf("APIs-Google") !== -1;
-var isCronMessage = (headers) => (headers["User-Agent"] || headers["user-agent"]) === "Google-Cloud-Scheduler";
-var validateGoogleAuth = async (opts, headers, firestore) => {
-  const token = headers.authorization?.split(" ")[1];
-  if (!token) {
-    throw new Error(
-      "Missing authorization header or invalid format, needs to be in format: Bearer <IdToken>"
-    );
-  }
-  try {
-    const jwksHelper = new jwks_default(opts, firestore);
-    await jwksHelper.validateAuthorizationHeader(token, opts.serviceAccount || null);
-  } catch (err) {
-    throw new Error("Invalid authorization header " + err.message);
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   lib,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "author": "",
   "license": "UNLICENSED",
   "description": "",