Merge branch 'main' of https://github.com/pterodactyl-rs/panel

Author: 0x7d8

frontend/src/elements/Sidebar.tsx

@@ -26,6 +26,7 @@ import CloseButton from '@/elements/CloseButton.tsx';
 import MantineDivider from '@/elements/Divider.tsx';
 import Drawer from '@/elements/Drawer.tsx';
 import { isAdmin } from '@/lib/permissions.ts';
+import { openUrl } from '@/lib/url.ts';
 import { useAuth } from '@/providers/AuthProvider.tsx';
 import { useTranslations } from '@/providers/TranslationProvider.tsx';
 import { useWindows } from '@/providers/WindowProvider.tsx';
@@ -138,7 +139,7 @@ function Link({ to, end, icon, name, title = name, className, activeMatches }: L
           type: 'action',
           icon: faWindowRestore,
           label: t('elements.sidebar.button.openInNewTab', {}),
-          onClick: () => window.open(to, '_blank'),
+          onClick: () => openUrl(to),
           color: 'gray',
         },
       ]}

frontend/src/lib/url.ts

@@ -1,3 +1,13 @@
+export const openUrl = (url: string, target = '_blank') => {
+  const anchor = document.createElement('a');
+  anchor.href = url;
+  anchor.target = target;
+  anchor.rel = 'noopener noreferrer';
+  document.body.appendChild(anchor);
+  anchor.click();
+  document.body.removeChild(anchor);
+};
+
 export const urlIsMissingPort = (url: string) => {
   try {
     const parsed = new URL(url);

frontend/src/pages/admin/backupConfigurations/backups/AdminBackupConfigurationBackupRow.tsx

@@ -16,6 +16,7 @@ import { streamingArchiveFormatLabelMapping } from '@/lib/enums.ts';
 import { adminNodeServerBackupSchema } from '@/lib/schemas/admin/nodes.ts';
 import { streamingArchiveFormat } from '@/lib/schemas/generic.ts';
 import { bytesToString } from '@/lib/size.ts';
+import { openUrl } from '@/lib/url.ts';
 import { useAdminCan } from '@/plugins/usePermissions.ts';
 import { useToast } from '@/providers/ToastProvider.tsx';
 import { useTranslations } from '@/providers/TranslationProvider.tsx';
@@ -37,7 +38,7 @@ export default function AdminBackupConfigurationBackupRow({
     downloadNodeBackup(backup.node.uuid, backup.uuid, archiveFormat)
       .then(({ url }) => {
         addToast(t('pages.admin.backupConfigurations.tabs.backups.page.toast.downloadStarted', {}), 'success');
-        window.open(url, '_blank');
+        openUrl(url);
       })
       .catch((msg) => {
         addToast(httpErrorToHuman(msg), 'error');

frontend/src/pages/admin/nodes/backups/NodeBackupRow.tsx

@@ -30,6 +30,7 @@ import { adminNodeSchema } from '@/lib/schemas/admin/nodes.ts';
 import { adminServerBackupSchema } from '@/lib/schemas/admin/servers.ts';
 import { streamingArchiveFormat } from '@/lib/schemas/generic.ts';
 import { bytesToString } from '@/lib/size.ts';
+import { openUrl } from '@/lib/url.ts';
 import { useAdminCan } from '@/plugins/usePermissions.ts';
 import { useToast } from '@/providers/ToastProvider.tsx';
 import { useTranslations } from '@/providers/TranslationProvider.tsx';
@@ -58,7 +59,7 @@ export default function NodeBackupRow({
     downloadNodeBackup(node.uuid, backup.uuid, archiveFormat)
       .then(({ url }) => {
         addToast(t('pages.admin.nodes.tabs.backups.page.toast.downloadStarted', {}), 'success');
-        window.open(url, '_blank');
+        openUrl(url);
       })
       .catch((msg) => {
         addToast(httpErrorToHuman(msg), 'error');

frontend/src/pages/admin/servers/backups/AdminServerBackupRow.tsx

@@ -27,6 +27,7 @@ import { adminNodeServerBackupSchema } from '@/lib/schemas/admin/nodes.ts';
 import { adminServerSchema } from '@/lib/schemas/admin/servers.ts';
 import { streamingArchiveFormat } from '@/lib/schemas/generic.ts';
 import { bytesToString } from '@/lib/size.ts';
+import { openUrl } from '@/lib/url.ts';
 import { useAdminCan } from '@/plugins/usePermissions.ts';
 import { useToast } from '@/providers/ToastProvider.tsx';
 import { useTranslations } from '@/providers/TranslationProvider.tsx';
@@ -52,7 +53,7 @@ export default function AdminServerBackupRow({
     downloadNodeBackup(backup.node.uuid, backup.uuid, archiveFormat)
       .then(({ url }) => {
         addToast(t('pages.admin.nodes.tabs.backups.page.toast.downloadStarted', {}), 'success');
-        window.open(url, '_blank');
+        openUrl(url);
       })
       .catch((msg) => {
         addToast(httpErrorToHuman(msg), 'error');

frontend/src/pages/server/backups/BackupRow.tsx

@@ -33,6 +33,7 @@ import { queryKeys } from '@/lib/queryKeys.ts';
 import { streamingArchiveFormat } from '@/lib/schemas/generic.ts';
 import { serverBackupSchema } from '@/lib/schemas/server/backups.ts';
 import { bytesProgressString, bytesToString } from '@/lib/size.ts';
+import { openUrl } from '@/lib/url.ts';
 import { useServerCan } from '@/plugins/usePermissions.ts';
 import { SocketEvent } from '@/plugins/useWebsocketEvent.ts';
 import { useToast } from '@/providers/ToastProvider.tsx';
@@ -61,7 +62,7 @@ export default function BackupRow({ backup }: { backup: z.infer<typeof serverBac
     downloadBackup(server.uuid, backup.uuid, archiveFormat)
       .then(({ url }) => {
         addToast(t('pages.server.backups.toast.downloadStarted', {}), 'success');
-        window.open(url, '_blank');
+        openUrl(url);
       })
       .catch((msg) => {
         addToast(httpErrorToHuman(msg), 'error');

frontend/src/pages/server/files/FileActionBar.tsx

@@ -21,6 +21,7 @@ import ActionBar from '@/elements/ActionBar.tsx';
 import Button from '@/elements/Button.tsx';
 import { ServerCan } from '@/elements/Can.tsx';
 import Tooltip from '@/elements/Tooltip.tsx';
+import { openUrl } from '@/lib/url.ts';
 import FileCopyConflictModal, {
   ConflictResolutions,
   FileConflict,
@@ -167,7 +168,7 @@ function FileActionBar() {
     )
       .then(({ url }) => {
         addToast(t('pages.server.files.toast.downloadStarted', {}), 'success');
-        window.open(url);
+        openUrl(url);
       })
       .catch((msg) => {
         addToast(httpErrorToHuman(msg), 'error');

frontend/src/pages/server/files/FileConnectButton.tsx

@@ -4,6 +4,7 @@ import { useState } from 'react';
 import Button from '@/elements/Button.tsx';
 import { ServerCan } from '@/elements/Can.tsx';
 import ContextMenu from '@/elements/ContextMenu.tsx';
+import { openUrl } from '@/lib/url.ts';
 import { useAuth } from '@/providers/AuthProvider.tsx';
 import { useFileManager } from '@/providers/FileManagerProvider.tsx';
 import { useTranslations } from '@/providers/TranslationProvider.tsx';
@@ -38,7 +39,7 @@ export default function FileConnectButton({ file }: { file?: string }) {
               label: t('pages.server.files.button.connectSftp', {}),
               onClick: (e) => {
                 if (e.shiftKey) {
-                  window.open(sftpUrl);
+                  openUrl(sftpUrl);
                 } else {
                   setSftpDetailsOpen(true);
                 }
@@ -49,7 +50,7 @@ export default function FileConnectButton({ file }: { file?: string }) {
               type: 'action',
               icon: faCode,
               label: t('pages.server.files.button.connectVscode', {}),
-              onClick: () => window.open(vscodeUrl),
+              onClick: () => openUrl(vscodeUrl),
               color: 'gray',
             },
           ]}

frontend/src/pages/server/files/FileMassContextMenu.tsx

@@ -14,6 +14,7 @@ import downloadFiles from '@/api/server/files/downloadFiles.ts';
 import ContextMenu, { ContextMenuItem } from '@/elements/ContextMenu.tsx';
 import { streamingArchiveFormatLabelMapping } from '@/lib/enums.ts';
 import { streamingArchiveFormat } from '@/lib/schemas/generic.ts';
+import { openUrl } from '@/lib/url.ts';
 import { useServerCan } from '@/plugins/usePermissions.ts';
 import { useToast } from '@/providers/ToastProvider.tsx';
 import { useTranslations } from '@/providers/TranslationProvider.tsx';
@@ -51,7 +52,7 @@ export default function FileMassContextMenu({ children }: FileMassContextMenuPro
     )
       .then(({ url }) => {
         addToast(t('pages.server.files.toast.downloadStarted', {}), 'success');
-        window.open(url);
+        openUrl(url);
       })
       .catch((msg) => {
         addToast(httpErrorToHuman(msg), 'error');

frontend/src/pages/server/files/FileRowContextMenu.tsx

@@ -24,6 +24,7 @@ import { streamingArchiveFormatLabelMapping } from '@/lib/enums.ts';
 import { isArchiveType } from '@/lib/files.ts';
 import { streamingArchiveFormat } from '@/lib/schemas/generic.ts';
 import { serverDirectoryEntrySchema } from '@/lib/schemas/server/files.ts';
+import { openUrl } from '@/lib/url.ts';
 import { useServerCan } from '@/plugins/usePermissions.ts';
 import { useToast } from '@/providers/contexts/toastContext.ts';
 import { useWindows } from '@/providers/contexts/windowContext.ts';
@@ -57,7 +58,7 @@ export default function FileRowContextMenu({ file, openMode, children }: FileRow
     downloadFiles(server.uuid, store.getState().browsingDirectory, [file.name], file.directory, archiveFormat)
       .then(({ url }) => {
         addToast(t('pages.server.files.toast.downloadStarted', {}), 'success');
-        window.open(url);
+        openUrl(url);
       })
       .catch((msg) => {
         addToast(httpErrorToHuman(msg), 'error');