Merge lp:~toolpart/openerp-client-lib/xmlrpcs into lp:openerp-client-lib

[ViktorNagy]

Added secure xmlrpc (XML-RPC-S) connector.

[Nicolas Vanhoren (OpenERP) (niv-openerp)]

Ok, I will discuss this with the rest of the team and see if we merge this.

But, please, in the future could you avoid automatic formatters? It makes an ugly diff.

=== modified file 'openerplib/main.py'
--- openerplib/main.py	2011-09-22 15:45:57 +0000
+++ openerplib/main.py	2011-09-25 12:25:23 +0000
@@ -5,16 +5,16 @@
 # Copyright (C) 2011 Nicolas Vanhoren
 # Copyright (C) 2011 OpenERP s.a. (<http://openerp.com>).
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met: 
-# 
+# modification, are permitted provided that the following conditions are met:
+#
 # 1. Redistributions of source code must retain the above copyright notice, this
-# list of conditions and the following disclaimer. 
+# list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright notice,
 # this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution. 
-# 
+# and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -25,7 +25,7 @@
 # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
+#
 ##############################################################################
 
 """
@@ -36,7 +36,7 @@
 """
 
 import xmlrpclib
-import logging 
+import logging
 import socket
 
 try:
@@ -75,7 +75,7 @@
     A type of connector that uses the XMLRPC protocol.
     """
     PROTOCOL = 'xmlrpc'
-    
+
     __logger = _getChildLogger(_logger, 'connector.xmlrpc')
 
     def __init__(self, hostname, port=8069):
@@ -92,6 +92,18 @@
         service = xmlrpclib.ServerProxy(url)
         return getattr(service, method)(*args)
 
+class XmlRPCSConnector(XmlRPCConnector):
+    """
+    A type of connector that uses the secured XMLRPC protocol.
+    """
+    PROTOCOL = 'xmlrpcs'
+
+    __logger = _getChildLogger(_logger, 'connector.xmlrpcs')
+
+    def __init__(self, hostname, port=8071):
+        super(XmlRPCSConnector, self).__init__(hostname, port)
+        self.url = 'https://%s:%d/xmlrpc' % (self.hostname, self.port)
+
 class NetRPC_Exception(Exception):
     """
     Exception for NetRPC errors.
@@ -171,7 +183,7 @@
     """
 
     PROTOCOL = 'netrpc'
-    
+
     __logger = _getChildLogger(_logger, 'connector.netrpc')
 
     def __init__(self, hostname, port=8070):
@@ -202,7 +214,7 @@
         self.connector = connector
         self.service_name = service_name
         self.__logger = _getChildLogger(_getChildLogger(_logger, 'service'),service_name)
-        
+
     def __getattr__(self, method):
         """
         :param method: The name of the method to execute on the service.
@@ -259,7 +271,7 @@
         self.database, self.login, self.password = database, login, password
 
         self.user_id = user_id
-        
+
     def check_login(self, force=True):
         """
         Checks that the login information is valid. Throws an AuthenticationError if the
@@ -270,15 +282,15 @@
         """
         if self.user_id and not force:
             return
-        
+
         if not self.database or not self.login or self.password is None:
             raise AuthenticationError("Creditentials not provided")
-        
+
         self.user_id = self.get_service("common").login(self.database, self.login, self.password)
         if not self.user_id:
             raise AuthenticationError("Authentication failure")
         self.__logger.debug("Authenticated with user id %s", self.user_id)
-    
+
     def get_model(self, model_name):
         """
         Returns a Model instance to allow easy remote manipulation of an OpenERP model.
@@ -375,6 +387,8 @@
         port = 8069 if protocol=="xmlrpc" else 8070
     if protocol == "xmlrpc":
         return XmlRPCConnector(hostname, port)
+    elif protocol == "xmlrpcs":
+        return XmlRPCSConnector(hostname, port)
     elif protocol == "netrpc":
         return NetRPCConnector(hostname, port)
     else:
@@ -396,4 +410,4 @@
     already know it, in most cases you don't need to specify it.
     """
     return Connection(get_connector(hostname, protocol, port), database, login, password, user_id)
-        
+