@oneuptime/common 12.0.24 → 12.0.26

package/build/dist/Server/Utils/VM/VMRunner.js

@@ -311,7 +311,16 @@ export default class VMRunner {
                     url,
                     config,
                 });
-                await SSRFProtection.validateWebhookTargetIsSafe(effectiveUrl);
+                await SSRFProtection.validateWebhookTargetIsSafe(effectiveUrl, {
+                    allowPrivateNetworkTargets: options.allowPrivateNetworkRequests === true,
+                    /*
+                     * "Webhook URL" is wrong here in both directions: sandboxed code
+                     * requests whatever it likes, and one of this runner's two callers
+                     * is a monitor, not a webhook.
+                     */
+                    targetLabel: "Request URL",
+                    privateNetworkHint: options.privateNetworkHint,
+                });
                 /*
                  * The URL that was just validated has to be the URL that gets
                  * dialled. Each of these would otherwise steer the connection

package/build/dist/Server/Utils/VM/VMRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"VMRunner.js","sourceRoot":"","sources":["../../../../../Server/Utils/VM/VMRunner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VMRunner.js","sourceRoot":"","sources":["../../../../../Server/Utils/VM/VMRunner.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/VendorAssets.js

@@ -28,6 +28,21 @@ import path from "path";
 export const VendorAssetsRoute = "/oneuptime-assets";
 /** Where the committed assets live on disk. */
 export const VendorAssetsPath = path.resolve(__dirname, "..", "Static", "Vendor");
+/**
+ * OneUptime's own brand images, served under the same prefix.
+ *
+ * Not third-party, so they do not belong in Static/Vendor, but they have the
+ * identical problem: the server-rendered pages that carry the logo (the on-call
+ * acknowledge page, the SSO message page) come out of the App container, and
+ * `/img/...` is served by Home. nginx sends "/" to App on every install with
+ * billing off - which is every self-hosted install - so the logo those pages
+ * asked for 404'd and rendered as a broken image.
+ * See https://github.com/OneUptime/oneuptime/issues/3457.
+ */
+export const BrandAssetsRouteSegment = "brand";
+export const BrandAssetsPath = path.resolve(__dirname, "..", "Static", "Brand");
+/** Host-relative URL of the OneUptime wordmark, for use in a view's <img src>. */
+export const OneUptimeLogoUrl = `${VendorAssetsRoute}/${BrandAssetsRouteSegment}/oneuptime-logo.svg`;
 /**
  * Mermaid is a dependency of Common already (Common/UI renders diagrams in
  * markdown with it), so it is on disk in every image and there is no reason to
@@ -80,6 +95,20 @@ const mountVendorAssets = (app) => {
          */
         logger.error(`Vendored browser assets are missing at ${VendorAssetsPath}. Server-rendered pages will render unstyled.`);
     }
