Changeset 329f61d for fedd/fedd.py

Timestamp:

Jun 27, 2008 6:34:17 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

0a47d52

Parents:

4f4b977

Message:

basic XMLRPC

File:

• fedd/fedd.py (modified) (8 diffs)

fedd/fedd.py

@@ -10 +10 @@
 from M2Crypto import SSL
 from M2Crypto.SSL.SSLServer import SSLServer
+import xmlrpclib
 
 from optparse import OptionParser
@@ -27 +28 @@
         self.impl = impl
 
-class fedd_handler(BaseHTTPRequestHandler):
+class fedd_soap_handler(BaseHTTPRequestHandler):
     server_version = "ZSI/2.0 fedd/0.1 " + BaseHTTPRequestHandler.server_version
-
-    namespace = 'http://www.isi.edu/faber/fedd.wsdl'
-    methods = {
-            'RequestAccess': 'soap_RequestAccess',
-            }
 
 
@@ -59 +55 @@
         """Confirm that this class implements the namespace and SOAP method"""
         root = ps.body_root
-        if root.namespaceURI != fedd_handler.namespace:
+        if root.namespaceURI != self.server.impl.soap_namespace:
             self.send_fault(Fault(Fault.Client, 
                 'Unknown namespace "%s"' % root.namespaceURI))
             return False
-        if not fedd_handler.methods.has_key(root.localName):
-            self.send_fault(Fault(Fault.Client, 'Unknown operation "%s"' % \
-                    root.localName))
+
+        if getattr(root, 'localName', None) == None:
+            self.send_fault(Fault(Fault.Client, 'No method"'))
             return False
         return True
@@ -84 +80 @@
         if not self.check_method(ps): return
         try:
-            # We know this will work because check_method passed above
-            method = getattr(self.server.impl,
-                    fedd_handler.methods[ps.body_root.localName])
-            resp = method(ps, fedid(cert=self.request.get_peer_cert()))
+            resp = self.server.impl.soap_dispatch(ps.body_root.localName, ps,
+                    fedid(cert=self.request.get_peer_cert()))
         except Fault, f:
             self.send_fault(f)
@@ -97 +91 @@
             self.send_xml(str(sw))
 
+class fedd_xmlrpc_handler(BaseHTTPRequestHandler):
+    server_version = "ZSI/2.0 fedd/0.1 " + BaseHTTPRequestHandler.server_version
+
+    def send_xml(self, text, code=200):
+        """Send an XML document as reply"""
+        self.send_response(code)
+        self.send_header('Content-type', 'text/xml; charset="utf-8"')
+        self.send_header('Content-Length', str(len(text)))
+        self.end_headers()
+        self.wfile.write(text)
+        self.wfile.flush()
+
+    def do_POST(self):
+        """Treat an HTTP POST request as an XMLRPC service call"""
+
+        resp = None
+        data = None
+        cl = int(self.headers['content-length'])
+        data = self.rfile.read(cl)
+        params, method = xmlrpclib.loads(data)
+
+        try:
+            resp = self.server.impl.xmlrpc_dispatch(method, params,
+                        fedid(cert=self.request.get_peer_cert()))
+            data = xmlrpclib.dumps((resp,), methodresponse=True)
+        except Fault, f:
+            xf = xmlrpclib.Fault(f.code, f.string)
+            data = xmlrpclib.dumps(xf, methodresponse=True)
+            resp = None
+        except xmlrpclib.Fault, f:
+            data = xmlrpclib.dumps(f, methodresponse=True)
+            resp = None
+
+        self.send_xml(data)
+
+
 class fedd_opts(OptionParser):
     """Encapsulate option processing in this class, rather than in main"""
@@ -103 +133 @@
                 version="0.1")
 
-        self.set_defaults(host="localhost", port=23235, debug=0)
+        self.set_defaults(host="localhost", port=23235, 
+                transport="soap",debug=0)
 
         self.add_option("-d", "--debug", action="count", dest="debug", 
@@ -113 +144 @@
         self.add_option("-p", "--port", action="store", type="int",
                 dest="port", help="Port to listen on (default %default)")
+        self.add_option("-x","--transport", action="store", type="choice",
+                choices=("xmlrpc", "soap"),
+                help="Transport for request (xmlrpc|soap) (Default: %default)")
         self.add_option("--trace", action="store_const", dest="tracefile", 
                 const=sys.stderr, help="Print SOAP exchange to stderr")
@@ -140 +174 @@
             raise
 
-s = fedd_server(SOAP_port, fedd_handler, ctx, impl)
+if opts.transport == "soap":
+    s = fedd_server(SOAP_port, fedd_soap_handler, ctx, impl)
+elif opts.transport == "xmlrpc":
+    s = fedd_server(SOAP_port, fedd_xmlrpc_handler, ctx, impl)
+else:
+    s = None
+
 s.serve_forever()