mirror of
https://github.com/Matewoo/pdf-writer.git
synced 2026-11-18 18:42:50 +01:00
fix bug with user login
users could login just with the user name. no password needed, whoopsie
This commit is contained in:
+21
-14
@@ -91,26 +91,33 @@ app.post('/login', async (req, res) => {
|
|||||||
const { username, password } = req.body;
|
const { username, password } = req.body;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Für Active Directory verwenden wir eine andere Methode
|
// 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({
|
const user = await ldap.authenticate({
|
||||||
ldapOpts: {
|
ldapOpts: {
|
||||||
url: process.env.LDAP_URL,
|
url: process.env.LDAP_URL,
|
||||||
reconnect: true
|
reconnect: true,
|
||||||
|
timeout: 10000
|
||||||
},
|
},
|
||||||
userDn: process.env.LDAP_USER_DN,
|
// Admin-Anmeldedaten für die erweiterte Suche verwenden
|
||||||
userPassword: process.env.LDAP_USER_PASSWORD,
|
adminDn: process.env.LDAP_USER_DN,
|
||||||
|
adminPassword: process.env.LDAP_USER_PASSWORD,
|
||||||
userSearchBase: process.env.LDAP_SEARCH_BASE,
|
userSearchBase: process.env.LDAP_SEARCH_BASE,
|
||||||
usernameAttribute: 'sAMAccountName',
|
userSearchFilter: `(sAMAccountName=${username})`,
|
||||||
|
// Benutzerpasswort separat validieren
|
||||||
username: username,
|
username: username,
|
||||||
// Gruppenmitgliedschaften abfragen
|
userPassword: password,
|
||||||
attributes: ['cn', 'displayName', 'mail', 'memberOf'],
|
usernameAttribute: 'sAMAccountName',
|
||||||
validatePassword: true,
|
attributes: ['cn', 'displayName', 'sAMAccountName', 'mail', 'memberOf']
|
||||||
passwordAttribute: 'userPassword'
|
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log('Successfully authenticated:', user.cn);
|
console.log('User object keys:', Object.keys(user));
|
||||||
|
const userName = user.displayName || user.cn || user.sAMAccountName || username;
|
||||||
|
console.log('Successfully authenticated:', userName);
|
||||||
|
|
||||||
// Rollen aus den Gruppen bestimmen
|
|
||||||
let isAdmin = false;
|
let isAdmin = false;
|
||||||
let hasRestaurantAccess = false;
|
let hasRestaurantAccess = false;
|
||||||
|
|
||||||
@@ -133,14 +140,14 @@ app.post('/login', async (req, res) => {
|
|||||||
if (!isAdmin && !hasRestaurantAccess) {
|
if (!isAdmin && !hasRestaurantAccess) {
|
||||||
return res.status(403).json({
|
return res.status(403).json({
|
||||||
success: false,
|
success: false,
|
||||||
message: 'Zugriff verweigert: Keine Berechtigung für die Speiseplan-Anwendung'
|
message: 'Zugriff verweigert: Keine Berechtigung!'
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Session setzen mit Rolleninformationen
|
// Session setzen mit Rolleninformationen
|
||||||
req.session.authenticated = true;
|
req.session.authenticated = true;
|
||||||
req.session.user = {
|
req.session.user = {
|
||||||
name: user.cn,
|
name: userName,
|
||||||
isAdmin: isAdmin,
|
isAdmin: isAdmin,
|
||||||
groups: user.memberOf || []
|
groups: user.memberOf || []
|
||||||
};
|
};
|
||||||
@@ -155,7 +162,7 @@ app.post('/login', async (req, res) => {
|
|||||||
res.json({
|
res.json({
|
||||||
success: true,
|
success: true,
|
||||||
user: {
|
user: {
|
||||||
name: user.cn,
|
name: userName,
|
||||||
isAdmin: isAdmin
|
isAdmin: isAdmin
|
||||||
},
|
},
|
||||||
redirect: returnTo
|
redirect: returnTo
|
||||||
|
|||||||
Reference in New Issue
Block a user