# Mark Huang <mlhuang@cs.princeton.edu>
#
# Copyright (C) 2004-2006 The Trustees of Princeton University
-# $Id$
-# $URL$
#
+import os
import sys
import traceback
import string
import xmlrpclib
-import simplejson
# See "2.2 Characters" in the XML specification:
#
# 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))
+invalid_codepoints = range(0x0, 0x8) + [0xB, 0xC] + range(0xE, 0x1F)
+# broke with f24, somehow we get a unicode as an incoming string to be translated
+str_xml_escape_table = string.maketrans("".join((chr(x) for x in invalid_codepoints)),
+ "?" * len(invalid_codepoints))
+# loosely inspired from
+# http://stackoverflow.com/questions/1324067/how-do-i-get-str-translate-to-work-with-unicode-strings
+unicode_xml_escape_table = { invalid : u"?" for invalid in invalid_codepoints}
def xmlrpclib_escape(s, replace = string.replace):
"""
s = replace(s, ">", ">",)
# Replace invalid 7-bit control characters with '?'
- return s.translate(xml_escape_table)
+ if isinstance(s, str):
+ return s.translate(str_xml_escape_table)
+ else:
+ return s.translate(unicode_xml_escape_table)
+
+def test_xmlrpclib_escape():
+ inputs = [
+ # full ASCII
+ "".join( (chr(x) for x in range(128))),
+ # likewise but as a unicode string up to 256
+ u"".join( (unichr(x) for x in range(256))),
+ ]
+ for input in inputs:
+ print "==================== xmlrpclib_escape INPUT"
+ print type(input), '->', input
+ print "==================== xmlrpclib_escape OUTPUT"
+ print xmlrpclib_escape(input)
def xmlrpclib_dump(self, value, write):
"""
else:
raise PLCAPIError, "Unsupported database type " + self.config.PLC_DB_TYPE
- # Aspects modify the API injecting code before/after method
- # calls. As of now we only have aspects for OMF integration,
- # that's why we enable aspects only if PLC_OMF is set to true.
- if self.config.PLC_OMF_ENABLED:
- from aspects import apply_aspects; apply_aspects()
+ # Aspects modify the API by injecting code before, after or
+ # around method calls. -- http://github.com/baris/pyaspects/blob/master/README
+ #
+ if self.config.PLC_RATELIMIT_ENABLED:
+ from aspects import apply_ratelimit_aspect
+ apply_ratelimit_aspect()
+
+ if getattr(self.config, "PLC_NETCONFIG_ENABLED", False):
+ from aspects.netconfigaspects import apply_netconfig_aspect
+ apply_netconfig_aspect()
+
+ # Enable Caching. Only for GetSlivers for the moment.
+ # TODO: we may consider to do this in an aspect like the ones above.
+ try:
+ if self.config.PLC_GETSLIVERS_CACHE:
+ getslivers_cache = True
+ except AttributeError:
+ getslivers_cache = False
+
+ if getslivers_cache:
+ os.environ['DJANGO_SETTINGS_MODULE']='plc_django_settings'
+ from cache_utils.decorators import cached
+ from PLC.Methods.GetSlivers import GetSlivers
+
+ @cached(7200)
+ def cacheable_call(cls, auth, node_id_or_hostname):
+ return cls.raw_call(auth, node_id_or_hostname)
+
+ GetSlivers.call = cacheable_call
+
def callable(self, method):
"""
Handle a JSON request
"""
- method, args = simplejson.loads(data)
+ method, args = json.loads(data)
try:
result = self.call(source, method, *args)
except Exception, e:
result = str(e)
- return simplejson.dumps(result)
-
+ return json.dumps(result)
+# one simple unit test
+if __name__ == '__main__':
+ test_xmlrpclib_escape()