@oneuptime/common 14.0.6 → 14.0.8

package/Server/Utils/VM/VMAPI.ts

@@ -15,6 +15,7 @@ export default class VMUtil {
       allowPrivateNetworkRequests?: boolean | undefined;
       privateNetworkAccessIsAllowed?: boolean | undefined;
       privateNetworkHint?: string | undefined;
+      includeResolutionDetailInError?: boolean | undefined;
     };
   }): Promise<ReturnResult> {
     return VMRunner.runCodeInSandbox(data);

package/Server/Utils/VM/VMRunner.ts

@@ -117,6 +117,14 @@ export default class VMRunner {
        * knows which process's environment that is; the guard does not.
        */
       privateNetworkHint?: string | undefined;
+      /*
+       * Whether a refusal decided by DNS may tell the script what DNS
+       * answered (see SSRFProtection). Absent ⇒ the guard's deployment
+       * default, which is right for the workflow caller on the API server.
+       * The Probe passes false: a shared probe must not let one tenant's
+       * script map the network it sits in.
+       */
+      includeResolutionDetailInError?: boolean | undefined;
     };
   }): Promise<ReturnResult> {
     const { code, options } = data;
@@ -548,6 +556,8 @@ export default class VMRunner {
            */
           targetLabel: "Request URL",
           privateNetworkHint: options.privateNetworkHint,
+          includeResolutionDetailInError:
+            options.includeResolutionDetailInError,
         });
         const canonicalUrl: string = validatedTarget.url.toString();
         const pinnedLookup: EgressLookupFunction =

package/Server/Utils/Workflow/OAuth2TokenClient.ts

@@ -65,6 +65,12 @@ export interface OAuth2TokenHttpRequest {
   // Form fields, sent as application/x-www-form-urlencoded.
   body: Dictionary<string>;
   timeoutInMs: number;
+  /*
+   * Optional: cancels the request when aborted. timeoutInMs is how long the
+   * socket may sit idle, so a server that trickles its answer can outlast it;
+   * a caller that needs a wall-clock bound aborts this.
+   */
+  signal?: AbortSignal | undefined;
 }
 
 export interface OAuth2TokenHttpResponse {
@@ -676,6 +682,10 @@ export default class OAuth2TokenClient {
       httpsAgent: httpsAgent,
     };
 
+    if (request.signal) {
+      axiosOptions.signal = request.signal;
+    }
+
     try {
       const response: AxiosResponse<string> = await axios(axiosOptions);
 

package/Server/Views/Partials/SensitiveUrlToken.ejs

@@ -4,7 +4,8 @@
 
     Password reset and email verification links carry their token in the URL
     *path* — /accounts/reset-password/<token>, /accounts/verify-email/<token>,
-    /reset-password/<token> on a status page. Every analytics and advertising
+    /reset-password/<token> on a status page — and so does the unsubscribe
+    link in every status page notification, /unsubscribe/<subscriberId>-<token>. Every analytics and advertising
     tag on the page reports the page URL as a matter of course, so the token
     left the browser to whoever the container happened to be loading. Measured
     on production before this partial existed, a single visit to
@@ -51,12 +52,14 @@
         var STORAGE_KEY = "oneuptime-sensitive-url-token";
 
         /*
-         * Route segments whose NEXT path segment is a single-use bearer token.
-         * Matched against the second-to-last segment, so this covers
+         * Route segments whose NEXT path segment is a bearer token. Matched
+         * against the second-to-last segment, so this covers
          * /accounts/reset-password/<token>, /reset-password/<token> and
-         * /status-page/<id>/reset-password/<token> alike.
+         * /status-page/<id>/reset-password/<token> alike. "unsubscribe" is a
+         * status page subscriber's unsubscribe link, whose last segment is
+         * <subscriberId>-<token> (Common/Types/StatusPage/StatusPageSubscriberUnsubscribe).
          */
-        var TOKEN_ROUTES = ["reset-password", "verify-email"];
+        var TOKEN_ROUTES = ["reset-password", "verify-email", "unsubscribe"];
 
         function segmentsOf(pathname) {
             var parts = String(pathname || "").split("/");