Better regexp use
authorJohn Giannelos <johngian@grnet.gr>
Mon, 5 Nov 2012 09:27:07 +0000 (11:27 +0200)
committerJohn Giannelos <johngian@grnet.gr>
Mon, 5 Nov 2012 09:27:07 +0000 (11:27 +0200)
snfOCCI/APIserver.py

index 392b196..13a7d75 100755 (executable)
@@ -105,8 +105,11 @@ class MyAPP(Application):
 
         #Regular expression in HTTP headers
         #environ[HTTP_SSL] contains PEM certificates in wrong format
-        client_cert = re.search(r'^(-----BEGIN CERTIFICATE----- )(.*|\s]*)( -----END CERTIFICATE-----)', environ["HTTP_SSL_CLIENT_CERT"])
-        client_chain = re.search(r'^(-----BEGIN CERTIFICATE-----)(.*|\s]*)( -----END CERTIFICATE-----)', environ["HTTP_SSL_CLIENT_CERT_CHAIN_0"])
+        
+        pem_re = r'^(-----BEGIN CERTIFICATE----- )(.*|\s]*)( -----END CERTIFICATE-----)'
+
+        client_cert = re.search(pem_re, environ["HTTP_SSL_CLIENT_CERT"])
+        client_chain = re.search(pem_re, environ["HTTP_SSL_CLIENT_CERT_CHAIN_0"])
 
         client_cert_list=[]
         client_chain_list=[]