Merge pull request #3261 from fosrl/dev

1.19.2

server/lib/traefik/TraefikConfigManager.ts

@@ -511,12 +511,6 @@ export class TraefikConfigManager {
         let traefikConfig;
         try {
             const currentExitNode = await getCurrentExitNodeId();
-
-            const maintenancePort = config.getRawConfig().server.next_port;
-            const maintenanceHost =
-                config.getRawConfig().server.internal_hostname;
-            const pangolinUIUrl = `http://${maintenanceHost}:${maintenancePort}`;
-
             // logger.debug(`Fetching traefik config for exit node: ${currentExitNode}`);
             traefikConfig = await getTraefikConfig(
                 // this is called by the local exit node to get its own config
@@ -527,8 +521,7 @@ export class TraefikConfigManager {
                 build == "saas"
                     ? false
                     : config.getRawConfig().traefik.allow_raw_resources, // dont allow raw resources on saas otherwise use config
-                pangolinUIUrl, // generate maintenance pages on cloud and hybrid
-                pangolinUIUrl // generate browser gateway targets on cloud and hybrid
+                build != "oss" // generate browser gateway targets on cloud and enterprise
             );
 
             const domains = new Set<string>();

server/lib/traefik/getTraefikConfig.ts

@@ -44,8 +44,8 @@ export async function getTraefikConfig(
     filterOutNamespaceDomains = false, // UNUSED BUT USED IN PRIVATE
     generateLoginPageRouters = false, // UNUSED BUT USED IN PRIVATE
     allowRawResources = true,
-    maintenancePageUiUrl: string | null = null, // UNUSED BUT USED IN PRIVATE
-    browserGatewayUiUrl: string | null = null // UNUSED BUT USED IN PRIVATE
+    allowMaintenancePage = true, // UNUSED BUT USED IN PRIVATE
+    allowBrowserGatewayResources = true
 ): Promise<any> {
     // Get resources with their targets and sites in a single optimized query
     // Start from sites on this exit node, then join to targets and resources

server/private/lib/traefik/getTraefikConfig.ts

@@ -84,8 +84,8 @@ export async function getTraefikConfig(
     filterOutNamespaceDomains = false,
     generateLoginPageRouters = false,
     allowRawResources = true,
-    maintenancePageUiUrl: string | null = null,
-    browserGatewayUiUrl: string | null = null
+    allowMaintenancePage = true,
+    allowBrowserGatewayResources = true
 ): Promise<any> {
     // Get resources with their targets and sites in a single optimized query
     // Start from sites on this exit node, then join to targets and resources
@@ -317,7 +317,7 @@ export async function getTraefikConfig(
         BrowserGatewayResourceEntry
     >();
 
-    if (browserGatewayUiUrl) {
+    if (allowBrowserGatewayResources) {
         for (const row of resourcesWithTargetsAndSites) {
             if (!["ssh", "vnc", "rdp"].includes(row.mode)) {
                 continue;
@@ -630,11 +630,10 @@ export async function getTraefikConfig(
                 }
             }
 
-            if (showMaintenancePage && maintenancePageUiUrl) {
+            if (showMaintenancePage && allowMaintenancePage) {
                 const maintenanceServiceName = `${key}-maintenance-service`;
                 const maintenanceRouterName = `${key}-maintenance-router`;
                 const rewriteMiddlewareName = `${key}-maintenance-rewrite`;
-                const maintenanceHeadersMiddlewareName = `${key}-maintenance-headers`;
 
                 const entrypointHttp =
                     config.getRawConfig().traefik.http_entrypoint;
@@ -647,11 +646,15 @@ export async function getTraefikConfig(
                     ? `*.${domainParts.slice(1).join(".")}`
                     : fullDomain;
 
+                const maintenancePort = config.getRawConfig().server.next_port;
+                const maintenanceHost =
+                    config.getRawConfig().server.internal_hostname;
+
                 config_output.http.services[maintenanceServiceName] = {
                     loadBalancer: {
                         servers: [
                             {
-                                url: maintenancePageUiUrl
+                                url: `http://${maintenanceHost}:${maintenancePort}`
                             }
                         ],
                         passHostHeader: true
@@ -670,26 +673,12 @@ export async function getTraefikConfig(
                     }
                 };
 
-                config_output.http.middlewares[
-                    maintenanceHeadersMiddlewareName
-                ] = {
-                    headers: {
-                        customRequestHeaders: {
-                            Host: "app.pangolin.net", // if we are sending to the cloud the host needs to be this but we will pull the p-host to find the resource
-                            "p-host": fullDomain
-                        }
-                    }
-                };
-
                 config_output.http.routers[maintenanceRouterName] = {
                     entryPoints: [
                         resource.ssl ? entrypointHttps : entrypointHttp
                     ],
                     service: maintenanceServiceName,
-                    middlewares: [
-                        rewriteMiddlewareName,
-                        maintenanceHeadersMiddlewareName
-                    ],
+                    middlewares: [rewriteMiddlewareName],
                     rule: rule,
                     priority: 2000,
                     ...(resource.ssl ? { tls } : {})
@@ -702,7 +691,6 @@ export async function getTraefikConfig(
                             resource.ssl ? entrypointHttps : entrypointHttp
                         ],
                         service: maintenanceServiceName,
-                        middlewares: [maintenanceHeadersMiddlewareName],
                         rule: `${rule} && (PathPrefix(\`/_next\`) || PathRegexp(\`^/__nextjs*\`) || Path(\`/favicon.ico\`)) `,
                         priority: 2001,
                         ...(resource.ssl ? { tls } : {})
@@ -1039,7 +1027,7 @@ export async function getTraefikConfig(
         }
     }
 
-    if (browserGatewayUiUrl) {
+    if (allowBrowserGatewayResources) {
         // Generate Traefik config for browser gateway resources
         const browserGatewayPort = 39999;
         for (const [, bgResource] of browserGatewayResourcesMap.entries()) {
@@ -1131,17 +1119,20 @@ export async function getTraefikConfig(
                 }
             }
 
-            if (showBgMaintenancePage && maintenancePageUiUrl) {
+            if (showBgMaintenancePage && allowMaintenancePage) {
                 const bgMaintenanceServiceName = `bg-r${bgResource.resourceId}-maintenance-service`;
                 const bgMaintenanceRouterName = `bg-r${bgResource.resourceId}-maintenance-router`;
                 const bgRewriteMiddlewareName = `bg-r${bgResource.resourceId}-maintenance-rewrite`;
-                const bgMaintenanceHeadersMiddlewareName = `bg-r${bgResource.resourceId}-maintenance-headers`;
 
                 const entrypointHttp =
                     config.getRawConfig().traefik.http_entrypoint;
                 const entrypointHttps =
                     config.getRawConfig().traefik.https_entrypoint;
 
+                const maintenancePort = config.getRawConfig().server.next_port;
+                const maintenanceHost =
+                    config.getRawConfig().server.internal_hostname;
+
                 if (!config_output.http.services)
                     config_output.http.services = {};
                 if (!config_output.http.middlewares)
@@ -1153,7 +1144,7 @@ export async function getTraefikConfig(
                     loadBalancer: {
                         servers: [
                             {
-                                url: maintenancePageUiUrl
+                                url: `http://${maintenanceHost}:${maintenancePort}`
                             }
                         ],
                         passHostHeader: true
@@ -1167,26 +1158,12 @@ export async function getTraefikConfig(
                     }
                 };
 
-                config_output.http.middlewares![
-                    bgMaintenanceHeadersMiddlewareName
-                ] = {
-                    headers: {
-                        customRequestHeaders: {
-                            Host: "app.pangolin.net", // if we are sending to the cloud the host needs to be this but we will pull the p-host to find the resource
-                            "p-host": fullDomain
-                        }
-                    }
-                };
-
                 config_output.http.routers![bgMaintenanceRouterName] = {
                     entryPoints: [
                         bgResource.ssl ? entrypointHttps : entrypointHttp
                     ],
                     service: bgMaintenanceServiceName,
-                    middlewares: [
-                        bgRewriteMiddlewareName,
-                        bgMaintenanceHeadersMiddlewareName
-                    ],
+                    middlewares: [bgRewriteMiddlewareName],
                     rule: hostRule,
                     priority: 2000,
                     ...(bgResource.ssl ? { tls } : {})
@@ -1199,7 +1176,6 @@ export async function getTraefikConfig(
                         bgResource.ssl ? entrypointHttps : entrypointHttp
                     ],
                     service: bgMaintenanceServiceName,
-                    middlewares: [bgMaintenanceHeadersMiddlewareName],
                     rule: `${hostRule} && (PathPrefix(\`/_next\`) || PathRegexp(\`^/__nextjs*\`) || Path(\`/favicon.ico\`))`,
                     priority: 2001,
                     ...(bgResource.ssl ? { tls } : {})
@@ -1258,8 +1234,9 @@ export async function getTraefikConfig(
             // The primary type is used for the path rewrite (e.g. /rdp), mirroring
             // how the maintenance page rewrites everything to /maintenance-screen.
             const primaryType = typeMap.keys().next().value as string;
+            const internalHost = config.getRawConfig().server.internal_hostname;
+            const internalPort = config.getRawConfig().server.next_port;
             const uiRewriteMiddlewareName = `bg-r${bgResource.resourceId}-ui-rewrite`;
-            const uiHeadersMiddlewareName = `bg-r${bgResource.resourceId}-ui-headers`;
             const entrypoint = bgResource.ssl
                 ? config.getRawConfig().traefik.https_entrypoint
                 : config.getRawConfig().traefik.http_entrypoint;
@@ -1275,33 +1252,22 @@ export async function getTraefikConfig(
                 }
             };
 
-            config_output.http.middlewares![uiHeadersMiddlewareName] = {
-                headers: {
-                    customRequestHeaders: {
-                        Host: "app.pangolin.net", // if we are sending to the cloud the host needs to be this but we will pull the p-host to find the resource
-                        "p-host": fullDomain
-                    }
-                }
-            };
-
             config_output.http.services![bgUiServiceName] = {
                 loadBalancer: {
                     servers: [
                         {
-                            url: browserGatewayUiUrl
+                            url: `http://${internalHost}:${internalPort}`
                         }
                     ]
                 }
             };
 
-            // Assets router at higher priority so /_next files load without rewrite.
-            // Do NOT apply the path-rewrite middleware here — static assets must
-            // keep their original path; only the host headers are needed.
+            // Assets router at higher priority so /_next files load without rewrite
             config_output.http.routers![
                 `bg-r${bgResource.resourceId}-assets-router`
             ] = {
                 entryPoints: [entrypoint],
-                middlewares: [...routerMiddlewares, uiHeadersMiddlewareName],
+                middlewares: routerMiddlewares,
                 service: bgUiServiceName,
                 rule: `${hostRule} && (PathPrefix(\`/_next\`) || PathRegexp(\`^/__nextjs*\`) || Path(\`/favicon.ico\`))`,
                 priority: 101,
@@ -1313,11 +1279,7 @@ export async function getTraefikConfig(
                 `bg-r${bgResource.resourceId}-ui-router`
             ] = {
                 entryPoints: [entrypoint],
-                middlewares: [
-                    ...routerMiddlewares,
-                    uiRewriteMiddlewareName,
-                    uiHeadersMiddlewareName
-                ],
+                middlewares: [...routerMiddlewares, uiRewriteMiddlewareName],
                 service: bgUiServiceName,
                 rule: hostRule,
                 priority: 100,
@@ -1350,6 +1312,10 @@ export async function getTraefikConfig(
             const siteResourceRouterName = `${srKey}-router`;
             const siteResourceRewriteMiddlewareName = `${srKey}-rewrite`;
 
+            const maintenancePort = config.getRawConfig().server.next_port;
+            const maintenanceHost =
+                config.getRawConfig().server.internal_hostname;
+
             if (!config_output.http.routers) {
                 config_output.http.routers = {};
             }
@@ -1365,7 +1331,7 @@ export async function getTraefikConfig(
                 loadBalancer: {
                     servers: [
                         {
-                            url: maintenancePageUiUrl
+                            url: `http://${maintenanceHost}:${maintenancePort}`
                         }
                     ],
                     passHostHeader: true

server/private/routers/hybrid.ts

@@ -277,8 +277,6 @@ hybridRouter.get(
             );
         }
 
-        const pangolinUIUrl = config.getRawConfig().app.dashboard_url; // points to the dashboard to serve from there
-
         try {
             const traefikConfig = await getTraefikConfig(
                 remoteExitNode.exitNodeId,
@@ -286,8 +284,8 @@ hybridRouter.get(
                 true, // But don't allow domain namespace resources
                 false, // Dont include login pages,
                 true, // allow raw resources
-                pangolinUIUrl, // dont generate maintenance page
-                pangolinUIUrl // generate browser gateway targets
+                false, // dont generate maintenance page
+                false // dont generate browser gateway targets
             );
 
             return response(res, {

server/routers/newt/handleNewtGetConfigMessage.ts

@@ -54,7 +54,7 @@ export const handleNewtGetConfigMessage: MessageHandler = async (context) => {
         // TODO: somehow we should make sure a recent hole punch has happened if this occurs (hole punch could be from the last restart if done quickly)
     }
 
-    if (existingSite.lastHolePunch && now - existingSite.lastHolePunch > 12) {
+    if (existingSite.lastHolePunch && now - existingSite.lastHolePunch > 5) {
         logger.warn(
             `Site last hole punch is too old; skipping this register. The site is failing to hole punch and identify its network address with the server. Can the site reach the server on UDP port ${config.getRawConfig().gerbil.clients_start_port}?`
         );

server/routers/olm/handleOlmRegisterMessage.ts

@@ -348,7 +348,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
     // this prevents us from accepting a register from an olm that has not hole punched yet.
     // the olm will pump the register so we can keep checking
     // TODO: I still think there is a better way to do this rather than locking it out here but ???
-    if (now - (client.lastHolePunch || 0) > 12 && sitesCount > 0) {
+    if (now - (client.lastHolePunch || 0) > 5 && sitesCount > 0) {
         logger.warn(
             `[handleOlmRegisterMessage] Client last hole punch is too old and we have sites to send; skipping this register. The client is failing to hole punch and identify its network address with the server. Can the client reach the server on UDP port ${config.getRawConfig().gerbil.clients_start_port}?`,
             { orgId: client.orgId, clientId: client.clientId }

server/routers/serverInfo/getServerInfo.ts

@@ -3,6 +3,7 @@ import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { response as sendResponse } from "@server/lib/response";
+import config from "@server/lib/config";
 import { build } from "@server/build";
 import { APP_VERSION } from "@server/lib/consts";
 import license from "#dynamic/license/license";
@@ -21,6 +22,9 @@ export async function getServerInfo(
     next: NextFunction
 ): Promise<any> {
     try {
+        const supporterData = config.getSupporterData();
+        const supporterStatusValid = supporterData?.valid || false;
+
         let enterpriseLicenseValid = false;
         let enterpriseLicenseType: string | null = null;
 
@@ -37,7 +41,7 @@ export async function getServerInfo(
         return sendResponse<GetServerInfoResponse>(res, {
             data: {
                 version: APP_VERSION,
-                supporterStatusValid: true,
+                supporterStatusValid,
                 build,
                 enterpriseLicenseValid,
                 enterpriseLicenseType

server/routers/traefik/traefikConfigProvider.ts

@@ -17,18 +17,13 @@ export async function traefikConfigProvider(
         // Get the current exit node name from config
         const currentExitNodeId = await getCurrentExitNodeId();
 
-        const maintenancePort = config.getRawConfig().server.next_port;
-        const maintenanceHost = config.getRawConfig().server.internal_hostname;
-        const pangolinUIUrl = `http://${maintenanceHost}:${maintenancePort}`;
-
         const traefikConfig = await getTraefikConfig(
             currentExitNodeId,
             config.getRawConfig().traefik.site_types,
             build == "oss", // filter out the namespace domains in open source
             build != "oss", // generate the login pages on the cloud and and enterprise,
             config.getRawConfig().traefik.allow_raw_resources,
-            pangolinUIUrl,
-            pangolinUIUrl
+            build != "oss" // generate browser gateway resources on cloud and enterprise
         );
 
         if (traefikConfig?.http?.middlewares) {

src/app/admin/license/page.tsx

@@ -42,14 +42,7 @@ import {
     SettingsSectionFooter
 } from "@app/components/Settings";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import {
-    ArrowRight,
-    Check,
-    ExternalLink,
-    Heart,
-    InfoIcon,
-    TicketCheck
-} from "lucide-react";
+import { ArrowRight, Check, ExternalLink, Heart, InfoIcon, TicketCheck } from "lucide-react";
 import Link from "next/link";
 import DismissableBanner from "@app/components/DismissableBanner";
 import CopyTextBox from "@app/components/CopyTextBox";
@@ -57,7 +50,7 @@ import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { SitePriceCalculator } from "@app/components/SitePriceCalculator";
 import { Checkbox } from "@app/components/ui/checkbox";
 import { Alert, AlertDescription, AlertTitle } from "@app/components/ui/alert";
-// import { useSupporterStatusContext } from "@app/hooks/useSupporterStatusContext";
+import { useSupporterStatusContext } from "@app/hooks/useSupporterStatusContext";
 import { useTranslations } from "next-intl";
 
 const ENTERPRISE_DOCS_URL =
@@ -89,7 +82,7 @@ export default function LicensePage() {
     const [isActivatingLicense, setIsActivatingLicense] = useState(false);
     const [isDeletingLicense, setIsDeletingLicense] = useState(false);
     const [isRecheckingLicense, setIsRecheckingLicense] = useState(false);
-    // const { supporterStatus } = useSupporterStatusContext();
+    const { supporterStatus } = useSupporterStatusContext();
 
     const t = useTranslations();
 
@@ -354,7 +347,9 @@ export default function LicensePage() {
                     storageKey="license-banner-dismissed"
                     version={1}
                     title={t("licenseBannerTitle")}
-                    titleIcon={<TicketCheck className="w-5 h-5 text-primary" />}
+                    titleIcon={
+                        <TicketCheck className="w-5 h-5 text-primary" />
+                    }
                     description={t("licenseBannerDescription")}
                 >
                     <Link

src/app/layout.tsx

@@ -68,15 +68,15 @@ export default async function RootLayout({
     const env = pullEnv();
     const locale = await getLocale();
 
-    // const supporterData = {
-    //     visible: true
-    // } as any;
+    const supporterData = {
+        visible: true
+    } as any;
 
-    // const res = await priv.get<AxiosResponse<IsSupporterKeyVisibleResponse>>(
-    //     "supporter-key/visible"
-    // );
-    // supporterData.visible = res.data.data.visible;
-    // supporterData.tier = res.data.data.tier;
+    const res = await priv.get<AxiosResponse<IsSupporterKeyVisibleResponse>>(
+        "supporter-key/visible"
+    );
+    supporterData.visible = res.data.data.visible;
+    supporterData.tier = res.data.data.tier;
 
     let licenseStatus: GetLicenseStatusResponse;
     if (build === "enterprise") {
@@ -127,20 +127,20 @@ export default async function RootLayout({
                                     <LicenseStatusProvider
                                         licenseStatus={licenseStatus}
                                     >
-                                        {/* <SupportStatusProvider
+                                        <SupportStatusProvider
                                             supporterStatus={supporterData}
-                                        > */}
-                                        {/* Main content */}
-                                        <div className="h-full flex flex-col">
-                                            <div className="flex-1 overflow-auto">
-                                                <SplashImage>
+                                        >
+                                            {/* Main content */}
+                                            <div className="h-full flex flex-col">
+                                                <div className="flex-1 overflow-auto">
+                                                    <SplashImage>
+                                                        <LicenseViolation />
+                                                        {children}
+                                                    </SplashImage>
                                                     <LicenseViolation />
-                                                    {children}
-                                                </SplashImage>
-                                                <LicenseViolation />
+                                                </div>
                                             </div>
-                                        </div>
-                                        {/* </SupportStatusProvider> */}
+                                        </SupportStatusProvider>
                                     </LicenseStatusProvider>
                                     <Toaster />
                                 </TanstackQueryProvider>

src/app/maintenance-screen/page.tsx

@@ -28,7 +28,7 @@ export default async function MaintenanceScreen() {
 
     try {
         const headersList = await headers();
-        const host = headersList.get("p-host") || headersList.get("host") || "";
+        const host = headersList.get("host") || "";
         const hostname = host.split(":")[0];
 
         const res = await priv.get<AxiosResponse<GetMaintenanceInfoResponse>>(

src/components/AuthPageFooterNotices.tsx

@@ -1,24 +1,24 @@
 "use client";
 
-// import { useSupporterStatusContext } from "@app/hooks/useSupporterStatusContext";
+import { useSupporterStatusContext } from "@app/hooks/useSupporterStatusContext";
 import { useLicenseStatusContext } from "@app/hooks/useLicenseStatusContext";
 import { useTranslations } from "next-intl";
 import { build } from "@server/build";
 
 export default function AuthPageFooterNotices() {
     const t = useTranslations();
-    // const { supporterStatus } = useSupporterStatusContext();
+    const { supporterStatus } = useSupporterStatusContext();
     const { isUnlocked, licenseStatus } = useLicenseStatusContext();
 
     return (
         <>
-            {/* {supporterStatus?.visible && (
+            {supporterStatus?.visible && (
                 <div className="text-center mt-2">
                     <span className="text-sm text-muted-foreground opacity-50">
                         {t("noSupportKey")}
                     </span>
                 </div>
-            )} */}
+            )}
             {build === "enterprise" && !isUnlocked() ? (
                 <div className="text-center mt-2">
                     <span className="text-sm font-medium text-muted-foreground">

src/components/SupporterMessage.tsx

@@ -9,34 +9,33 @@ export default function SupporterMessage({ tier }: { tier: string }) {
     const t = useTranslations();
 
     return (
-        <></>
-        // <div className="relative flex items-center space-x-2 whitespace-nowrap group">
-        //     <span
-        //         className="cursor-pointer"
-        //         onClick={(e) => {
-        //             // Get the bounding box of the element
-        //             const rect = (
-        //                 e.target as HTMLElement
-        //             ).getBoundingClientRect();
+        <div className="relative flex items-center space-x-2 whitespace-nowrap group">
+            <span
+                className="cursor-pointer"
+                onClick={(e) => {
+                    // Get the bounding box of the element
+                    const rect = (
+                        e.target as HTMLElement
+                    ).getBoundingClientRect();
 
-        //             // Trigger confetti centered on the word "Pangolin"
-        //             confetti({
-        //                 particleCount: 100,
-        //                 spread: 70,
-        //                 origin: {
-        //                     x: (rect.left + rect.width / 2) / window.innerWidth,
-        //                     y: rect.top / window.innerHeight
-        //                 },
-        //                 colors: ["#FFA500", "#FF4500", "#FFD700"]
-        //             });
-        //         }}
-        //     >
-        //         Pangolin
-        //     </span>
-        //     <Star className="w-3 h-3" />
-        //     <div className="absolute left-1/2 transform -translate-x-1/2 -top-10 hidden group-hover:block  text-primary text-sm rounded-md border shadow-md px-4 py-2 pointer-events-none opacity-0 group-hover:opacity-100 transition-opacity">
-        //         {t("componentsSupporterMessage", { tier: tier })}
-        //     </div>
-        // </div>
+                    // Trigger confetti centered on the word "Pangolin"
+                    confetti({
+                        particleCount: 100,
+                        spread: 70,
+                        origin: {
+                            x: (rect.left + rect.width / 2) / window.innerWidth,
+                            y: rect.top / window.innerHeight
+                        },
+                        colors: ["#FFA500", "#FF4500", "#FFD700"]
+                    });
+                }}
+            >
+                Pangolin
+            </span>
+            <Star className="w-3 h-3" />
+            <div className="absolute left-1/2 transform -translate-x-1/2 -top-10 hidden group-hover:block  text-primary text-sm rounded-md border shadow-md px-4 py-2 pointer-events-none opacity-0 group-hover:opacity-100 transition-opacity">
+                {t("componentsSupporterMessage", { tier: tier })}
+            </div>
+        </div>
     );
 }

src/components/SupporterStatus.tsx

@@ -3,7 +3,7 @@
 // THIS IS DEPRECATED AND IS NO LONGER SHOWED TO THE USER WITH THE DISCONTINUATION
 // OF THE SUPPORTER PROGRAM. IT MAY BE REMOVED IN A FUTURE UPDATE.
 
-// import { useSupporterStatusContext } from "@app/hooks/useSupporterStatusContext";
+import { useSupporterStatusContext } from "@app/hooks/useSupporterStatusContext";
 import { useState, useTransition } from "react";
 import {
     Tooltip,
@@ -58,134 +58,134 @@ interface SupporterStatusProps {
 export default function SupporterStatus({
     isCollapsed = false
 }: SupporterStatusProps) {
-    // const { supporterStatus, updateSupporterStatus } =
-    //     useSupporterStatusContext();
-    // const [supportOpen, setSupportOpen] = useState(false);
-    // const [keyOpen, setKeyOpen] = useState(false);
-    // const [purchaseOptionsOpen, setPurchaseOptionsOpen] = useState(false);
+    const { supporterStatus, updateSupporterStatus } =
+        useSupporterStatusContext();
+    const [supportOpen, setSupportOpen] = useState(false);
+    const [keyOpen, setKeyOpen] = useState(false);
+    const [purchaseOptionsOpen, setPurchaseOptionsOpen] = useState(false);
 
-    // const { env } = useEnvContext();
-    // const api = createApiClient({ env });
-    // const t = useTranslations();
+    const { env } = useEnvContext();
+    const api = createApiClient({ env });
+    const t = useTranslations();
 
-    // const formSchema = z.object({
-    //     githubUsername: z.string().nonempty({
-    //         error: "GitHub username is required"
-    //     }),
-    //     key: z.string().nonempty({
-    //         error: "Supporter key is required"
-    //     })
-    // });
+    const formSchema = z.object({
+        githubUsername: z.string().nonempty({
+            error: "GitHub username is required"
+        }),
+        key: z.string().nonempty({
+            error: "Supporter key is required"
+        })
+    });
 
-    // const form = useForm({
-    //     resolver: zodResolver(formSchema),
-    //     defaultValues: {
-    //         githubUsername: "",
-    //         key: ""
-    //     }
-    // });
+    const form = useForm({
+        resolver: zodResolver(formSchema),
+        defaultValues: {
+            githubUsername: "",
+            key: ""
+        }
+    });
 
-    // async function hide() {
-    //     await api.post("/supporter-key/hide");
+    async function hide() {
+        await api.post("/supporter-key/hide");
 
-    //     updateSupporterStatus({
-    //         visible: false
-    //     });
-    // }
+        updateSupporterStatus({
+            visible: false
+        });
+    }
 
-    // async function onSubmit(values: z.infer<typeof formSchema>) {
-    //     try {
-    //         const res = await api.post<
-    //             AxiosResponse<ValidateSupporterKeyResponse>
-    //         >("/supporter-key/validate", {
-    //             githubUsername: values.githubUsername,
-    //             key: values.key
-    //         });
+    async function onSubmit(values: z.infer<typeof formSchema>) {
+        try {
+            const res = await api.post<
+                AxiosResponse<ValidateSupporterKeyResponse>
+            >("/supporter-key/validate", {
+                githubUsername: values.githubUsername,
+                key: values.key
+            });
 
-    //         const data = res.data.data;
+            const data = res.data.data;
 
-    //         if (!data || !data.valid) {
-    //             toast({
-    //                 variant: "destructive",
-    //                 title: t("supportKeyInvalid"),
-    //                 description: t("supportKeyInvalidDescription")
-    //             });
-    //             return;
-    //         }
+            if (!data || !data.valid) {
+                toast({
+                    variant: "destructive",
+                    title: t("supportKeyInvalid"),
+                    description: t("supportKeyInvalidDescription")
+                });
+                return;
+            }
 
-    //         // Trigger the toast
-    //         toast({
-    //             variant: "default",
-    //             title: t("supportKeyValid"),
-    //             description: t("supportKeyValidDescription")
-    //         });
+            // Trigger the toast
+            toast({
+                variant: "default",
+                title: t("supportKeyValid"),
+                description: t("supportKeyValidDescription")
+            });
 
-    //         // Fireworks-style confetti
-    //         const duration = 5 * 1000; // 5 seconds
-    //         const animationEnd = Date.now() + duration;
-    //         const defaults = {
-    //             startVelocity: 30,
-    //             spread: 360,
-    //             ticks: 60,
-    //             zIndex: 0,
-    //             colors: ["#FFA500", "#FF4500", "#FFD700"] // Orange hues
-    //         };
+            // Fireworks-style confetti
+            const duration = 5 * 1000; // 5 seconds
+            const animationEnd = Date.now() + duration;
+            const defaults = {
+                startVelocity: 30,
+                spread: 360,
+                ticks: 60,
+                zIndex: 0,
+                colors: ["#FFA500", "#FF4500", "#FFD700"] // Orange hues
+            };
 
-    //         function randomInRange(min: number, max: number) {
-    //             return Math.random() * (max - min) + min;
-    //         }
+            function randomInRange(min: number, max: number) {
+                return Math.random() * (max - min) + min;
+            }
 
-    //         const interval = setInterval(() => {
-    //             const timeLeft = animationEnd - Date.now();
+            const interval = setInterval(() => {
+                const timeLeft = animationEnd - Date.now();
 
-    //             if (timeLeft <= 0) {
-    //                 clearInterval(interval);
-    //                 return;
-    //             }
+                if (timeLeft <= 0) {
+                    clearInterval(interval);
+                    return;
+                }
 
-    //             const particleCount = 50 * (timeLeft / duration);
+                const particleCount = 50 * (timeLeft / duration);
 
-    //             // Launch confetti from two random horizontal positions
-    //             confetti({
-    //                 ...defaults,
-    //                 particleCount,
-    //                 origin: {
-    //                     x: randomInRange(0.1, 0.3),
-    //                     y: Math.random() - 0.2
-    //                 }
-    //             });
-    //             confetti({
-    //                 ...defaults,
-    //                 particleCount,
-    //                 origin: {
-    //                     x: randomInRange(0.7, 0.9),
-    //                     y: Math.random() - 0.2
-    //                 }
-    //             });
-    //         }, 250);
+                // Launch confetti from two random horizontal positions
+                confetti({
+                    ...defaults,
+                    particleCount,
+                    origin: {
+                        x: randomInRange(0.1, 0.3),
+                        y: Math.random() - 0.2
+                    }
+                });
+                confetti({
+                    ...defaults,
+                    particleCount,
+                    origin: {
+                        x: randomInRange(0.7, 0.9),
+                        y: Math.random() - 0.2
+                    }
+                });
+            }, 250);
 
-    //         setPurchaseOptionsOpen(false);
-    //         setKeyOpen(false);
+            setPurchaseOptionsOpen(false);
+            setKeyOpen(false);
 
-    //         updateSupporterStatus({
-    //             visible: false
-    //         });
-    //     } catch (error) {
-    //         toast({
-    //             variant: "destructive",
-    //             title: t("error"),
-    //             description: formatAxiosError(
-    //                 error,
-    //                 t("supportKeyErrorValidationDescription")
-    //             )
-    //         });
-    //         return;
-    //     }
-    // }
+            updateSupporterStatus({
+                visible: false
+            });
+        } catch (error) {
+            toast({
+                variant: "destructive",
+                title: t("error"),
+                description: formatAxiosError(
+                    error,
+                    t("supportKeyErrorValidationDescription")
+                )
+            });
+            return;
+        }
+    }
 
     return (
         <>
-            {/* <Credenza
+            <Credenza
                 open={purchaseOptionsOpen}
                 onOpenChange={(val) => {
                     setPurchaseOptionsOpen(val);
@@ -469,7 +469,7 @@ export default function SupporterStatus({
                         {t("supportKeyBuy")}
                     </Button>
                 )
-            ) : null} */}
+            ) : null}
         </>
     );
 }

src/components/newt-install-commands.tsx

@@ -139,6 +139,7 @@ Restart=always
 RestartSec=2
 UMask=0077
 
+NoNewPrivileges=true
 PrivateTmp=true
 
 [Install]

src/lib/getBrowserTargetForRequest.ts

@@ -6,7 +6,7 @@ import { cache } from "react";
 
 export const getBrowserTargetForRequest = cache(async () => {
     const headersList = await headers();
-    const host = headersList.get("p-host") || headersList.get("host") || "";
+    const host = headersList.get("host") || "";
     const hostname = host.split(":")[0];
 
     try {