+    if (fs.existsSync(BrandAssetsPath)) {
+        /*
+         * Revalidating rather than immutable: the filename carries no version, so
+         * a rebrand must not be stuck behind a year-old cache entry.
+         */
+        app.use(`${VendorAssetsRoute}/${BrandAssetsRouteSegment}`, ExpressStatic(BrandAssetsPath, {
+            maxAge: REVALIDATE_CACHE_MAX_AGE_MILLISECONDS,
+            index: false,
+            redirect: false,
+        }));
+    }
+    else {
+        logger.error(`OneUptime brand images are missing at ${BrandAssetsPath}. Server-rendered pages will render without a logo.`);
+    }
     const mermaidDistPath = getMermaidDistPath();
     if (mermaidDistPath) {
         const serveImmutable = ExpressStatic(mermaidDistPath, {

package/build/dist/Server/Utils/VendorAssets.js.map

@@ -1 +1 @@
-{"version":3,"file":"VendorAssets.js","sourceRoot":"","sources":["../../../../Server/Utils/VendorAssets.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"VendorAssets.js","sourceRoot":"","sources":["../../../../Server/Utils/VendorAssets.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Workspace/MicrosoftTeams/MicrosoftTeams.js

@@ -42,6 +42,7 @@ import MicrosoftTeamsMonitorActions from "./Actions/Monitor";
 import MicrosoftTeamsScheduledMaintenanceActions from "./Actions/ScheduledMaintenance";
 import MicrosoftTeamsOnCallDutyActions from "./Actions/OnCallDutyPolicy";
 import AccessTokenService from "../../../Services/AccessTokenService";
+import AIService, { AI_DISABLED_MESSAGE } from "../../../Services/AIService";
 // Microsoft Teams apps should always be single-tenant
 const MICROSOFT_TEAMS_APP_TYPE = "SingleTenant";
 /*
@@ -51,13 +52,31 @@ const MICROSOFT_TEAMS_APP_TYPE = "SingleTenant";
  * Graph permission that deployments connected before it was documented have not
  * consented to, and a tenant that answers "I won't tell you" must never be
  * reported to an admin as "the app is not installed".
+ *
+ * PermissionDenied is that same "I won't tell you", separated out because it is
+ * the one flavour of Unknown the admin can fix in a minute — Microsoft is not
+ * failing, it is refusing, and it names the grant that would stop it. Folding it
+ * in with transport errors is what left admins reading a list of four possible
+ * causes when OneUptime could have told them which one it was.
  */
 export var MicrosoftTeamsAppInstallState;
 (function (MicrosoftTeamsAppInstallState) {
     MicrosoftTeamsAppInstallState["Installed"] = "Installed";
     MicrosoftTeamsAppInstallState["NotInstalled"] = "NotInstalled";
+    MicrosoftTeamsAppInstallState["PermissionDenied"] = "PermissionDenied";
     MicrosoftTeamsAppInstallState["Unknown"] = "Unknown";
 })(MicrosoftTeamsAppInstallState || (MicrosoftTeamsAppInstallState = {}));
+/*
+ * The Graph application permission that lets OneUptime read a team's installed
+ * apps, and so tell "the app is missing" apart from "the app is there but is a
+ * different package".
+ *
+ * Server-side error text builds off this constant. The setup documentation and
+ * the docs site still spell it out literally, because prose there explains the
+ * permission rather than just naming it — if you rename it here, grep for the
+ * literal too.
+ */
+export const MICROSOFT_TEAMS_INSTALL_READ_PERMISSION = "TeamsAppInstallation.ReadForTeam.All";
 /*
  * Microsoft's wording when the Bot Framework refuses a proactive post because
  * the app is not a member of the target conversation. Matched case-insensitively
@@ -1259,10 +1278,25 @@ class MicrosoftTeamsUtil extends WorkspaceBase {
      * them, so the two cases get different instructions.
      */
     static getBotNotInTeamMessage(data) {
+        /*
+         * "Not installed" here means no installed app carries THIS deployment's
+         * app id — which is also what a OneUptime tile from the Teams store looks
+         * like. Saying only "add OneUptime" to an admin who is looking straight at
+         * a OneUptime tile reads as nonsense and sends them round the loop again,
+         * so name that case explicitly.
+         */
+        const wrongPackageNote = `If a tile named OneUptime is already listed there, it is a different package — the app from the Teams store points at OneUptime Cloud's bot and will never accept posts from this deployment. Remove it, then upload the manifest from Project Settings > Workspace > Microsoft Teams, which is the only package built with this deployment's MICROSOFT_TEAMS_APP_CLIENT_ID.`;
+        /*
+         * No wrong-package note for private channels. The install check reads
+         * /teams/{id}/installedApps — team scope — and a private channel needs its
+         * own channel-scope install, so a correct channel install still reads as
+         * "not installed" here. Telling that admin their package is the wrong one
+         * and to remove it would destroy a working install to fix nothing.
+         */
         if (data.membershipType === "private") {
             return `The OneUptime app is not installed in the private channel "${data.channelName}". In Microsoft Teams, open the channel, click the "..." menu, then Manage channel > Apps > Add an app, and add OneUptime. Installing OneUptime in the parent team does not cover private channels.`;
         }
-        return `The OneUptime app is not installed in the Microsoft Teams team that owns "${data.channelName}". In Microsoft Teams, click the "..." next to the team name, then Manage team > Apps > More apps, and add OneUptime. Installing OneUptime for yourself or in a chat is not the same as adding it to the team.`;
+        return `The OneUptime app is not installed in the Microsoft Teams team that owns "${data.channelName}". In Microsoft Teams, click the "..." next to the team name, then Manage team > Apps > More apps, and add OneUptime. Installing OneUptime for yourself or in a chat is not the same as adding it to the team. ${wrongPackageNote}`;
     }
     /*
      * Microsoft rejected the post and we could not confirm why. Everything here
@@ -1278,19 +1312,74 @@ class MicrosoftTeamsUtil extends WorkspaceBase {
             causes.push(`"${data.channelName}" is a private channel, which needs the app installed into the channel itself (channel "..." > Manage channel > Apps > Add an app) — a team-level install does not cover it`);
         }
         else if (data.installState === MicrosoftTeamsAppInstallState.Installed) {
-            causes.push("the app is installed in this team, so the bot behind it may not be the one this OneUptime deployment uses — check that the Teams app package was built from this deployment (Project Settings > Workspace > Microsoft Teams) and that its bot id matches MICROSOFT_TEAMS_APP_CLIENT_ID");
+            /*
+             * Graph confirmed a package carrying THIS deployment's app id is in the
+             * team, so the usual suspect — a OneUptime package from somewhere else —
+             * is largely ruled out and should not lead. "Largely", not "entirely":
+             * the check matches teamsApp.externalId, which is the manifest id, and
+             * only OneUptime's own generator guarantees that equals the bot id. A
+             * hand-edited manifest can satisfy this and still carry a foreign bot, so
+             * the wording stays probabilistic rather than promising the admin the
+             * package is fine.
+             */
+            causes.push("the app installed in this team already matches this deployment's MICROSOFT_TEAMS_APP_CLIENT_ID, so the package is probably not the problem — the most likely remaining cause is the Azure Bot resource, below");
         }
         else {
             causes.push('the OneUptime app has not been added to this team (team "..." > Manage team > Apps > More apps), or the app that was added is a different package whose bot id is not this deployment\'s MICROSOFT_TEAMS_APP_CLIENT_ID');
         }
         causes.push("the Azure Bot resource for this deployment does not have the Microsoft Teams channel enabled");
+        /*
+         * The list above is a guess, and it only has to be a guess because Graph
+         * would not tell us. Say so, and say what turns it into an answer — this is
+         * the single cheapest step an admin reading this can take.
+         *
+         * The promise is hedged for private channels: the grant unlocks a
+         * team-scope read, and for a private channel the deciding fact is the
+         * channel-scope install, which that read cannot see. Worth granting anyway,
+         * just not worth promising it settles this particular send.
+         */
+        const suffixHint = data.installState === MicrosoftTeamsAppInstallState.PermissionDenied
+            ? data.membershipType === "private"
+                ? ` OneUptime could not narrow this down because Microsoft Graph denied the installed-apps check: granting the ${MICROSOFT_TEAMS_INSTALL_READ_PERMISSION} application permission to this deployment's app registration restores that check for team-level installs, though a private channel's own install still has to be confirmed in Microsoft Teams.`
+                : ` OneUptime could not narrow this down because Microsoft Graph denied the installed-apps check: grant the ${MICROSOFT_TEAMS_INSTALL_READ_PERMISSION} application permission to this deployment's app registration, re-grant admin consent, and try again to be told which cause it is.`
+            : "";
         const microsoftMessage = data.microsoftError instanceof Error
             ? data.microsoftError.message
             : String(data.microsoftError || "");
         const suffix = microsoftMessage
             ? ` Microsoft's response was: "${microsoftMessage}"`
             : "";
-        return `Microsoft Teams refused the message to "${data.channelName}" because the OneUptime bot is not a member of that conversation. Likely causes: ${causes.join("; ")}.${suffix}`;
+        return `Microsoft Teams refused the message to "${data.channelName}" because the OneUptime bot is not a member of that conversation. Likely causes: ${causes.join("; ")}.${suffixHint}${suffix}`;
+    }
+    /*
+     * True when Graph refused a read rather than failing it.
+     *
+     * 403 only, deliberately. Graph answers a missing application permission with
+     * 403 and reserves 401 for a token it would not accept — an expired secret, a
+     * cached app token we did not re-check (see getValidAccessToken, which returns
+     * a stored token unvalidated when miscData carries no expiry). Treating 401 as
+     * a permission problem would send an admin off to grant a Graph permission
+     * when their credential had simply gone stale, which is the same species of
+     * wrong-but-confident answer this whole diagnostic exists to stop producing.
+     *
+     * The error codes are still matched at any status, so a permission refusal
+     * that arrives with an unexpected status is not missed.
+     */
+    static isGraphPermissionDeniedResponse(response) {
+        if (response.statusCode === 403) {
+            return true;
+        }
+        const message = (response.message || "").toLowerCase();
+        if (!message) {
+            return false;
+        }
+        return [
+            "authorization_requestdenied",
+            "accessdenied",
+            "insufficient privileges",
+        ].some((fragment) => {
+            return message.includes(fragment);
+        });
     }
     /*
      * Asks Graph whether this deployment's Teams app is installed in a team.
@@ -1302,9 +1391,11 @@ class MicrosoftTeamsUtil extends WorkspaceBase {
      * not the weaker one an admin can answer by eye ("is something called
      * OneUptime in the app list?").
      *
-     * Every failure is Unknown. The call needs TeamsAppInstallation.ReadForTeam.All,
-     * which deployments connected before it was documented have not granted, and a
-     * missing permission must not be reported as a missing install.
+     * No failure is ever reported as NotInstalled. The call needs
+     * TeamsAppInstallation.ReadForTeam.All, which deployments connected before it
+     * was documented have not granted, and a missing permission must not be
+     * reported as a missing install. A refusal comes back as PermissionDenied so
+     * the admin is told which grant to add; everything else is Unknown.
      */
     static async isAppInstalledInTeam(data) {
         if (!MicrosoftTeamsAppClientId) {
@@ -1331,6 +1422,16 @@ class MicrosoftTeamsUtil extends WorkspaceBase {
                     },
                 });
                 if (response instanceof HTTPErrorResponse) {
+                    /*
+                     * A refusal is not a failure. That distinction is the whole value of
+                     * this call: it is the difference between "we cannot tell you which of
+                     * four causes this is" and "grant this one permission and we will tell
+                     * you".
+                     */
+                    if (this.isGraphPermissionDeniedResponse(response)) {
+                        logger.warn(`Cannot read installed apps for team ${data.teamId}: Microsoft Graph denied the request. Grant the ${MICROSOFT_TEAMS_INSTALL_READ_PERMISSION} application permission to this app registration and re-grant admin consent so OneUptime can verify Teams app installs.`);
+                        return MicrosoftTeamsAppInstallState.PermissionDenied;
+                    }
                     logger.debug(`Could not read installed apps for team ${data.teamId}; treating installation as unknown.`);
                     logger.debug(response);
                     return MicrosoftTeamsAppInstallState.Unknown;
@@ -2189,6 +2290,20 @@ class MicrosoftTeamsUtil extends WorkspaceBase {
             await turnContext.sendActivity("I couldn't find your OneUptime account. Please connect your Microsoft Teams account in OneUptime User Settings before asking me questions.");
             return;
         }
+        /*
+         * The project's AI kill switch, read before we acknowledge. The catch
+         * around the assistant below answers every failure with the same generic
+         * "I ran into a problem" — true for a provider outage, actively wrong for
+         * a setting somebody chose on purpose. Reading the switch here lets us
+         * say what actually happened, and where to undo it.
+         */
+        if (!(await AIService.isProjectAIEnabled(projectId))) {
+            logger.debug("AI Ops declined: AI is disabled for this project", {
+                projectId: projectId.toString(),
+            });
+            await turnContext.sendActivity(AI_DISABLED_MESSAGE);
+            return;
+        }
         /*
          * Let the user know we're working on it. The assistant runs a bounded,
          * tool-grounded agent loop and can take several seconds, so send a quick