Build [v1.5.0] - Box Management & Label Printing

backend/routers/users.py

@@ -6,8 +6,10 @@ from slowapi import Limiter
 from slowapi.util import get_remote_address
 from passlib.context import CryptContext
 import ldap3
+from ldap3 import Tls
 from ldap3.utils.conv import escape_filter_chars
 from ldap3.utils.dn import escape_rdn
+import ssl
 import json
 import os
 from .. import models, schemas, database, auth
@@ -34,7 +36,22 @@ def authenticate_ldap(username, password):
 
     log.debug(f"LDAP: Config loaded: server_uri={config.get('server_uri')}, base_dn={config.get('base_dn')}")
     try:
-        server = ldap3.Server(config["server_uri"], use_ssl=config.get("use_tls", False), get_info=ldap3.ALL)
+        tls_config = None
+        if config.get("use_tls", False):
+            if config.get("ignore_cert", False):
+                # [SECURITY] CERT_NONE is only for internal test environments with self-signed certs
+                tls_config = Tls(validate=ssl.CERT_NONE, version=ssl.PROTOCOL_TLSv1_2)
+                log.warning("LDAP: TLS Certificate Validation DISABLED (ignore_cert=true)")
+            else:
+                tls_config = Tls(validate=ssl.CERT_REQUIRED, version=ssl.PROTOCOL_TLSv1_2)
+                log.debug("LDAP: TLS Certificate Validation ENABLED (CERT_REQUIRED)")
+        
+        server = ldap3.Server(
+            config["server_uri"], 
+            use_ssl=config.get("use_tls", False), 
+            tls=tls_config,
+            get_info=ldap3.ALL
+        )
         log.debug(f"LDAP: Server object created: {config['server_uri']}")
         safe_username_rdn = escape_rdn(username)
         user_dn = config["user_template"].format(username=safe_username_rdn)
@@ -101,10 +118,31 @@ def authenticate_ldap(username, password):
             
         return assigned_role
     except Exception as e:
-        log.error(f"LDAP: Auth Error: {type(e).__name__}: {str(e)}")
+        err_msg = str(e)
+        err_type = type(e).__name__
+        log.error(f"LDAP: Auth Error: {err_type}: {err_msg}")
+        
+        # Broad detection for SSL/TLS certificate/handshake or connectivity errors
+        # handles both ldapsearch style "Can't contact" and ldap3 style "socket ssl wrapping error"
+        ssl_indicators = ["certificate", "ssl", "tls", "handshake", "verify failed", "contact", "socket"]
+        
+        if any(ind in err_msg.lower() for ind in ssl_indicators):
+            log.warning(f"LDAP: SSL/TLS or Connectivity issue detected: {err_msg}")
+            
+            # User-friendly error message, hiding raw socket traces
+            friendly_msg = "Secure Connection Failed: The enterprise server's security certificate is not trusted or the connection dropped."
+            if config.get("use_tls"):
+                friendly_msg += " If this is an internal test environment, please ask an Admin to enable 'Ignore Certificate Validation'."
+                
+            raise HTTPException(
+                status_code=401, 
+                detail=friendly_msg
+            )
+            
         import traceback
         log.debug(f"LDAP: Full traceback: {traceback.format_exc()}")
         return None
+        
 pwd_context = CryptContext(schemes=["pbkdf2_sha256"], deprecated="auto")
 
 def get_db():
@@ -313,7 +351,20 @@ def test_ldap_connection(
         if result == 0:
             # Socket is open! Now try LDAP library probe
             try:
-                server = ldap3.Server(config["server_uri"], connect_timeout=5, get_info=ldap3.BASIC)
+                tls_config = None
+                if config.get("use_tls", False):
+                    if config.get("ignore_cert", False):
+                        tls_config = Tls(validate=ssl.CERT_NONE, version=ssl.PROTOCOL_TLSv1_2)
+                    else:
+                        tls_config = Tls(validate=ssl.CERT_REQUIRED, version=ssl.PROTOCOL_TLSv1_2)
+
+                server = ldap3.Server(
+                    config["server_uri"], 
+                    connect_timeout=5, 
+                    get_info=ldap3.BASIC,
+                    use_ssl=config.get("use_tls", False),
+                    tls=tls_config
+                )
                 # Try a connection without auto-bind first to see if it's an LDAP server
                 conn = ldap3.Connection(server, auto_bind=False)
                 if conn.open():
@@ -324,7 +375,10 @@ def test_ldap_connection(
                 return {"status": "success", "message": "Connection Successful (Network reachable, protocol handshake restricted by server security)"}
             except Exception as e:
                 # Any LDAP level error while socket is open is still a partial success
-                return {"status": "success", "message": f"Partial Success: TCP Port {port} is open, but LDAP handshake was rejected."}
+                err_msg = str(e)
+                if "certificate verify failed" in err_msg.lower() or "self signed certificate" in err_msg.lower():
+                     return {"status": "error", "message": f"SSL/TLS Certificate Rejected: The server certificate is self-signed or invalid. Enable 'Ignore Certificate Validation' to bypass."}
+                return {"status": "success", "message": f"Partial Success: TCP Port {port} is open, but LDAP handshake was rejected: {err_msg}"}
         else:
             # Socket failed, let's try calling system 'ldapsearch' as a last resort diagnostic
             import subprocess
@@ -355,6 +409,9 @@ def delete_user(
     if user.username == "Admin":
         raise HTTPException(status_code=400, detail="Cannot delete default Admin")
 
+    is_ldap = user.origin == "ldap"
     db.delete(user)
     db.commit()
-    return {"message": "User deleted"}
+    
+    log.info(f"User {user_id} ({user.username}) deleted by Admin. Source: {user.origin}")
+    return {"message": "User deleted" if not is_ldap else "LDAP cache cleared for this user"}