Changeset 886

Timestamp:

07/24/06 17:30:42 (7 years ago)

Author:

mglb1

Message:

Fix bugs in mac address -> username conversion

File:

• ccsd/trunk/crcnetd/_utils/ccsd_server.py (modified) (2 diffs)

ccsd/trunk/crcnetd/_utils/ccsd_server.py

@@ -350 +350 @@
         """
         from ccsd_session import getSessionE, startSession, startBasicSession
-
-        allow_login = config_getboolean(None, "cert_logins", True)
-        if not allow_login:
-            return startBasicSession(subj.CN, SESSION_RW)
-
+        
         # Check incoming peer certificate
         cert = request.channel.transport.socket.get_peer_certificate()
         subj = cert.get_subject()
+        username = subj.CN.replace(":", "")
+
+        allow_login = config_getboolean(None, "cert_logins", True)
+        if not allow_login:
+            # CN matches a MAC address
+            return startBasicSession(username, SESSION_RW)
         
         # Does the CN match a username?
@@ -369 +371 @@
             
         # CN matches a MAC address
-        username = subj.CN.strip(":")
         return startBasicSession(username, SESSION_RW)