mirror of
https://github.com/Matewoo/pdf-writer.git
synced 2026-11-18 18:42:50 +01:00
Merge pull request #6 from Matewoo/ldap-beta
Merge ldap connectivity into main
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
*.ttf
|
||||
/backend/node_modules
|
||||
/frontend/public/data
|
||||
.env
|
||||
@@ -1,7 +1,10 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"better-sqlite3": "^11.8.1",
|
||||
"dotenv": "^16.4.7",
|
||||
"express": "^4.21.2",
|
||||
"express-session": "^1.18.1",
|
||||
"ldap-authentication": "^3.3.4",
|
||||
"ws": "^8.18.0"
|
||||
}
|
||||
}
|
||||
|
||||
+185
-37
@@ -5,11 +5,38 @@ const bodyParser = require('body-parser');
|
||||
const path = require('path');
|
||||
const Database = require('better-sqlite3');
|
||||
const fs = require('fs');
|
||||
const ldap = require('ldap-authentication');
|
||||
const session = require('express-session');
|
||||
const { exec } = require('child_process');
|
||||
require('dotenv').config();
|
||||
|
||||
const app = express();
|
||||
const server = http.createServer(app);
|
||||
const wss = new WebSocket.Server({ server });
|
||||
|
||||
// Session-Konfiguration
|
||||
app.use(session({
|
||||
secret: process.env.SESSION_SECRET || 'telc-speiseplan-secret',
|
||||
resave: false,
|
||||
saveUninitialized: false,
|
||||
cookie: {
|
||||
secure: process.env.NODE_ENV === 'production',
|
||||
maxAge: 3 * 24 * 60 * 60 * 1000 // 3 Tage in Millisekunden
|
||||
}
|
||||
}));
|
||||
|
||||
// Middleware für Authentifizierungsprüfung
|
||||
const requireLogin = (req, res, next) => {
|
||||
// Wenn der Benutzer angemeldet ist, fahre mit der Anfrage fort
|
||||
if (req.session.authenticated) {
|
||||
return next();
|
||||
}
|
||||
// Speichere die ursprünglich angeforderte URL
|
||||
req.session.returnTo = req.originalUrl;
|
||||
// Andernfalls umleiten zur Anmeldeseite
|
||||
res.redirect('/login');
|
||||
};
|
||||
|
||||
// Middleware
|
||||
app.use(express.static(path.join(__dirname, '../frontend/public')));
|
||||
app.use(bodyParser.json());
|
||||
@@ -60,13 +87,119 @@ db.exec(`
|
||||
)
|
||||
`);
|
||||
|
||||
// Routes
|
||||
app.get('/edit/menu', (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../frontend/public/edit', 'menu.html'));
|
||||
// LDAP-Authentifizierung Route
|
||||
app.post('/login', async (req, res) => {
|
||||
const { username, password } = req.body;
|
||||
|
||||
try {
|
||||
// Define the domain for UPN format
|
||||
const domain = 'telc.local';
|
||||
const userPrincipalName = username.includes('@') ? username : `${username}@${domain}`;
|
||||
|
||||
// Verbindung mit LDAP - with Active Directory optimized config
|
||||
const user = await ldap.authenticate({
|
||||
ldapOpts: {
|
||||
url: process.env.LDAP_URL,
|
||||
reconnect: true,
|
||||
timeout: 10000
|
||||
},
|
||||
// Admin-Anmeldedaten für die erweiterte Suche verwenden
|
||||
adminDn: process.env.LDAP_USER_DN,
|
||||
adminPassword: process.env.LDAP_USER_PASSWORD,
|
||||
userSearchBase: process.env.LDAP_SEARCH_BASE,
|
||||
userSearchFilter: `(sAMAccountName=${username})`,
|
||||
// Benutzerpasswort separat validieren
|
||||
username: username,
|
||||
userPassword: password,
|
||||
usernameAttribute: 'sAMAccountName',
|
||||
attributes: ['cn', 'displayName', 'sAMAccountName', 'mail', 'memberOf']
|
||||
});
|
||||
|
||||
app.get('/edit/dailyDish', (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../frontend/public/edit', 'dailyDish.html'));
|
||||
console.log('User object keys:', Object.keys(user));
|
||||
const userName = user.displayName || user.cn || user.sAMAccountName || username;
|
||||
console.log('Successfully authenticated:', userName);
|
||||
|
||||
let isAdmin = false;
|
||||
let hasRestaurantAccess = false;
|
||||
|
||||
if (user.memberOf && Array.isArray(user.memberOf)) {
|
||||
isAdmin = user.memberOf.some(group =>
|
||||
group.includes('CN=Domain Admins')
|
||||
);
|
||||
|
||||
// Prüfe ob Benutzer in der erforderlichen Gruppe ist
|
||||
hasRestaurantAccess = user.memberOf.some(group =>
|
||||
group.includes('CN=g32 Betriebsrestaurant')
|
||||
);
|
||||
|
||||
console.log('User groups:', user.memberOf);
|
||||
console.log('Is admin:', isAdmin);
|
||||
console.log('Has restaurant access:', hasRestaurantAccess);
|
||||
}
|
||||
|
||||
// Zugriff nur für Admin oder Mitglieder der Betriebsrestaurant-Gruppe gewähren
|
||||
if (!isAdmin && !hasRestaurantAccess) {
|
||||
return res.status(403).json({
|
||||
success: false,
|
||||
message: 'Zugriff verweigert: Keine Berechtigung!'
|
||||
});
|
||||
}
|
||||
|
||||
// Session setzen mit Rolleninformationen
|
||||
req.session.authenticated = true;
|
||||
req.session.user = {
|
||||
name: userName,
|
||||
isAdmin: isAdmin,
|
||||
groups: user.memberOf || []
|
||||
};
|
||||
|
||||
// Bestimme die Rücksprung-URL
|
||||
let returnTo = '/edit/menu'; // Standard-Rücksprung
|
||||
if (req.session.returnTo) {
|
||||
returnTo = req.session.returnTo;
|
||||
delete req.session.returnTo; // Lösche nach Verwendung
|
||||
}
|
||||
|
||||
res.json({
|
||||
success: true,
|
||||
user: {
|
||||
name: userName,
|
||||
isAdmin: isAdmin
|
||||
},
|
||||
redirect: returnTo
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('LDAP authentication error:', error);
|
||||
res.status(401).json({ success: false, message: 'Authentication failed' });
|
||||
}
|
||||
});
|
||||
|
||||
// Admin-Middleware hinzufügen
|
||||
const requireAdmin = (req, res, next) => {
|
||||
if (req.session.authenticated) {
|
||||
if (req.session.user && req.session.user.isAdmin) {
|
||||
return next();
|
||||
}
|
||||
return res.status(403).send('Zugriff verweigert: Administratorrechte erforderlich');
|
||||
}
|
||||
req.session.returnTo = req.originalUrl;
|
||||
res.redirect('/login');
|
||||
};
|
||||
|
||||
// Logout-Route hinzufügen
|
||||
app.get('/logout', (req, res) => {
|
||||
req.session.destroy(() => {
|
||||
res.redirect('/login');
|
||||
});
|
||||
});
|
||||
|
||||
// Öffentliche Routen
|
||||
app.get('/login', (req, res) => {
|
||||
// Wenn bereits angemeldet, zur Hauptseite umleiten
|
||||
if (req.session.authenticated) {
|
||||
return res.redirect('/edit/menu');
|
||||
}
|
||||
res.sendFile(path.join(__dirname, '../frontend/public', 'login.html'));
|
||||
});
|
||||
|
||||
app.get('/digitalSignage/dailyFeed', (req, res) => {
|
||||
@@ -77,7 +210,22 @@ app.get('/digitalSignage/weeklyFeed', (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../frontend/public/digitalSignage', 'weeklyFeed.html'));
|
||||
});
|
||||
|
||||
app.post('/save-week', (req, res) => {
|
||||
// Geschützte Routen
|
||||
app.get('/edit/menu', requireLogin, (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../frontend/public/edit', 'menu.html'));
|
||||
});
|
||||
|
||||
app.get('/edit/dailyDish', requireLogin, (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../frontend/public/edit', 'dailyDish.html'));
|
||||
});
|
||||
|
||||
// Beispiel für eine Admin-Route
|
||||
app.get('/admin/settings', requireAdmin, (req, res) => {
|
||||
res.sendFile(path.join(__dirname, '../frontend/public/admin', 'settings.html'));
|
||||
});
|
||||
|
||||
// API-Routen, die auch geschützt werden sollten
|
||||
app.post('/save-week', requireLogin, (req, res) => {
|
||||
const { week, entries } = req.body;
|
||||
|
||||
const insert = db.prepare(`
|
||||
@@ -112,7 +260,7 @@ app.post('/save-week', (req, res) => {
|
||||
}
|
||||
});
|
||||
|
||||
app.post('/save-week-daily', (req, res) => {
|
||||
app.post('/save-week-daily', requireLogin, (req, res) => {
|
||||
const { week, entries } = req.body;
|
||||
|
||||
const insert = db.prepare(`
|
||||
@@ -149,6 +297,36 @@ app.post('/save-week-daily', (req, res) => {
|
||||
}
|
||||
});
|
||||
|
||||
app.post('/generate-pdf', requireLogin, (req, res) => {
|
||||
const { val, type } = req.body;
|
||||
let pdfPath;
|
||||
console.log('Type:', type);
|
||||
console.log('Val:', val);
|
||||
|
||||
if (type === 'week') {
|
||||
console.log('Generating PDF for week:', val);
|
||||
pdfPath = `python3 scripts/writeWeeklyMenu.py ${val}`;
|
||||
} else if (type === 'day') {
|
||||
console.log('Generating PDF for daily:', val);
|
||||
pdfPath = `python3 scripts/writeDailyMenu.py ${val}`;
|
||||
}
|
||||
|
||||
|
||||
exec(pdfPath, (error, stdout, stderr) => {
|
||||
if (error) {
|
||||
console.error(`Error generating PDF: ${error.message}`);
|
||||
return res.status(500).json({ success: false, error: error.message });
|
||||
}
|
||||
if (stderr) {
|
||||
console.error(`Error generating PDF: ${stderr}`);
|
||||
return res.status(500).json({ success: false, error: stderr });
|
||||
}
|
||||
console.log(`PDF generated: ${stdout}`);
|
||||
res.json({ success: true });
|
||||
});
|
||||
});
|
||||
|
||||
// Ungeschützte API-Routen für die digitalSignage
|
||||
app.get('/load-week', (req, res) => {
|
||||
const { week } = req.query;
|
||||
|
||||
@@ -205,36 +383,6 @@ app.get('/load-day-daily', (req, res) => {
|
||||
}
|
||||
});
|
||||
|
||||
const { exec } = require('child_process');
|
||||
|
||||
app.post('/generate-pdf', (req, res) => {
|
||||
const { val, type } = req.body;
|
||||
let pdfPath;
|
||||
console.log('Type:', type);
|
||||
console.log('Val:', val);
|
||||
|
||||
if (type === 'week') {
|
||||
console.log('Generating PDF for week:', val);
|
||||
pdfPath = `python3 scripts/writeWeeklyMenu.py ${val}`;
|
||||
} else if (type === 'day') {
|
||||
console.log('Generating PDF for daily:', val);
|
||||
pdfPath = `python3 scripts/writeDailyMenu.py ${val}`;
|
||||
}
|
||||
|
||||
|
||||
exec(pdfPath, (error, stdout, stderr) => {
|
||||
if (error) {
|
||||
console.error(`Error generating PDF: ${error.message}`);
|
||||
return res.status(500).json({ success: false, error: error.message });
|
||||
}
|
||||
if (stderr) {
|
||||
console.error(`Error generating PDF: ${stderr}`);
|
||||
return res.status(500).json({ success: false, error: stderr });
|
||||
}
|
||||
console.log(`PDF generated: ${stdout}`);
|
||||
res.json({ success: true });
|
||||
});
|
||||
});
|
||||
|
||||
server.listen(4000, () => {
|
||||
console.log('Server is listening on port 4000');
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<script src="../src/roleBasedUI.js"></script>
|
||||
<div class="container">
|
||||
<div class="week-controls">
|
||||
<button onclick="previousWeek()">< Vorherige Woche</button>
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<script src="../src/roleBasedUI.js"></script>
|
||||
<div class="container">
|
||||
<div class="week-controls">
|
||||
<button onclick="previousWeek()">< Vorherige Woche</button>
|
||||
|
||||
@@ -0,0 +1,126 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Speiseplan Login</title>
|
||||
<meta name="google" content="notranslate">
|
||||
<link href="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@400;500;700&display=swap" rel="stylesheet">
|
||||
<link rel="stylesheet" type="text/css" href="style.css">
|
||||
<style>
|
||||
html, body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
height: 100%;
|
||||
}
|
||||
body {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
height: 100vh;
|
||||
}
|
||||
.login-container {
|
||||
background-color: white;
|
||||
padding: 30px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
|
||||
max-width: 400px;
|
||||
width: 100%;
|
||||
max-height: 90vh;
|
||||
overflow-y: auto;
|
||||
}
|
||||
.login-container h1 {
|
||||
color: #a81411;
|
||||
margin-bottom: 20px;
|
||||
text-align: center;
|
||||
font-weight: 500;
|
||||
}
|
||||
.login-container input {
|
||||
width: 100%;
|
||||
padding: 12px;
|
||||
margin-bottom: 15px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
font-family: 'Fira Sans', sans-serif;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.login-container button {
|
||||
width: 100%;
|
||||
padding: 12px;
|
||||
background-color: #a81411;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-family: 'Fira Sans', sans-serif;
|
||||
font-weight: 500;
|
||||
font-size: 16px;
|
||||
transition: background-color 0.3s;
|
||||
}
|
||||
.login-container button:hover {
|
||||
background-color: #8e1210;
|
||||
}
|
||||
.telc-logo {
|
||||
text-align: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.telc-logo img {
|
||||
max-width: 150px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="login-container">
|
||||
<div class="telc-logo">
|
||||
<img src="/resources/img/telc-logo.png" alt="telc Logo" onerror="this.style.display='none'">
|
||||
</div>
|
||||
<h1>Speiseplan Login</h1>
|
||||
<input type="text" id="username" placeholder="Benutzername">
|
||||
<input type="password" id="password" placeholder="Passwort">
|
||||
<button onclick="login()">Anmelden</button>
|
||||
<p id="error-message" style="color: #a81411; text-align: center; display: none; margin-top: 15px; font-weight: 500;">
|
||||
Login fehlgeschlagen. Bitte versuchen Sie es erneut.
|
||||
</p>
|
||||
</div>
|
||||
<script>
|
||||
function login() {
|
||||
const username = document.getElementById('username').value;
|
||||
const password = document.getElementById('password').value;
|
||||
const errorMessage = document.getElementById('error-message');
|
||||
|
||||
fetch('/login', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({ username, password })
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
// Admin-Status im localStorage speichern
|
||||
localStorage.setItem('userRole', data.user.isAdmin ? 'admin' : 'user');
|
||||
localStorage.setItem('userName', data.user.name);
|
||||
window.location.href = data.redirect || '/edit/menu';
|
||||
} else {
|
||||
errorMessage.textContent = data.message || 'Login fehlgeschlagen. Bitte versuchen Sie es erneut.';
|
||||
errorMessage.style.display = 'block';
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
errorMessage.textContent = 'Login fehlgeschlagen. Bitte versuchen Sie es erneut.';
|
||||
errorMessage.style.display = 'block';
|
||||
});
|
||||
}
|
||||
|
||||
// Tastaturereignis für Enter-Taste hinzufügen
|
||||
document.getElementById('password').addEventListener('keyup', function(event) {
|
||||
if (event.key === 'Enter') {
|
||||
login();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,85 @@
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
// Admin-Status aus localStorage abrufen
|
||||
const isAdmin = localStorage.getItem('userRole') === 'admin';
|
||||
const userName = localStorage.getItem('userName') || 'Benutzer';
|
||||
|
||||
// Erstelle einen minimalistischen Header mit Dropdown
|
||||
const userMenu = document.createElement('div');
|
||||
userMenu.className = 'user-menu';
|
||||
userMenu.innerHTML = `
|
||||
<div class="user-dropdown">
|
||||
<span class="user-name-display">${userName} ▼</span>
|
||||
<div class="dropdown-content">
|
||||
${isAdmin ? '<a href="/admin/settings">Admin-Bereich</a>' : ''}
|
||||
<a href="/logout">Abmelden</a>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
// Füge CSS für das Dropdown-Menü hinzu
|
||||
const style = document.createElement('style');
|
||||
style.textContent = `
|
||||
.user-menu {
|
||||
position: fixed;
|
||||
top: 10px;
|
||||
right: 20px;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
.user-dropdown {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.user-name-display {
|
||||
color: white;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
padding: 5px 10px;
|
||||
border-radius: 4px;
|
||||
background-color: rgba(168, 20, 17, 0.8);
|
||||
}
|
||||
|
||||
.dropdown-content {
|
||||
display: none;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
background-color: white;
|
||||
min-width: 160px;
|
||||
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
|
||||
z-index: 1;
|
||||
border-radius: 4px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.dropdown-content a {
|
||||
color: black;
|
||||
padding: 12px 16px;
|
||||
text-decoration: none;
|
||||
display: block;
|
||||
border-bottom: 1px solid #f1f1f1;
|
||||
}
|
||||
|
||||
.dropdown-content a:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.dropdown-content a:hover {
|
||||
background-color: #f1f1f1;
|
||||
}
|
||||
|
||||
.user-dropdown:hover .dropdown-content {
|
||||
display: block;
|
||||
}
|
||||
`;
|
||||
document.head.appendChild(style);
|
||||
|
||||
// Füge das Menü zum Body hinzu
|
||||
document.body.appendChild(userMenu);
|
||||
|
||||
// Admin-spezifische Elemente anzeigen/verbergen
|
||||
const adminElements = document.querySelectorAll('.admin-only');
|
||||
adminElements.forEach(element => {
|
||||
element.style.display = isAdmin ? 'block' : 'none';
|
||||
});
|
||||
});
|
||||
@@ -206,3 +206,8 @@ button {
|
||||
.day-form.active {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Für Admin-Only Elemente */
|
||||
.admin-only {
|
||||
display: none; /* Standardmäßig versteckt, wird via JS eingeblendet */
|
||||
}
|
||||
Reference in New Issue
Block a user