Merge pull request #3277 from fosrl/dev

Fix middleware and suppoter footer

src/app/[orgId]/settings/resources/public/[niceId]/rdp/page.tsx

@@ -40,7 +40,6 @@ type TargetRow = {
     targetId: number;
     resourceId: number;
     siteId: number;
-    siteType: string | null;
     siteName?: string;
     mode: string | null;
     ip: string;
@@ -106,8 +105,7 @@ function RdpServerForm({
     const api = createApiClient(useEnvContext());
     const router = useRouter();
     const targets = targetsResponse.targets.filter((t) => t.mode === "rdp");
-    const browserGatewayTargets = targets.filter((t) => t.siteType === "newt");
-    const firstTarget = browserGatewayTargets[0];
+    const firstTarget = targets[0];
 
     const formSchema = useMemo(
         () => createBrowserGatewayTargetFormSchema(t),
@@ -117,7 +115,7 @@ function RdpServerForm({
     const form = useForm<BrowserGatewayTargetFormValues>({
         resolver: zodResolver(formSchema),
         defaultValues: {
-            selectedSites: browserGatewayTargets.map((target) => ({
+            selectedSites: targets.map((target) => ({
                 siteId: target.siteId,
                 name: target.siteName ?? String(target.siteId),
                 type: "newt" as const

src/app/[orgId]/settings/resources/public/[niceId]/ssh/page.tsx

@@ -62,7 +62,6 @@ type TargetRow = {
     targetId: number;
     resourceId: number;
     siteId: number;
-    siteType: string | null;
     siteName?: string;
     mode: string | null;
     ip: string;
@@ -131,9 +130,7 @@ function SshServerForm({
 
     const isNativeInitially = resource.authDaemonMode === "native";
     const targets = targetsResponse.targets.filter((t) => t.mode === "ssh");
-    const browserGatewayTargets = targets.filter((t) => t.siteType === "newt");
     const firstTarget = targets[0];
-    const firstBrowserGatewayTarget = browserGatewayTargets[0];
     const initialPamMode =
         (resource.pamMode as "passthrough" | "push") || "passthrough";
     const initialStandardDaemonLocation = isNativeInitially
@@ -166,18 +163,18 @@ function SshServerForm({
             selectedSites:
                 isNativeInitially || useSingleSiteOnLoad
                     ? []
-                    : browserGatewayTargets.map((target) => ({
+                    : targets.map((target) => ({
                           siteId: target.siteId,
                           name: target.siteName ?? String(target.siteId),
                           type: "newt" as const
                       })),
             selectedSite:
-                useSingleSiteOnLoad && firstBrowserGatewayTarget
+                useSingleSiteOnLoad && firstTarget
                     ? {
-                          siteId: firstBrowserGatewayTarget.siteId,
+                          siteId: firstTarget.siteId,
                           name:
-                              firstBrowserGatewayTarget.siteName ??
-                              String(firstBrowserGatewayTarget.siteId),
+                              firstTarget.siteName ??
+                              String(firstTarget.siteId),
                           type: "newt" as const
                       }
                     : null,
@@ -193,11 +190,11 @@ function SshServerForm({
                     : null,
             destination: isNativeInitially
                 ? ""
-                : (firstBrowserGatewayTarget?.ip ?? ""),
+                                : (firstTarget?.ip ?? ""),
             destinationPort: isNativeInitially
                 ? "22"
-                : firstBrowserGatewayTarget
-                  ? String(firstBrowserGatewayTarget.port)
+                : firstTarget
+                                    ? String(firstTarget.port)
                   : "22"
         }
     });

src/app/[orgId]/settings/resources/public/[niceId]/vnc/page.tsx

@@ -40,7 +40,6 @@ type TargetRow = {
     targetId: number;
     resourceId: number;
     siteId: number;
-    siteType: string | null;
     siteName?: string;
     mode: string | null;
     ip: string;
@@ -106,8 +105,7 @@ function VncServerForm({
     const api = createApiClient(useEnvContext());
     const router = useRouter();
     const targets = targetsResponse.targets.filter((t) => t.mode === "vnc");
-    const browserGatewayTargets = targets.filter((t) => t.siteType === "newt");
-    const firstTarget = browserGatewayTargets[0];
+    const firstTarget = targets[0];
 
     const formSchema = useMemo(
         () => createBrowserGatewayTargetFormSchema(t),
@@ -117,7 +115,7 @@ function VncServerForm({
     const form = useForm<BrowserGatewayTargetFormValues>({
         resolver: zodResolver(formSchema),
         defaultValues: {
-            selectedSites: browserGatewayTargets.map((target) => ({
+            selectedSites: targets.map((target) => ({
                 siteId: target.siteId,
                 name: target.siteName ?? String(target.siteId),
                 type: "newt" as const

src/components/newt-install-commands.tsx

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