@oneuptime/cli 14.0.73 → 14.0.75

package/build/dist/Index.js

@@ -15844,7 +15844,7 @@ var require_main = __commonJS({
     var packageJson = require_package();
     var version = packageJson.version;
     var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
-    function parse(src) {
+    function parse2(src) {
       const obj = {};
       let lines = src.toString();
       lines = lines.replace(/\r\n?/mg, "\n");
@@ -15863,7 +15863,7 @@ var require_main = __commonJS({
       }
       return obj;
     }
-    __name(parse, "parse");
+    __name(parse2, "parse");
     function _parseVault(options) {
       options = options || {};
       const vaultPath = _vaultPath(options);
@@ -16124,7 +16124,7 @@ var require_main = __commonJS({
       _parseVault,
       config,
       decrypt,
-      parse,
+      parse: parse2,
       populate
     };
     module2.exports.configDotenv = DotenvModule.configDotenv;
@@ -26318,15 +26318,15 @@ var require_parse = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     var validate_js_1 = require_validate();
-    function parse(uuid) {
+    function parse2(uuid) {
       if (!(0, validate_js_1.default)(uuid)) {
         throw TypeError("Invalid UUID");
       }
       let v;
       return Uint8Array.of((v = parseInt(uuid.slice(0, 8), 16)) >>> 24, v >>> 16 & 255, v >>> 8 & 255, v & 255, (v = parseInt(uuid.slice(9, 13), 16)) >>> 8, v & 255, (v = parseInt(uuid.slice(14, 18), 16)) >>> 8, v & 255, (v = parseInt(uuid.slice(19, 23), 16)) >>> 8, v & 255, (v = parseInt(uuid.slice(24, 36), 16)) / 1099511627776 & 255, v / 4294967296 & 255, v >>> 24 & 255, v >>> 16 & 255, v >>> 8 & 255, v & 255);
     }
-    __name(parse, "parse");
-    exports2.default = parse;
+    __name(parse2, "parse");
+    exports2.default = parse2;
   }
 });
 
@@ -76908,7 +76908,7 @@ var require_ms = __commonJS({
       options = options || {};
       var type = typeof val;
       if (type === "string" && val.length > 0) {
-        return parse(val);
+        return parse2(val);
       } else if (type === "number" && isFinite(val)) {
         return options.long ? fmtLong(val) : fmtShort(val);
       }
@@ -76916,7 +76916,7 @@ var require_ms = __commonJS({
         "val is not a non-empty string or a valid number. val=" + JSON.stringify(val)
       );
     };
-    function parse(str) {
+    function parse2(str) {
       str = String(str);
       if (str.length > 100) {
         return;
@@ -76972,7 +76972,7 @@ var require_ms = __commonJS({
           return void 0;
       }
     }
-    __name(parse, "parse");
+    __name(parse2, "parse");
     function fmtShort(ms) {
       var msAbs = Math.abs(ms);
       if (msAbs >= d) {
@@ -88421,7 +88421,7 @@ var require_parse2 = __commonJS({
     var token;
     var key;
     var root;
-    module2.exports = /* @__PURE__ */ __name(function parse(text, reviver) {
+    module2.exports = /* @__PURE__ */ __name(function parse2(text, reviver) {
       source = String(text);
       parseState = "start";
       stack = [];
@@ -89501,10 +89501,10 @@ var require_stringify2 = __commonJS({
 var require_lib2 = __commonJS({
   "../Common/node_modules/json5/lib/index.js"(exports2, module2) {
     "use strict";
-    var parse = require_parse2();
+    var parse2 = require_parse2();
     var stringify = require_stringify2();
     var JSON53 = {
-      parse,
+      parse: parse2,
       stringify
     };
     module2.exports = JSON53;
@@ -471841,6 +471841,71 @@ var HTTPResponseBodyReader = class {
   }
 };
 
+// ../Common/Utils/SameServerRedirect.ts
+function parse(address) {
+  try {
+    return new globalThis.URL(address);
+  } catch {
+    return null;
+  }
+}
+__name(parse, "parse");
+function isServerAddress(address) {
+  return (address.protocol === "http:" || address.protocol === "https:") && address.hostname !== "";
+}
+__name(isServerAddress, "isServerAddress");
+function namesAUser(address) {
+  return address.username !== "" || address.password !== "";
+}
+__name(namesAUser, "namesAUser");
+var isRedirectOnSameServer = /* @__PURE__ */ __name((requestUrl, redirectUrl) => {
+  const from = parse(requestUrl);
+  const to = parse(redirectUrl);
+  if (!from || !to || !isServerAddress(from) || !isServerAddress(to) || namesAUser(to)) {
+    return false;
+  }
+  if (to.hostname !== from.hostname) {
+    return false;
+  }
+  if (to.protocol === from.protocol) {
+    return to.port === from.port;
+  }
+  return from.protocol === "http:" && to.protocol === "https:" && from.port === "" && to.port === "";
+}, "isRedirectOnSameServer");
+function originOf(address) {
+  const parsed = parse(address);
+  if (!parsed || parsed.origin === "null") {
+    return null;
+  }
+  return parsed.origin;
+}
+__name(originOf, "originOf");
+var RedirectOffServerError = class extends Error {
+  static {
+    __name(this, "RedirectOffServerError");
+  }
+  constructor(data) {
+    const from = originOf(data.requestUrl) || "its server";
+    const to = originOf(data.redirectUrl);
+    super(
+      to ? `The request to ${from} was redirected to ${to}, another server, so it was not sent on: a request that carries a key follows redirects only on the server it was sent to. If the server is at ${to}, set its address to that.` : `The request to ${from} was redirected to an address that could not be read, so it was not sent on: a request that carries a key follows redirects only on the server it was sent to.`
+    );
+    this.name = "RedirectOffServerError";
+  }
+};
+var getSameServerRedirectCheck = /* @__PURE__ */ __name((requestUrl) => {
+  return (redirectOptions) => {
+    const href = redirectOptions["href"];
+    const redirectUrl = typeof href === "string" ? href : "";
+    if (!isRedirectOnSameServer(requestUrl, redirectUrl)) {
+      throw new RedirectOffServerError({
+        requestUrl,
+        redirectUrl
+      });
+    }
+  };
+}, "getSameServerRedirectCheck");
+
 // ../Common/Utils/ProbeNetworkFailureUtil.ts
 var PROBE_SIDE_CAUSE_PREFIX = "This probe ";
 var OUTPUT_MARKERS = [
@@ -472481,6 +472546,11 @@ var API = class _API {
       if (options?.doNotFollowRedirects) {
         axiosOptions.maxRedirects = 0;
       }
+      if (options?.sameServerRedirectsOnly) {
+        axiosOptions.beforeRedirect = getSameServerRedirectCheck(
+          options?.dispatchUrl ?? url2.toString()
+        );
+      }
       if (options?.maxContentLength !== void 0) {
         axiosOptions.maxContentLength = options.maxContentLength;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneuptime/cli",
-  "version": "14.0.73",
+  "version": "14.0.75",
   "description": "OneUptime CLI - Command-line interface for managing OneUptime resources",
   "repository": {
     "type": "git",