swift_rpc client add base64 support

rfyiamcool · Nov 12, 2015 · b5135c2 · b5135c2
1 parent 97f29f7
commit b5135c2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/swift_rpc/client/__init__.py b/swift_rpc/client/__init__.py
@@ -1,20 +1,28 @@
 import json
+import base64
 import requests
 from urlparse import urljoin
 
 class _RPC(object):
-     __HEADERS__ = {'User-Agent': 'swift_rpc','Content-Type':'application/json'}
 
-     def __init__(self, server, name):
+     def __init__(self, server, name, encryption):
+        self.encryption = encryption
+        self.__HEADERS__ = {'User-Agent': 'swift_rpc','Content-Type':'application/json'}
+        if encryption:
+            self.__HEADERS__ = {'User-Agent': 'swift_rpc','Content-Type':'application/json','Encryption':encryption}
+
         self._name = name
         self._url = urljoin(server, name)
 
      def __call__(self, *args, **kwargs):
         params = {}
         params['args'] = args
         params['kwargs'] = kwargs
+        post_data = json.dumps(params)
+        if self.encryption:
+            post_data = base64.encodestring(post_data)
         try:
-            resp = requests.get(self._url, data=json.dumps(params), headers=self.__HEADERS__)
+            resp = requests.get(self._url, data=post_data, headers=self.__HEADERS__)
         except Exception as e:
             raise RPCClient.FailedCall(e)
 
@@ -43,7 +51,8 @@ class MissingMethod(Exception): pass
         '_getAttributeNames',
     ]
 
-    def __init__(self, server, unallowed_calls=[], load_remotes=True):
+    def __init__(self, server,encryption=None, unallowed_calls=[], load_remotes=True):
+        self.encryption = encryption
         if server.startswith('http'):
             self._server = server
         else:
@@ -53,7 +62,7 @@ def __init__(self, server, unallowed_calls=[], load_remotes=True):
             self.__loadremoteroutes()
 
     def __send(self, name):
-        return _RPC(self._server, name)
+        return _RPC(self._server, name, self.encryption)
 
     def __remoteroutes(self):
         return self._getroutes()

diff --git a/swift_rpc/server/handlers.py b/swift_rpc/server/handlers.py
@@ -46,7 +46,6 @@ def args_kwargs(self):
         if self.request.headers.get('Content-Type') == "application/json":
             de_string = self.request.body
             if self.request.headers.get('Encryption') == "base64":
-                print 123
                 de_string = base64.decodestring(self.request.body)
             data = json.loads(de_string)
             args = data.get('args',[])

diff --git a/test_client.py b/test_client.py
@@ -1,5 +1,5 @@
 from swift_rpc.client import RPCClient
 
-client = RPCClient('localhost:8080')
+client = RPCClient('localhost:8080',encryption='base64')
 print client.test('hi')
 print client.test_args('welcome','xiaorui.cc',name='nima')