dennii/Termix
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 22 Wiki Activity

fix: Electron HTTP fix + stripped background fix

Browse Source
This commit is contained in:
LukeGus
2025-11-01 21:59:49 -05:00
parent 994d00e91f
commit a52a5217bf
11 changed files with 128 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
electron/main.cjs
View File

@@ -64,6 +64,8 @@ function createWindow() {
contextIsolation: true,
webSecurity: true,
preload: path.join(__dirname, "preload.js"),
partition: "persist:termix",
allowRunningInsecureContent: false,
},
show: false,
});
@@ -123,6 +125,20 @@ function createWindow() {
delete headers["Content-Security-Policy"];
}
}
if (headers["set-cookie"]) {
headers["set-cookie"] = headers["set-cookie"].map((cookie) => {
let modified = cookie.replace(/;\s*SameSite=Strict/gi, "; SameSite=None");
modified = modified.replace(/;\s*SameSite=Lax/gi, "; SameSite=None");
if (!modified.includes("SameSite=")) {
modified += "; SameSite=None";
}
if (!modified.includes("Secure") && details.url.startsWith("https")) {
modified += "; Secure";
}
return modified;
});
}
}
callback({ responseHeaders: headers });

6
src/backend/dashboard.ts
View File

@@ -37,7 +37,11 @@ app.use(
return callback(null, true);
}
callback(null, true);
if (origin.startsWith("http://")) {
return callback(null, true);
}
callback(new Error("Not allowed by CORS"));
},
credentials: true,
methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],

4
src/backend/database/database.ts
View File

@@ -68,6 +68,10 @@ app.use(
return callback(null, true);
}
if (origin.startsWith("http://")) {
return callback(null, true);
}
callback(new Error("Not allowed by CORS"));
},
credentials: true,

6
src/backend/ssh/file-manager.ts
View File

@@ -65,7 +65,11 @@ app.use(
return callback(null, true);
}
callback(null, true);
if (origin.startsWith("http://")) {
return callback(null, true);
}
callback(new Error("Not allowed by CORS"));
},
credentials: true,
methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],

6
src/backend/ssh/server-stats.ts
View File

@@ -603,7 +603,11 @@ app.use(
return callback(null, true);
}
callback(null, true);
if (origin.startsWith("http://")) {
return callback(null, true);
}
callback(new Error("Not allowed by CORS"));
},
credentials: true,
methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],

6
src/backend/ssh/tunnel.ts
View File

@@ -41,7 +41,11 @@ app.use(
return callback(null, true);
}
callback(null, true);
if (origin.startsWith("http://")) {
return callback(null, true);
}
callback(new Error("Not allowed by CORS"));
},
credentials: true,
methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],

36
src/main.tsx
View File

@@ -76,25 +76,23 @@ function RootApp() {
return (
<>
{isElectron() && (
<div
className="fixed inset-0 pointer-events-none"
style={{
backgroundColor: "#09090b",
backgroundImage: `linear-gradient(
135deg,
transparent 0%,
transparent 49%,
rgba(255, 255, 255, 0.03) 49%,
rgba(255, 255, 255, 0.03) 51%,
transparent 51%,
transparent 100%
)`,
backgroundSize: "80px 80px",
zIndex: 0,
}}
/>
)}
<div
className="fixed inset-0 pointer-events-none"
style={{
backgroundColor: "#09090b",
backgroundImage: `linear-gradient(
135deg,
transparent 0%,
transparent 49%,
rgba(255, 255, 255, 0.03) 49%,
rgba(255, 255, 255, 0.03) 51%,
transparent 51%,
transparent 100%
)`,
backgroundSize: "80px 80px",
zIndex: 0,
}}
/>
<div className="relative min-h-screen" style={{ zIndex: 1 }}>
{isElectron() && showVersionCheck ? (
<ElectronVersionCheck

16
src/ui/desktop/authentication/Auth.tsx
View File

@@ -646,7 +646,21 @@ export function Auth({
);
}
if (isElectron() && currentServerUrl && !loggedIn && !authLoading) {
if (isElectron() && currentServerUrl && authLoading) {
return (
<div
className={`w-[420px] max-w-full p-6 flex flex-col bg-dark-bg border-2 border-dark-border rounded-md overflow-y-auto my-2 ${className || ""}`}
style={{ maxHeight: "calc(100vh - 1rem)" }}
{...props}
>
<div className="flex items-center justify-center h-32">
<div className="w-6 h-6 border-2 border-primary border-t-transparent rounded-full animate-spin" />
</div>
</div>
);
}
if (isElectron() && currentServerUrl && !loggedIn) {
return (
<div
className="w-full h-screen flex items-center justify-center p-4"

33
src/ui/desktop/authentication/ElectronLoginForm.tsx
View File

@@ -129,6 +129,36 @@ export function ElectronLoginForm({
}
}
function clearAuthData() {
try {
localStorage.removeItem('jwt');
sessionStorage.removeItem('jwt');
const cookies = document.cookie.split(';');
for (let i = 0; i < cookies.length; i++) {
const cookie = cookies[i];
const eqPos = cookie.indexOf('=');
const name = eqPos > -1 ? cookie.substr(0, eqPos).trim() : cookie.trim();
if (name === 'jwt') {
document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/';
document.cookie = name + '=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/;domain=' + window.location.hostname;
}
}
} catch (error) {
}
}
window.addEventListener('message', function(event) {
try {
if (event.data && typeof event.data === 'object') {
if (event.data.type === 'CLEAR_AUTH_DATA') {
clearAuthData();
}
}
} catch (error) {
}
});
function checkAuth() {
try {
const localToken = localStorage.getItem('jwt');
@@ -312,7 +342,8 @@ export function ElectronLoginForm({
className="w-full h-full border-0"
title="Server Authentication"
sandbox="allow-same-origin allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox allow-storage-access-by-user-activation allow-top-navigation allow-top-navigation-by-user-activation allow-modals allow-downloads"
allow="clipboard-read; clipboard-write; cross-origin-isolated; camera; microphone; geolocation"
allow="clipboard-read; clipboard-write; cross-origin-isolated; camera; microphone; geolocation; storage-access"
credentialless={false}
/>
</div>
</div>

2
src/ui/desktop/navigation/LeftSidebar.tsx
View File

@@ -395,7 +395,7 @@ export function LeftSidebar({
>
<span>{t("profile.title")}</span>
</DropdownMenuItem>
{isAdmin && !isElectron() && (
{isAdmin && (
<DropdownMenuItem
className="rounded px-2 py-1.5 hover:bg-white/15 hover:text-accent-foreground focus:bg-white/20 focus:text-accent-foreground cursor-pointer focus:outline-none"
onClick={() => {

23
src/ui/desktop/user/UserProfile.tsx
View File

@@ -34,6 +34,29 @@ async function handleLogout() {
if (isElectron()) {
localStorage.removeItem("jwt");
const configuredServerUrl = (
window as Window &
typeof globalThis & {
configuredServerUrl?: string;
}
).configuredServerUrl;
if (configuredServerUrl) {
const iframe = document.querySelector("iframe");
if (iframe && iframe.contentWindow) {
try {
const serverOrigin = new URL(configuredServerUrl).origin;
iframe.contentWindow.postMessage(
{
type: "CLEAR_AUTH_DATA",
timestamp: Date.now(),
},
serverOrigin,
);
} catch (err) {}
}
}
}
window.location.reload();