add aes support,diy salt

rfyiamcool · rfyiamcool · commit a9d3d6b12771 · 2015-11-12T16:14:44.000+08:00
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Version: 2.4
 
 Future:  
 1. &#32479;&#19968;&#37197;&#32622;&#37197;&#32622;&#25991;&#20214;  
-2. &#20351;&#29992;rsa&#20445;&#35777;rpc&#36890;&#20449;&#23433;&#20840; 
+2. &#20351;&#29992;rsa&#20445;&#35777;rpc&#36890;&#20449;&#23433;&#20840;  
 3. swift_rpc&#23436;&#21892;RQ&#24322;&#27493;&#20219;&#21153;&#38431;&#21015;  
 4. &#22686;&#21152;request json body&#30340;&#35782;&#21035;,&#22312;&#36825;&#22522;&#30784;&#19978;&#20570;&#23433;&#20840;&#30340;&#23553;&#35013;
 
diff --git a/config.py b/config.py
@@ -15,6 +15,8 @@
 REMOTE_IP_MODE = False
 REMOTE_ALLOW = ['']
 
+ENCRYPTION_AES= "123xiaorui456789"
+
 LOGCONFIG = {
     "version": 1,
     "disable_existing_loggers": False,
diff --git a/swift_rpc/server/handlers.py b/swift_rpc/server/handlers.py
@@ -42,11 +42,14 @@ def prepare(self):
     @gen.coroutine
     def args_kwargs(self):
         args = []
-      # support positional arguments
         if self.request.headers.get('Content-Type') == "application/json":
             de_string = self.request.body
-            if self.request.headers.get('Encryption') == "base64":
+            encryption = self.request.headers.get('Encryption')
+            if encryption == "base64":
                 de_string = base64.decodestring(self.request.body)
+            elif encryption == "aes":
+                salt = prpcrypt(self.config.ENCRYPTION_AES)
+                de_string = salt.decrypt(self.request.body)
             data = json.loads(de_string)
             args = data.get('args',[])
             kwargs = data.get('kwargs',{})

-Original file line number
+Diff line change
 Future:
 . 统一配置配置文件
 -2. 使用rsa保证rpc通信安全
 +2. 使用rsa保证rpc通信安全
 . swift_rpc完善RQ异步任务队列
 . 增加request json body的识别,在这基础上做安全的封装