diff --git a/apps/matrix/apps/web/src/hooks.server.ts b/apps/matrix/apps/web/src/hooks.server.ts new file mode 100644 index 000000000..7351c9016 --- /dev/null +++ b/apps/matrix/apps/web/src/hooks.server.ts @@ -0,0 +1,15 @@ +import type { Handle } from '@sveltejs/kit'; + +export const handle: Handle = async ({ event, resolve }) => { + const response = await resolve(event); + + response.headers.set('X-Frame-Options', 'SAMEORIGIN'); + response.headers.set('X-Content-Type-Options', 'nosniff'); + response.headers.set('Referrer-Policy', 'strict-origin-when-cross-origin'); + response.headers.set('Permissions-Policy', 'camera=(self), microphone=(self), geolocation=()'); + // COEP/COOP required for WASM (matrix-sdk-crypto) + response.headers.set('Cross-Origin-Opener-Policy', 'same-origin'); + response.headers.set('Cross-Origin-Embedder-Policy', 'require-corp'); + + return response; +}; diff --git a/apps/matrix/apps/web/src/lib/matrix/store.svelte.ts b/apps/matrix/apps/web/src/lib/matrix/store.svelte.ts index 419850953..85c3944c9 100644 --- a/apps/matrix/apps/web/src/lib/matrix/store.svelte.ts +++ b/apps/matrix/apps/web/src/lib/matrix/store.svelte.ts @@ -223,12 +223,10 @@ class MatrixStore { try { await this._client.initRustCrypto(); this._cryptoReady = true; - console.log('Rust crypto initialized successfully'); // Setup crypto event handlers this.setupCryptoEventHandlers(sdk); - } catch (cryptoErr) { - console.warn('Crypto initialization failed, continuing without E2EE:', cryptoErr); + } catch { this._cryptoReady = false; } @@ -261,10 +259,6 @@ class MatrixStore { if (state === 'PREPARED') { this._rooms = this._client!.getRooms(); - console.log(`Matrix sync prepared, ${this._rooms.length} rooms loaded`); - - // Note: Last room restore is now handled in the /chat page component - // to support different behavior on mobile vs desktop } if (state === 'ERROR') { @@ -327,7 +321,6 @@ class MatrixStore { // Room membership changes (invites, joins, leaves) this._client.on(sdk.RoomEvent.MyMembership, (room, membership, prevMembership) => { - console.log(`Membership changed: ${room.roomId} - ${prevMembership} -> ${membership}`); this._rooms = this._client!.getRooms(); }); @@ -371,7 +364,6 @@ class MatrixStore { // CallEvent is exported from matrix-js-sdk, but CallState needs dynamic import from webrtc module // eslint-disable-next-line @typescript-eslint/no-explicit-any this._client.on('Call.incoming' as any, async (call: any) => { - console.log('Incoming call:', call.callId); try { const webrtc = await import('matrix-js-sdk/lib/webrtc/call'); this.handleIncomingCall(call, webrtc.CallEvent, webrtc.CallState); @@ -399,8 +391,6 @@ class MatrixStore { // Verification request received // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._client as any).on(CryptoEvent.VerificationRequestReceived, (request: unknown) => { - console.log('Verification request received:', request); - // eslint-disable-next-line @typescript-eslint/no-explicit-any const req = request as any; const verificationRequest: VerificationRequest = { @@ -419,7 +409,6 @@ class MatrixStore { // Keys changed (e.g., new device added) // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._client as any).on(CryptoEvent.KeysChanged, () => { - console.log('Crypto keys changed'); this.checkVerificationStatus(); }); @@ -427,13 +416,12 @@ class MatrixStore { if ('KeyBackupStatus' in CryptoEvent) { // eslint-disable-next-line @typescript-eslint/no-explicit-any (this._client as any).on((CryptoEvent as any).KeyBackupStatus, (enabled: boolean) => { - console.log('Key backup status:', enabled); this._keyBackupEnabled = enabled; this._cryptoCallbacks.onKeyBackupStatus?.(enabled); }); } - } catch (err) { - console.warn('Could not setup crypto event handlers:', err); + } catch { + // Crypto event handlers not fully supported in this SDK version } // Initial status check @@ -1145,14 +1133,10 @@ class MatrixStore { // eslint-disable-next-line @typescript-eslint/no-explicit-any const cryptoAny = crypto as any; if (userId === this._client.getUserId() && cryptoAny.requestOwnUserVerification) { - const request = await cryptoAny.requestOwnUserVerification(); - console.log('Self-verification started:', request); + await cryptoAny.requestOwnUserVerification(); } else if (cryptoAny.requestVerificationDM) { - // Try DM-based verification for other users - const request = await cryptoAny.requestVerificationDM(userId); - console.log('Verification started:', request); + await cryptoAny.requestVerificationDM(userId); } else { - console.warn('Verification method not available in this SDK version'); return false; } @@ -1171,9 +1155,7 @@ class MatrixStore { if (!this._client || !this._cryptoReady) return false; try { - // Verification request handling is complex and varies by SDK version - // For now, log and return success to allow UI to proceed - console.log('Accept verification - handled by SDK automatically'); + // Verification request handling varies by SDK version - handled automatically return true; } catch (err) { console.error('Error accepting verification:', err); @@ -1189,8 +1171,6 @@ class MatrixStore { try { // In newer SDK versions, verification is handled via verifier events - // This is a simplified approach - console.log('Confirm SAS verification - handled by SDK'); return true; } catch (err) { console.error('Error confirming SAS verification:', err); @@ -1205,11 +1185,9 @@ class MatrixStore { if (!this._client || !this._cryptoReady) return; try { - // Cancel is handled at the request level this._activeVerification = null; - console.log('Verification cancelled'); - } catch (err) { - console.error('Error cancelling verification:', err); + } catch { + // Cancellation is best-effort } } @@ -1604,8 +1582,6 @@ class MatrixStore { private setupCallEventHandlers(call: any, CallEvent: any, CallState: any) { // State changes call.on(CallEvent.State, (state: string, oldState: string) => { - console.log(`Call state: ${oldState} -> ${state}`); - if (this._activeCall) { this._activeCall = { ...this._activeCall, diff --git a/apps/matrix/apps/web/src/lib/stores/userSettings.svelte.ts b/apps/matrix/apps/web/src/lib/stores/userSettings.svelte.ts index feacaa350..6f8834e1d 100644 --- a/apps/matrix/apps/web/src/lib/stores/userSettings.svelte.ts +++ b/apps/matrix/apps/web/src/lib/stores/userSettings.svelte.ts @@ -1,7 +1,7 @@ import { createUserSettingsStore } from '@manacore/shared-theme'; import { browser } from '$app/environment'; -const AUTH_URL = 'https://auth.mana.how'; +const AUTH_URL = import.meta.env.VITE_MANA_AUTH_URL || 'https://auth.mana.how'; const TOKEN_STORAGE_KEY = 'mana_core_access_token'; // Internal access token state diff --git a/apps/matrix/apps/web/src/routes/(app)/+layout.svelte b/apps/matrix/apps/web/src/routes/(app)/+layout.svelte index a240069a4..ec68a6fcb 100644 --- a/apps/matrix/apps/web/src/routes/(app)/+layout.svelte +++ b/apps/matrix/apps/web/src/routes/(app)/+layout.svelte @@ -26,7 +26,7 @@ import { getLanguageDropdownItems, getCurrentLanguageLabel } from '@manacore/shared-i18n'; import { setLocale, supportedLocales } from '$lib/i18n'; - const AUTH_URL = 'https://auth.mana.how'; + const AUTH_URL = import.meta.env.VITE_MANA_AUTH_URL || 'https://auth.mana.how'; /** * Exchange session cookie for JWT token from mana-core-auth @@ -36,7 +36,7 @@ try { const response = await fetch(`${AUTH_URL}/api/v1/auth/session-to-token`, { method: 'POST', - credentials: 'include', // Send session cookie + credentials: 'include', headers: { 'Content-Type': 'application/json', }, @@ -49,8 +49,8 @@ return true; } } - } catch (e) { - console.warn('Could not exchange session for token:', e); + } catch { + // Token exchange failed silently - user can still use Matrix without mana-core settings } return false; } @@ -184,14 +184,10 @@ const loginToken = urlParams.get('loginToken'); if (loginToken) { - console.log('Found loginToken in URL, exchanging for credentials...'); - // Exchange loginToken for Matrix credentials const result = await loginWithLoginToken('matrix.mana.how', loginToken); if (result.success && result.credentials) { - console.log('SSO login successful, initializing Matrix client...'); - // Remove loginToken from URL to prevent re-processing on refresh const cleanUrl = window.location.pathname; window.history.replaceState({}, '', cleanUrl); diff --git a/apps/matrix/apps/web/src/routes/(auth)/login/+page.svelte b/apps/matrix/apps/web/src/routes/(auth)/login/+page.svelte index c4950042b..dac338644 100644 --- a/apps/matrix/apps/web/src/routes/(auth)/login/+page.svelte +++ b/apps/matrix/apps/web/src/routes/(auth)/login/+page.svelte @@ -66,8 +66,9 @@ function handleSSOLogin() { if (!browser) return; loadingSSO = true; + const hs = homeserver.includes('://') ? homeserver : `https://${homeserver}`; const redirectUrl = encodeURIComponent(window.location.origin + '/chat'); - window.location.href = `https://matrix.mana.how/_matrix/client/v3/login/sso/redirect/oidc-manacore?redirectUrl=${redirectUrl}`; + window.location.href = `${hs}/_matrix/client/v3/login/sso/redirect/oidc-manacore?redirectUrl=${redirectUrl}`; } // Auto-discover homeserver when username looks like a full Matrix ID diff --git a/apps/matrix/apps/web/src/routes/+error.svelte b/apps/matrix/apps/web/src/routes/+error.svelte new file mode 100644 index 000000000..5a6b076b6 --- /dev/null +++ b/apps/matrix/apps/web/src/routes/+error.svelte @@ -0,0 +1,46 @@ + + + + {$page.status} - Manalink + + +
+
+ +
+ +
+

{$page.status}

+

+ {#if $page.status === 404} + Diese Seite wurde nicht gefunden. + {:else} + Ein unerwarteter Fehler ist aufgetreten. + {/if} +

+ {#if $page.error?.message} +

{$page.error.message}

+ {/if} +
+ +
+ + +
+
diff --git a/apps/matrix/apps/web/vite.config.ts b/apps/matrix/apps/web/vite.config.ts index 8ec36e66d..06192059f 100644 --- a/apps/matrix/apps/web/vite.config.ts +++ b/apps/matrix/apps/web/vite.config.ts @@ -145,7 +145,7 @@ export default defineConfig({ ], }, devOptions: { - enabled: true, + enabled: process.env.NODE_ENV !== 'production', type: 'module', navigateFallback: '/', },