git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e824c97
)
define peer_cert in do_POST() not in verify_callback() (doing this in verify_callback...
author
Tony Mack
<tmack@cs.princeton.edu>
Fri, 5 Mar 2010 20:07:37 +0000
(20:07 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Fri, 5 Mar 2010 20:07:37 +0000
(20:07 +0000)
sfa/util/server.py
patch
|
blob
|
history
diff --git
a/sfa/util/server.py
b/sfa/util/server.py
index
fece14f
..
72e9a1d
100644
(file)
--- a/
sfa/util/server.py
+++ b/
sfa/util/server.py
@@
-41,12
+41,6
@@
def verify_callback(conn, x509, err, depth, preverify):
#print " depth > 0 in verify_callback"
return 0
#print " depth > 0 in verify_callback"
return 0
- # create a Certificate object and load it from the client's x509
- ctx = conn.get_context()
- server = ctx.get_app_data()
- server.peer_cert = Certificate()
- server.peer_cert.load_from_pyopenssl_x509(x509)
-
# the certificate verification done by openssl checks a number of things
# that we aren't interested in, so we look out for those error messages
# and ignore them
# the certificate verification done by openssl checks a number of things
# that we aren't interested in, so we look out for those error messages
# and ignore them
@@
-99,7
+93,9
@@
class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
It was copied out from SimpleXMLRPCServer.py and modified to shutdown the socket cleanly.
"""
try:
It was copied out from SimpleXMLRPCServer.py and modified to shutdown the socket cleanly.
"""
try:
- self.api = SfaAPI(peer_cert = self.server.peer_cert,
+ peer_cert = Certificate()
+ peer_cert.load_from_pyopenssl_x509(self.connection.get_peer_certificate())
+ self.api = SfaAPI(peer_cert = peer_cert,
interface = self.server.interface,
key_file = self.server.key_file,
cert_file = self.server.cert_file)
interface = self.server.interface,
key_file = self.server.key_file,
cert_file = self.server.cert_file)
@@
-121,6
+117,7
@@
class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
# internal error, report as HTTP server error
self.send_response(500)
self.end_headers()
# internal error, report as HTTP server error
self.send_response(500)
self.end_headers()
+ traceback.print_exc()
else:
# got a valid XML RPC response
self.send_response(200)
else:
# got a valid XML RPC response
self.send_response(200)