import socket
import traceback
import threading
-from Queue import Queue
-import xmlrpclib
-import SocketServer
-import BaseHTTPServer
-import SimpleXMLRPCServer
+from queue import Queue
+import socketserver
+import http.server
+import xmlrpc.server
from OpenSSL import SSL
from sfa.util.sfalogging import logger
from sfa.util.config import Config
-from sfa.util.cache import Cache
+from sfa.util.cache import Cache
from sfa.trust.certificate import Certificate
from sfa.trust.trustedroots import TrustedRoots
+import xmlrpc.client
# don't hard code an api class anymore here
from sfa.generic import Generic
# we have our own authentication spec. Thus we disable several of the normal
# prohibitions that OpenSSL places on certificates
+
def verify_callback(conn, x509, err, depth, preverify):
# if the cert has been preverified, then it is ok
if preverify:
- #print " preverified"
- return 1
-
+ # print " preverified"
+ return True
# 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
# XXX SMBAKER: I don't know what this error is, but it's being returned
- # xxx thierry: this most likely means the cert has a validity range in the future
+ # xxx thierry: this most likely means the cert
+ # has a validity range in the future
# by newer pl nodes.
if err == 9:
- #print " X509_V_ERR_CERT_NOT_YET_VALID"
- return 1
+ # print " X509_V_ERR_CERT_NOT_YET_VALID"
+ return True
# allow self-signed certificates
if err == 18:
- #print " X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT"
- return 1
+ # print " X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT"
+ return False
# allow certs that don't have an issuer
if err == 20:
- #print " X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY"
- return 1
+ # print " X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY"
+ return False
# allow chained certs with self-signed roots
if err == 19:
- return 1
-
+ return False
+
# allow certs that are untrusted
if err == 21:
- #print " X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE"
- return 1
+ # print " X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE"
+ return False
# allow certs that are untrusted
if err == 27:
- #print " X509_V_ERR_CERT_UNTRUSTED"
- return 1
+ # print " X509_V_ERR_CERT_UNTRUSTED"
+ return False
- logger.debug(" error %s in verify_callback"%err)
+ # ignore X509_V_ERR_CERT_SIGNATURE_FAILURE
+ if err == 7:
+ return False
- return 0
+ logger.debug(" unhandled error %s in verify_callback" % err)
+
+ return False
##
-# taken from the web (XXX find reference). Implements HTTPS xmlrpc request handler
-class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
- """Secure XML-RPC request handler class.
+# taken from the web (XXX find reference). Implements HTTPS xmlrpc request
+# handler
- It it very similar to SimpleXMLRPCRequestHandler but it uses HTTPS for transporting XML data.
+# python-2.7 http://code.activestate.com/recipes/442473-simple-http-server-supporting-ssl-secure-communica/
+# python-3.3 https://gist.github.com/ubershmekel/6194556
+class SecureXMLRpcRequestHandler(xmlrpc.server.SimpleXMLRPCRequestHandler):
"""
+ Secure XML-RPC request handler class.
+
+ It it very similar to SimpleXMLRPCRequestHandler
+ but it uses HTTPS for transporting XML data.
+ """
+
def setup(self):
self.connection = self.request
self.rfile = socket._fileobject(self.request, "rb", self.rbufsize)
self.wfile = socket._fileobject(self.request, "wb", self.wbufsize)
+# porting to python3
+# xmlrpc.server.SimpleXMLRPCRequestHandler inherits
+# http.server.BaseHTTPRequestHandler, that already has
+# the rfile and wfile attributes
def do_POST(self):
- """Handles the HTTPS POST request.
+ """
+ Handles the HTTPS POST request.
- It was copied out from SimpleXMLRPCServer.py and modified to shutdown
+ It was copied out from SimpleXMLRPCServer.py and modified to shutdown
the socket cleanly.
"""
try:
peer_cert = Certificate()
- peer_cert.load_from_pyopenssl_x509(self.connection.get_peer_certificate())
- generic=Generic.the_flavour()
- self.api = generic.make_api (peer_cert = peer_cert,
- interface = self.server.interface,
- key_file = self.server.key_file,
- cert_file = self.server.cert_file,
- cache = self.cache)
- #logger.info("SecureXMLRpcRequestHandler.do_POST:")
- #logger.info("interface=%s"%self.server.interface)
- #logger.info("key_file=%s"%self.server.key_file)
- #logger.info("api=%s"%self.api)
- #logger.info("server=%s"%self.server)
- #logger.info("handler=%s"%self)
+ peer_cert.load_from_pyopenssl_x509(
+ self.connection.get_peer_certificate())
+ generic = Generic.the_flavour()
+ self.api = generic.make_api(peer_cert=peer_cert,
+ interface=self.server.interface,
+ key_file=self.server.key_file,
+ cert_file=self.server.cert_file,
+ cache=self.cache)
+ # logger.info("SecureXMLRpcRequestHandler.do_POST:")
+ # logger.info("interface=%s"%self.server.interface)
+ # logger.info("key_file=%s"%self.server.key_file)
+ # logger.info("api=%s"%self.api)
+ # logger.info("server=%s"%self.server)
+ # logger.info("handler=%s"%self)
# get arguments
request = self.rfile.read(int(self.headers["content-length"]))
- remote_addr = (remote_ip, remote_port) = self.connection.getpeername()
- self.api.remote_addr = remote_addr
- response = self.api.handle(remote_addr, request, self.server.method_map)
- except Exception, fault:
+ remote_addr = (
+ remote_ip, remote_port) = self.connection.getpeername()
+ self.api.remote_addr = remote_addr
+ response = self.api.handle(
+ remote_addr, request, self.server.method_map)
+ except Exception as fault:
# This should only happen if the module is buggy
# internal error, report as HTTP server error
logger.log_exc("server.do_POST")
response = self.api.prepare_response(fault)
- #self.send_response(500)
- #self.end_headers()
-
- # got a valid response
- self.send_response(200)
- self.send_header("Content-type", "text/xml")
- self.send_header("Content-length", str(len(response)))
- self.end_headers()
- self.wfile.write(response)
-
- # shut down the connection
- self.wfile.flush()
- self.connection.shutdown() # Modified here!
+ # self.send_response(500)
+ # self.end_headers()
+
+ # avoid session/connection leaks : do this no matter what
+ finally:
+ self.send_response(200)
+ self.send_header("Content-type", "text/xml")
+ self.send_header("Content-length", str(len(response)))
+ self.end_headers()
+ self.wfile.write(response)
+ self.wfile.flush()
+ # close db connection
+ self.api.close_dbsession()
+ # shut down the connection
+ self.connection.shutdown() # Modified here!
##
# Taken from the web (XXX find reference). Implements an HTTPS xmlrpc server
-class SecureXMLRPCServer(BaseHTTPServer.HTTPServer,SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
- def __init__(self, server_address, HandlerClass, key_file, cert_file, logRequests=True):
- """Secure XML-RPC server.
- It it very similar to SimpleXMLRPCServer but it uses HTTPS for transporting XML data.
+class SecureXMLRPCServer(http.server.HTTPServer,
+ xmlrpc.server.SimpleXMLRPCDispatcher):
+
+ def __init__(self, server_address, HandlerClass,
+ key_file, cert_file, logRequests=True):
"""
- logger.debug("SecureXMLRPCServer.__init__, server_address=%s, cert_file=%s, key_file=%s"%(server_address,cert_file,key_file))
+ Secure XML-RPC server.
+
+ It it very similar to SimpleXMLRPCServer
+ but it uses HTTPS for transporting XML data.
+ """
+ logger.debug(
+ f"SecureXMLRPCServer.__init__, server_address={server_address}, "
+ f"cert_file={cert_file}, key_file={key_file}")
self.logRequests = logRequests
self.interface = None
self.key_file = key_file
self.method_map = {}
# add cache to the request handler
HandlerClass.cache = Cache()
- #for compatibility with python 2.4 (centos53)
+ # for compatibility with python 2.4 (centos53)
if sys.version_info < (2, 5):
- SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self)
+ xmlrpc.server.SimpleXMLRPCDispatcher.__init__(self)
else:
- SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self, True, None)
- SocketServer.BaseServer.__init__(self, server_address, HandlerClass)
+ xmlrpc.server.SimpleXMLRPCDispatcher.__init__(
+ self, True, None)
+ socketserver.BaseServer.__init__(self, server_address, HandlerClass)
ctx = SSL.Context(SSL.SSLv23_METHOD)
- ctx.use_privatekey_file(key_file)
+ ctx.use_privatekey_file(key_file)
ctx.use_certificate_file(cert_file)
- # If you wanted to verify certs against known CAs.. this is how you would do it
- #ctx.load_verify_locations('/etc/sfa/trusted_roots/plc.gpo.gid')
+ # If you wanted to verify certs against known CAs..
+ # this is how you would do it
+ # ctx.load_verify_locations('/etc/sfa/trusted_roots/plc.gpo.gid')
config = Config()
- trusted_cert_files = TrustedRoots(config.get_trustedroots_dir()).get_file_list()
+ trusted_cert_files = TrustedRoots(
+ config.get_trustedroots_dir()).get_file_list()
for cert_file in trusted_cert_files:
ctx.load_verify_locations(cert_file)
- ctx.set_verify(SSL.VERIFY_PEER | SSL.VERIFY_FAIL_IF_NO_PEER_CERT, verify_callback)
+ ctx.set_verify(SSL.VERIFY_PEER |
+ SSL.VERIFY_FAIL_IF_NO_PEER_CERT, verify_callback)
ctx.set_verify_depth(5)
ctx.set_app_data(self)
self.socket = SSL.Connection(ctx, socket.socket(self.address_family,
# the client.
def _dispatch(self, method, params):
- logger.debug("SecureXMLRPCServer._dispatch, method=%s"%method)
+ logger.debug("SecureXMLRPCServer._dispatch, method=%s" % method)
try:
- return SimpleXMLRPCServer.SimpleXMLRPCDispatcher._dispatch(self, method, params)
+ return xmlrpc.server.SimpleXMLRPCDispatcher._dispatch(
+ self, method, params)
except:
# can't use format_exc() as it is not available in jython yet
# (even in trunk).
type, value, tb = sys.exc_info()
- raise xmlrpclib.Fault(1,''.join(traceback.format_exception(type, value, tb)))
+ raise xmlrpc.client.Fault(1, ''.join(
+ traceback.format_exception(type, value, tb)))
# override this one from the python 2.7 code
# originally defined in class TCPServer
def shutdown_request(self, request):
- """Called to shutdown and close an individual request."""
- # ----------
- # the std python 2.7 code just attempts a request.shutdown(socket.SHUT_WR)
+ """
+ Called to shutdown and close an individual request.
+ """
+ # ----------
+ # the std python 2.7 code just attempts a
+ # request.shutdown(socket.SHUT_WR)
# this works fine with regular sockets
- # However we are dealing with an instance of OpenSSL.SSL.Connection instead
+ # However we are dealing with an instance of
+ # OpenSSL.SSL.Connection instead
# This one only supports shutdown(), and in addition this does not
# always perform as expected
# ---------- std python 2.7 code
try:
- #explicitly shutdown. socket.close() merely releases
- #the socket and waits for GC to perform the actual close.
+ # explicitly shutdown. socket.close() merely releases
+ # the socket and waits for GC to perform the actual close.
request.shutdown(socket.SHUT_WR)
except socket.error:
- pass #some platforms may raise ENOTCONN here
+ pass # some platforms may raise ENOTCONN here
# ----------
except TypeError:
- # we are dealing with an OpenSSL.Connection object,
+ # we are dealing with an OpenSSL.Connection object,
# try to shut it down but never mind if that fails
- try: request.shutdown()
- except: pass
+ try:
+ request.shutdown()
+ except:
+ pass
# ----------
self.close_request(request)
-## From Active State code: http://code.activestate.com/recipes/574454/
-# This is intended as a drop-in replacement for the ThreadingMixIn class in
-# module SocketServer of the standard lib. Instead of spawning a new thread
+# From Active State code: http://code.activestate.com/recipes/574454/
+# This is intended as a drop-in replacement for the ThreadingMixIn class in
+# module SocketServer of the standard lib. Instead of spawning a new thread
# for each request, requests are processed by of pool of reusable threads.
-class ThreadPoolMixIn(SocketServer.ThreadingMixIn):
+
+
+class ThreadPoolMixIn(socketserver.ThreadingMixIn):
"""
use a thread pool instead of a new thread on every request
"""
# set up the threadpool
self.requests = Queue()
- for x in range(self.numThreads):
- t = threading.Thread(target = self.process_request_thread)
- t.setDaemon(1)
- t.start()
+ for _ in range(self.numThreads):
+ thread = threading.Thread(target=self.process_request_thread)
+ thread.setDaemon(1)
+ thread.start()
# server main loop
while True:
self.handle_request()
-
+
self.server_close()
-
def process_request_thread(self):
"""
obtain request from queue instead of directly from server socket
"""
while True:
- SocketServer.ThreadingMixIn.process_request_thread(self, *self.requests.get())
+ socketserver.ThreadingMixIn.process_request_thread(
+ self, *self.requests.get())
-
def handle_request(self):
"""
simply collect requests and put them on the queue for the workers.
if self.verify_request(request, client_address):
self.requests.put((request, client_address))
+
class ThreadedServer(ThreadPoolMixIn, SecureXMLRPCServer):
pass
git://git.onelab.eu / sfa.git / blobdiff