@budibase/backend-core 2.13.32 → 2.13.34

package/dist/index.js

@@ -1469,6 +1469,13 @@ var init_searchFilter = __esm({
   }
 });
 
+// ../types/src/api/web/cookies.ts
+var init_cookies = __esm({
+  "../types/src/api/web/cookies.ts"() {
+    "use strict";
+  }
+});
+
 // ../types/src/api/web/index.ts
 var init_web = __esm({
   "../types/src/api/web/index.ts"() {
@@ -1484,6 +1491,7 @@ var init_web = __esm({
     init_global2();
     init_pagination();
     init_searchFilter();
+    init_cookies();
   }
 });
 
@@ -4939,20 +4947,33 @@ async function retrieveDirectory(bucketName, path2) {
   let writePath = (0, import_path2.join)(budibaseTempDir(), (0, import_uuid2.v4)());
   import_fs3.default.mkdirSync(writePath);
   const objects = await listAllObjects(bucketName, path2);
-  let fullObjects = await Promise.all(
-    objects.map((obj) => retrieve(bucketName, obj.Key))
+  let streams = await Promise.all(
+    objects.map((obj) => getReadStream(bucketName, obj.Key))
   );
   let count = 0;
+  const writePromises = [];
   for (let obj of objects) {
     const filename = obj.Key;
-    const data = fullObjects[count++];
+    const stream2 = streams[count++];
     const possiblePath = filename.split("/");
-    if (possiblePath.length > 1) {
-      const dirs = possiblePath.slice(0, possiblePath.length - 1);
-      import_fs3.default.mkdirSync((0, import_path2.join)(writePath, ...dirs), { recursive: true });
+    const dirs = possiblePath.slice(0, possiblePath.length - 1);
+    const possibleDir = (0, import_path2.join)(writePath, ...dirs);
+    if (possiblePath.length > 1 && !import_fs3.default.existsSync(possibleDir)) {
+      import_fs3.default.mkdirSync(possibleDir, { recursive: true });
     }
-    import_fs3.default.writeFileSync((0, import_path2.join)(writePath, ...possiblePath), data);
+    const writeStream = import_fs3.default.createWriteStream((0, import_path2.join)(writePath, ...possiblePath), {
+      mode: 420
+    });
+    stream2.pipe(writeStream);
+    writePromises.push(
+      new Promise((resolve, reject) => {
+        stream2.on("finish", resolve);
+        stream2.on("error", reject);
+        writeStream.on("error", reject);
+      })
+    );
   }
+  await Promise.all(writePromises);
   return writePath;
 }
 async function deleteFile(bucketName, filepath) {
@@ -6752,7 +6773,7 @@ init_constants3();
 init_environment2();
 init_context2();
 init_src();
-var jwt = require("jsonwebtoken");
+var import_jsonwebtoken = __toESM(require("jsonwebtoken"));
 var APP_PREFIX3 = "app" /* APP */ + SEPARATOR;
 var PROD_APP_PREFIX = "/app/";
 var BUILDER_PREVIEW_PATH = "/app/preview";
@@ -6784,10 +6805,7 @@ function isServingApp(ctx) {
   if (ctx.path.startsWith(`/${APP_PREFIX3}`)) {
     return true;
   }
-  if (ctx.path.startsWith(PROD_APP_PREFIX)) {
-    return true;
-  }
-  return false;
+  return ctx.path.startsWith(PROD_APP_PREFIX);
 }
 function isServingBuilder(ctx) {
   return ctx.path.startsWith(BUILDER_APP_PREFIX);
@@ -6834,13 +6852,13 @@ function parseAppIdFromUrl(url) {
 }
 function openJwt(token) {
   if (!token) {
-    return token;
+    return void 0;
   }
   try {
-    return jwt.verify(token, environment_default.JWT_SECRET);
+    return import_jsonwebtoken.default.verify(token, environment_default.JWT_SECRET);
   } catch (e) {
     if (environment_default.JWT_SECRET_FALLBACK) {
-      return jwt.verify(token, environment_default.JWT_SECRET_FALLBACK);
+      return import_jsonwebtoken.default.verify(token, environment_default.JWT_SECRET_FALLBACK);
     } else {
       throw e;
     }
@@ -6850,21 +6868,18 @@ function isValidInternalAPIKey(apiKey) {
   if (environment_default.INTERNAL_API_KEY && environment_default.INTERNAL_API_KEY === apiKey) {
     return true;
   }
-  if (environment_default.INTERNAL_API_KEY_FALLBACK && environment_default.INTERNAL_API_KEY_FALLBACK === apiKey) {
-    return true;
-  }
-  return false;
+  return !!(environment_default.INTERNAL_API_KEY_FALLBACK && environment_default.INTERNAL_API_KEY_FALLBACK === apiKey);
 }
 function getCookie(ctx, name) {
   const cookie = ctx.cookies.get(name);
   if (!cookie) {
-    return cookie;
+    return void 0;
   }
   return openJwt(cookie);
 }
 function setCookie(ctx, value, name = "builder", opts = { sign: true }) {
   if (value && opts && opts.sign) {
-    value = jwt.sign(value, environment_default.JWT_SECRET);
+    value = import_jsonwebtoken.default.sign(value, environment_default.JWT_SECRET);
   }
   const config = {
     expires: MAX_VALID_DATE,
@@ -11959,7 +11974,6 @@ __export(auth_exports, {
   google: () => google_exports,
   internalApi: () => internalApi_default,
   joiValidator: () => joi_validator_exports,
-  jwt: () => jwt2,
   oidc: () => oidc_exports,
   passport: () => passport,
   platformLogout: () => platformLogout,
@@ -12360,7 +12374,13 @@ async function postAuth(passport2, ctx, next) {
   const config = await fetchGoogleCreds();
   const platformUrl = await getPlatformUrl({ tenantAware: false });
   let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback`;
-  const authStateCookie = getCookie(ctx, "budibase:datasourceauth" /* DatasourceAuth */);
+  const authStateCookie = getCookie(
+    ctx,
+    "budibase:datasourceauth" /* DatasourceAuth */
+  );
+  if (!authStateCookie) {
+    throw new Error("Unable to fetch datasource auth cookie");
+  }
   return passport2.authenticate(
     new GoogleStrategy2(
       {
@@ -12497,6 +12517,9 @@ function decrypt(input, secretOption = "api" /* API */) {
 async function encryptFile({ dir, filename }, secret) {
   const outputFileName = `${filename}.enc`;
   const filePath = (0, import_path4.join)(dir, filename);
+  if (import_fs5.default.lstatSync(filePath).isDirectory()) {
+    throw new Error("Unable to encrypt directory");
+  }
   const inputFile = import_fs5.default.createReadStream(filePath);
   const outputFile = import_fs5.default.createWriteStream((0, import_path4.join)(dir, outputFileName));
   const salt = import_crypto.default.randomBytes(SALT_LENGTH);
@@ -12523,6 +12546,9 @@ async function getSaltAndIV(path2) {
   return { salt, iv };
 }
 async function decryptFile(inputPath, outputPath, secret) {
+  if (import_fs5.default.lstatSync(inputPath).isDirectory()) {
+    throw new Error("Unable to encrypt directory");
+  }
   const { salt, iv } = await getSaltAndIV(inputPath);
   const inputFile = import_fs5.default.createReadStream(inputPath, {
     start: SALT_LENGTH + IV_LENGTH
@@ -12987,7 +13013,6 @@ var buildAuthMiddleware = authenticated_default;
 var buildTenancyMiddleware = tenancy_default;
 var buildCsrfMiddleware = csrf_default;
 var passport = _passport;
-var jwt2 = require("jsonwebtoken");
 _passport.use(new LocalStrategy(local_exports.options, local_exports.authenticate));
 async function refreshOIDCAccessToken(chosenConfig, refreshToken) {
   const callbackUrl = await oidc_exports.getCallbackUrl();
@@ -13092,7 +13117,7 @@ async function platformLogout(opts) {
     throw new Error("Koa context must be supplied to logout.");
   const currentSession = getCookie(ctx, "budibase:auth" /* Auth */);
   let sessions = await getSessionsForUser(userId);
-  if (keepActiveSession) {
+  if (currentSession && keepActiveSession) {
     sessions = sessions.filter(
       (session) => session.sessionId !== currentSession.sessionId
     );