remove paramiko and cryptography 05/88605/1
authormaopengzhang <zhang.maopeng1@zte.com.cn>
Tue, 28 May 2019 08:45:53 +0000 (16:45 +0800)
committermaopengzhang <zhang.maopeng1@zte.com.cn>
Tue, 28 May 2019 08:45:53 +0000 (16:45 +0800)
Fro security reason, paramiko and cryptography should be removed

Change-Id: Ie464a2eeebbd12fbac97d75845c68adc7bbd64f9
Issue-ID: VFC-1400
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
genericparser/pub/utils/toscaparsers/basemodel.py
requirements.txt

index 2b21456..0110df9 100644 (file)
@@ -20,7 +20,7 @@ import re
 import shutil
 import urllib
 
-import paramiko
+import paramiko
 from toscaparser.tosca_template import ToscaTemplate
 from toscaparser.properties import Property
 from toscaparser.functions import Function, Concat, GetInput, get_function, function_mappings
@@ -167,17 +167,17 @@ class BaseInfoModel(object):
             self.ftp_get(userName, userPwd, hostIp, hostPort, remoteFileName, localFileName)
         return localFileName
 
-    def sftp_get(self, userName, userPwd, hostIp, hostPort, remoteFileName, localFileName):
-        # return
-        t = None
-        try:
-            t = paramiko.Transport(hostIp, int(hostPort))
-            t.connect(username=userName, password=userPwd)
-            sftp = paramiko.SFTPClient.from_transport(t)
-            sftp.get(remoteFileName, localFileName)
-        finally:
-            if t is not None:
-                t.close()
+    def sftp_get(self, userName, userPwd, hostIp, hostPort, remoteFileName, localFileName):
+        # return
+        t = None
+        try:
+            t = paramiko.Transport(hostIp, int(hostPort))
+            t.connect(username=userName, password=userPwd)
+            sftp = paramiko.SFTPClient.from_transport(t)
+            sftp.get(remoteFileName, localFileName)
+        finally:
+            if t is not None:
+                t.close()
 
     def ftp_get(self, userName, userPwd, hostIp, hostPort, remoteFileName, localFileName):
         f = None
index 3787297..1c96626 100644 (file)
@@ -21,8 +21,8 @@ mock==2.0.0
 unittest_xml_reporting==1.12.0
 
 # for parser
-cryptography==2.0.3
-paramiko==2.0.2
+cryptography==2.0.3
+paramiko==2.0.2
 nfv-toscaparser==1.1.2.dev1
 
 # for auto swagger