[Mpuls-commits] r2497 - wasko/branches/2.0/mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-22 16:25:47 +0200 (Thu, 22 Apr 2010)
New Revision: 2497

Modified:
   wasko/branches/2.0/mpulsweb/lib/security.py
Log:
* mpulsweb/lib/security.py (getKAName): Wald #1425. Fixed fetching ka
	name from ssl certificate. 


Modified: wasko/branches/2.0/mpulsweb/lib/security.py
===================================================================
--- wasko/branches/2.0/mpulsweb/lib/security.py	2010-04-22 13:45:36 UTC (rev 2496)
+++ wasko/branches/2.0/mpulsweb/lib/security.py	2010-04-22 14:25:47 UTC (rev 2497)
@@ -72,6 +72,7 @@
 
 
 def slashSplit(s):
+    out = [] 
     for p in s.split("/"):
         if p.find("=") == -1 and out:
             out[-1] += '/'+ p
@@ -286,7 +287,6 @@
         else: log.info("No appname defined in http-header file")
     except:
         log.exception("Could not get appbase name from http-headers")
-        raise
 
     # 3. Try to get the dbname from SSL_CLIENT_S_DN from client certificate 
     # This code is obsolete and should not be executed. In current versions of
@@ -298,8 +298,9 @@
             # There are two OU. We want the one != WASKA
             if field[0] == "OU" and field[1] != "WASKA":
                 kaname = field[1]
-    except:
+    except Exception, e:
         log.exception("Could not fetch KA-name from client certificate")
+        raise
     return kaname
 
 def checkRole(role):