X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FAPI.py;h=5c06848540f7da11c21bbda111a4db1a893aba5b;hb=3cd5698730c2fbf91b43ab65938559a43e8be003;hp=a42e6c93af42495bd849bd18242112ac41edde9f;hpb=663a5d604bc5e96c77c62e9fdd9da66842d12589;p=plcapi.git

diff --git a/PLC/API.py b/PLC/API.py
index a42e6c9..5c06848 100644
--- a/PLC/API.py
+++ b/PLC/API.py
@@ -5,22 +5,55 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 #
 # Copyright (C) 2004-2006 The Trustees of Princeton University
-# $Id: API.py,v 1.4 2006/10/13 20:00:21 mlhuang Exp $
+# $Id: API.py,v 1.8 2007/01/05 16:09:09 tmack Exp $
 #
 
 import sys
 import traceback
+import string
 
 import xmlrpclib
 
-def dump(self, value, write):
+# See "2.2 Characters" in the XML specification:
+#
+# #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
+# avoiding
+# [#x7F-#x84], [#x86-#x9F], [#xFDD0-#xFDDF]
+
+invalid_xml_ascii = map(chr, range(0x0, 0x8) + [0xB, 0xC] + range(0xE, 0x1F))
+xml_escape_table = string.maketrans("".join(invalid_xml_ascii), "?" * len(invalid_xml_ascii))
+
+def xmlrpclib_escape(s, replace = string.replace):
+    """
+    xmlrpclib does not handle invalid 7-bit control characters. This
+    function augments xmlrpclib.escape, which by default only replaces
+    '&', '<', and '>' with entities.
+    """
+
+    # This is the standard xmlrpclib.escape function
+    s = replace(s, "&", "&amp;")
+    s = replace(s, "<", "&lt;")
+    s = replace(s, ">", "&gt;",)
+
+    # Replace invalid 7-bit control characters with '?'
+    return s.translate(xml_escape_table)
+
+def xmlrpclib_dump(self, value, write):
     """
     xmlrpclib cannot marshal instances of subclasses of built-in
     types. This function overrides xmlrpclib.Marshaller.__dump so that
     any value that is an instance of one of its acceptable types is
     marshalled as that type.
+
+    xmlrpclib also cannot handle invalid 7-bit control characters. See
+    above.
     """
 
+    # Use our escape function
+    args = [self, value, write]
+    if isinstance(value, (str, unicode)):
+        args.append(xmlrpclib_escape)
+
     try:
         # Try for an exact match first
         f = self.dispatch[type(value)]
@@ -28,14 +61,14 @@ def dump(self, value, write):
         # Try for an isinstance() match
         for Type, f in self.dispatch.iteritems():
             if isinstance(value, Type):
-                f(self, value, write)
+                f(*args)
                 return
         raise TypeError, "cannot marshal %s objects" % type(value)
     else:
-        f(self, value, write)        
+        f(*args)
 
 # You can't hide from me!
-xmlrpclib.Marshaller._Marshaller__dump = dump
+xmlrpclib.Marshaller._Marshaller__dump = xmlrpclib_dump
 
 # SOAP support is optional
 try:
@@ -48,7 +81,6 @@ except ImportError:
     SOAPpy = None
 
 from PLC.Config import Config
-from PLC.PostgreSQL import PostgreSQL
 from PLC.Faults import *
 import PLC.Methods
 
@@ -64,12 +96,14 @@ class PLCAPI:
 
         # Load configuration
         self.config = Config(config)
-
-        # Initialize database connection
+	
+	# Initialize database connection
         if self.config.PLC_DB_TYPE == "postgresql":
+            from PLC.PostgreSQL import PostgreSQL
             self.db = PostgreSQL(self)
+
         else:
-            raise PLCAPIError, "Unsupported database type " + config.PLC_DB_TYPE
+            raise PLCAPIError, "Unsupported database type " + self.config.PLC_DB_TYPE
 
     def callable(self, method):
         """