mirror of
https://github.com/donpat1to/Schichtenplaner.git
synced 2025-11-30 22:45:46 +01:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 52f559199d |
@@ -85,7 +85,7 @@ if (process.env.NODE_ENV === 'production') {
|
|||||||
|
|
||||||
const configureTrustProxy = (): string | string[] | boolean | number => {
|
const configureTrustProxy = (): string | string[] | boolean | number => {
|
||||||
const trustedProxyIps = process.env.TRUSTED_PROXY_IPS;
|
const trustedProxyIps = process.env.TRUSTED_PROXY_IPS;
|
||||||
const trustProxyEnabled = process.env.TRUST_PROXY_ENABLED !== 'false'; // Default true for production
|
const trustProxyEnabled = process.env.TRUST_PROXY_ENABLED !== 'false';
|
||||||
|
|
||||||
// If explicitly disabled
|
// If explicitly disabled
|
||||||
if (!trustProxyEnabled) {
|
if (!trustProxyEnabled) {
|
||||||
@@ -106,21 +106,9 @@ const configureTrustProxy = (): string | string[] | boolean | number => {
|
|||||||
return trustedProxyIps.trim();
|
return trustedProxyIps.trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default behavior based on environment
|
// Default behavior for reverse proxy setup
|
||||||
if (process.env.NODE_ENV === 'production') {
|
console.log('🔒 Trust proxy: Using reverse proxy defaults (trust all)');
|
||||||
console.log('🔒 Trust proxy: Using production defaults (private networks)');
|
return true; // Trust all proxies when behind nginx
|
||||||
return [
|
|
||||||
'loopback',
|
|
||||||
'linklocal',
|
|
||||||
'uniquelocal',
|
|
||||||
'10.0.0.0/8',
|
|
||||||
'172.16.0.0/12',
|
|
||||||
'192.168.0.0/16'
|
|
||||||
];
|
|
||||||
} else {
|
|
||||||
console.log('🔒 Trust proxy: Development mode (disabled)');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
app.set('trust proxy', configureTrustProxy());
|
app.set('trust proxy', configureTrustProxy());
|
||||||
@@ -140,7 +128,11 @@ app.use(helmet({
|
|||||||
frameSrc: ["'none'"],
|
frameSrc: ["'none'"],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
hsts: false,
|
hsts: {
|
||||||
|
maxAge: 31536000,
|
||||||
|
includeSubDomains: true,
|
||||||
|
preload: true
|
||||||
|
}, // Enable HSTS for HTTPS
|
||||||
crossOriginEmbedderPolicy: false
|
crossOriginEmbedderPolicy: false
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|||||||
@@ -3,17 +3,15 @@ set -e
|
|||||||
|
|
||||||
echo "🚀 Container Initialisierung gestartet..."
|
echo "🚀 Container Initialisierung gestartet..."
|
||||||
|
|
||||||
# Funktion zum Generieren eines sicheren Secrets
|
|
||||||
generate_secret() {
|
generate_secret() {
|
||||||
length=$1
|
length=$1
|
||||||
tr -dc 'A-Za-z0-9!@#$%^&*()_+-=' < /dev/urandom | head -c $length
|
tr -dc 'A-Za-z0-9!@#$%^&*()_+-=' < /dev/urandom | head -c $length
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prüfe ob .env existiert
|
# Create .env if it doesn't exist
|
||||||
if [ ! -f /app/.env ]; then
|
if [ ! -f /app/.env ]; then
|
||||||
echo "📝 Erstelle .env Datei..."
|
echo "📝 Erstelle .env Datei..."
|
||||||
|
|
||||||
# Verwende vorhandenes JWT_SECRET oder generiere ein neues
|
|
||||||
if [ -z "$JWT_SECRET" ] || [ "$JWT_SECRET" = "your-secret-key-please-change" ]; then
|
if [ -z "$JWT_SECRET" ] || [ "$JWT_SECRET" = "your-secret-key-please-change" ]; then
|
||||||
export JWT_SECRET=$(generate_secret 64)
|
export JWT_SECRET=$(generate_secret 64)
|
||||||
echo "🔑 Automatisch sicheres JWT Secret generiert"
|
echo "🔑 Automatisch sicheres JWT Secret generiert"
|
||||||
@@ -21,30 +19,37 @@ if [ ! -f /app/.env ]; then
|
|||||||
echo "🔑 Verwende vorhandenes JWT Secret aus Umgebungsvariable"
|
echo "🔑 Verwende vorhandenes JWT Secret aus Umgebungsvariable"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Erstelle .env aus Template mit envsubst
|
# Create .env with all proxy settings
|
||||||
envsubst < /app/.env.template > /app/.env
|
cat > /app/.env << EOF
|
||||||
echo "✅ .env Datei erstellt"
|
NODE_ENV=production
|
||||||
|
JWT_SECRET=${JWT_SECRET}
|
||||||
|
TRUST_PROXY_ENABLED=${TRUST_PROXY_ENABLED:-true}
|
||||||
|
TRUSTED_PROXY_IPS=${TRUSTED_PROXY_IPS:-172.0.0.0/8,10.0.0.0/8,192.168.0.0/16}
|
||||||
|
HOSTNAME=${HOSTNAME:-localhost}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "✅ .env Datei erstellt"
|
||||||
else
|
else
|
||||||
echo "ℹ️ .env Datei existiert bereits"
|
echo "ℹ️ .env Datei existiert bereits"
|
||||||
|
|
||||||
# Wenn .env existiert, aber JWT_SECRET Umgebungsvariable gesetzt ist, aktualisiere sie
|
# Update JWT_SECRET if provided
|
||||||
if [ -n "$JWT_SECRET" ] && [ "$JWT_SECRET" != "your-secret-key-please-change" ]; then
|
if [ -n "$JWT_SECRET" ] && [ "$JWT_SECRET" != "your-secret-key-please-change" ]; then
|
||||||
echo "🔑 Aktualisiere JWT Secret in .env Datei"
|
echo "🔑 Aktualisiere JWT Secret in .env Datei"
|
||||||
# Aktualisiere nur das JWT_SECRET in der .env Datei
|
|
||||||
sed -i "s/^JWT_SECRET=.*/JWT_SECRET=$JWT_SECRET/" /app/.env
|
sed -i "s/^JWT_SECRET=.*/JWT_SECRET=$JWT_SECRET/" /app/.env
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Validiere dass JWT_SECERT nicht der Standardwert ist
|
# Validate JWT_SECRET
|
||||||
if grep -q "JWT_SECRET=your-secret-key-please-change" /app/.env; then
|
if grep -q "JWT_SECRET=your-secret-key-please-change" /app/.env; then
|
||||||
echo "❌ FEHLER: Standard JWT Secret in .env gefunden!"
|
echo "❌ FEHLER: Standard JWT Secret in .env gefunden!"
|
||||||
echo "❌ Bitte setzen Sie JWT_SECRET Umgebungsvariable"
|
echo "❌ Bitte setzen Sie JWT_SECRET Umgebungsvariable"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Setze sichere Berechtigungen
|
|
||||||
chmod 600 /app/.env
|
chmod 600 /app/.env
|
||||||
|
|
||||||
|
echo "🔧 Proxy Configuration:"
|
||||||
|
echo " - TRUST_PROXY_ENABLED: ${TRUST_PROXY_ENABLED:-true}"
|
||||||
|
echo " - TRUSTED_PROXY_IPS: ${TRUSTED_PROXY_IPS:-172.0.0.0/8,10.0.0.0/8,192.168.0.0/16}"
|
||||||
echo "🔧 Starte Anwendung..."
|
echo "🔧 Starte Anwendung..."
|
||||||
exec "$@"
|
exec "$@"
|
||||||
@@ -15,6 +15,7 @@ import EmployeeManagement from './pages/Employees/EmployeeManagement';
|
|||||||
import Settings from './pages/Settings/Settings';
|
import Settings from './pages/Settings/Settings';
|
||||||
import Help from './pages/Help/Help';
|
import Help from './pages/Help/Help';
|
||||||
import Setup from './pages/Setup/Setup';
|
import Setup from './pages/Setup/Setup';
|
||||||
|
import ErrorBoundary from './components/ErrorBoundary/ErrorBoundary';
|
||||||
|
|
||||||
// Free Footer Link Pages (always available)
|
// Free Footer Link Pages (always available)
|
||||||
import FAQ from './components/Layout/FooterLinks/FAQ/FAQ';
|
import FAQ from './components/Layout/FooterLinks/FAQ/FAQ';
|
||||||
@@ -160,14 +161,16 @@ const AppContent: React.FC = () => {
|
|||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
return (
|
return (
|
||||||
<NotificationProvider>
|
<ErrorBoundary>
|
||||||
<AuthProvider>
|
<NotificationProvider>
|
||||||
<Router>
|
<AuthProvider>
|
||||||
<NotificationContainer />
|
<Router>
|
||||||
<AppContent />
|
<NotificationContainer />
|
||||||
</Router>
|
<AppContent />
|
||||||
</AuthProvider>
|
</Router>
|
||||||
</NotificationProvider>
|
</AuthProvider>
|
||||||
|
</NotificationProvider>
|
||||||
|
</ErrorBoundary>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
101
frontend/src/components/ErrorBoundary/ErrorBoundary.tsx
Normal file
101
frontend/src/components/ErrorBoundary/ErrorBoundary.tsx
Normal file
@@ -0,0 +1,101 @@
|
|||||||
|
// src/components/ErrorBoundary/ErrorBoundary.tsx
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
children: React.ReactNode;
|
||||||
|
fallback?: React.ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface State {
|
||||||
|
hasError: boolean;
|
||||||
|
error?: Error;
|
||||||
|
}
|
||||||
|
|
||||||
|
class ErrorBoundary extends React.Component<Props, State> {
|
||||||
|
constructor(props: Props) {
|
||||||
|
super(props);
|
||||||
|
this.state = { hasError: false };
|
||||||
|
}
|
||||||
|
|
||||||
|
static getDerivedStateFromError(error: Error): State {
|
||||||
|
return { hasError: true, error };
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
|
||||||
|
console.error('🚨 Application Error:', error);
|
||||||
|
console.error('📋 Error Details:', errorInfo);
|
||||||
|
|
||||||
|
// In production, send to your error reporting service
|
||||||
|
// logErrorToService(error, errorInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
if (this.state.hasError) {
|
||||||
|
// You can render any custom fallback UI
|
||||||
|
return this.props.fallback || (
|
||||||
|
<div style={{
|
||||||
|
padding: '40px',
|
||||||
|
textAlign: 'center',
|
||||||
|
fontFamily: 'Arial, sans-serif'
|
||||||
|
}}>
|
||||||
|
<div style={{ fontSize: '48px', marginBottom: '20px' }}>⚠️</div>
|
||||||
|
<h2>Oops! Something went wrong</h2>
|
||||||
|
<p style={{ margin: '20px 0', color: '#666' }}>
|
||||||
|
We encountered an unexpected error. Please try refreshing the page.
|
||||||
|
</p>
|
||||||
|
<div style={{ marginTop: '30px' }}>
|
||||||
|
<button
|
||||||
|
onClick={() => window.location.reload()}
|
||||||
|
style={{
|
||||||
|
padding: '10px 20px',
|
||||||
|
backgroundColor: '#007bff',
|
||||||
|
color: 'white',
|
||||||
|
border: 'none',
|
||||||
|
borderRadius: '4px',
|
||||||
|
cursor: 'pointer',
|
||||||
|
marginRight: '10px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Refresh Page
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => this.setState({ hasError: false })}
|
||||||
|
style={{
|
||||||
|
padding: '10px 20px',
|
||||||
|
backgroundColor: '#6c757d',
|
||||||
|
color: 'white',
|
||||||
|
border: 'none',
|
||||||
|
borderRadius: '4px',
|
||||||
|
cursor: 'pointer'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
Try Again
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{process.env.NODE_ENV === 'development' && this.state.error && (
|
||||||
|
<details style={{
|
||||||
|
marginTop: '20px',
|
||||||
|
textAlign: 'left',
|
||||||
|
background: '#f8f9fa',
|
||||||
|
padding: '15px',
|
||||||
|
borderRadius: '4px'
|
||||||
|
}}>
|
||||||
|
<summary>Error Details (Development)</summary>
|
||||||
|
<pre style={{
|
||||||
|
whiteSpace: 'pre-wrap',
|
||||||
|
fontSize: '12px',
|
||||||
|
color: '#dc3545'
|
||||||
|
}}>
|
||||||
|
{this.state.error.stack}
|
||||||
|
</pre>
|
||||||
|
</details>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.props.children;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ErrorBoundary;
|
||||||
Reference in New Issue
Block a user