Changeset 0a47d52 for fedd/fedd.py

Timestamp:

Jul 1, 2008 10:39:43 AM (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:

bb3769a

Parents:

329f61d

Message:

XMLRPC proxy from SOAP and XML

File:

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

fedd/fedd.py

@@ -43 +43 @@
     def send_fault(self, f, code=500):
         """Send a SOAP encoded fault as reply"""
-        self.send_xml(f.AsSOAP(), code)
+        self.send_xml(f.AsSOAP(processContents="lax"), code)
 
     def check_headers(self, ps):
@@ -72 +72 @@
             ps = ParsedSoap(data)
         except ParseException, e:
-            self.send_fault(FaultFromZSIException(e))
+            self.send_fault(Fault(Fault.Client, str(e)))
             return
         except Exception, e:
@@ -108 +108 @@
         resp = None
         data = None
+        method = 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
-
+            params, method = xmlrpclib.loads(data)
+        except xmlrpclib.ResponseError:
+            data = xmlrpclib.dumps(xmlrpclib.Fault("Client", 
+                "Malformed request"), methodresponse=True)
+        
+        if method != None:
+            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)