projects
/
snf-occi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
snf-occi API server now logs voms info in requests
[snf-occi]
/
snfOCCI
/
voms
/
__init__.py
diff --git
a/snfOCCI/voms/__init__.py
b/snfOCCI/voms/__init__.py
index
238ebf4
..
4e94a5c
100644
(file)
--- a/
snfOCCI/voms/__init__.py
+++ b/
snfOCCI/voms/__init__.py
@@
-8,6
+8,7
@@
import M2Crypto
import snfOCCI.config
import voms_helper
import snfOCCI.config
import voms_helper
+import exception
SSL_CLIENT_S_DN_ENV = "SSL_CLIENT_S_DN"
SSL_CLIENT_CERT_ENV = "SSL_CLIENT_CERT"
SSL_CLIENT_S_DN_ENV = "SSL_CLIENT_S_DN"
SSL_CLIENT_CERT_ENV = "SSL_CLIENT_CERT"
@@
-69,8
+70,7
@@
def _get_voms_info(self, ssl_info):
except M2Crypto.X509.X509Error:
print "Error getting certificate chain"
except M2Crypto.X509.X509Error:
print "Error getting certificate chain"
- with voms_helper.VOMS(VOMS_CONFIG["vomsdir_path"],
- VOMS_CONFIG["ca_path"], VOMS_CONFIG["vomsapi_lib"] as v:
+ with voms_helper.VOMS(VOMS_CONFIG["vomsdir_path"],VOMS_CONFIG["ca_path"], VOMS_CONFIG["vomsapi_lib"]) as v:
if self._no_verify:
v.set_no_verify()
voms_data = v.retrieve(cert, chain)
if self._no_verify:
v.set_no_verify()
voms_data = v.retrieve(cert, chain)