updated upload method

Author: amit-62

fri/server/main.py

@@ -17,7 +17,7 @@
 @app.route('/upload/<dir>', methods=['POST'])
 def upload(dir):
     apikey = request.args.get('apikey')
-    dirname = dir + "_" + apikey
+    dirname = secure_filename(dir) + "_" + apikey
 
     if 'files[]' not in request.files:
         resp = jsonify({'message': 'No file in the request'})
@@ -62,10 +62,10 @@ def upload(dir):
 def build(dir):
     graphml_file = request.args.get('fetch')  
     apikey = request.args.get('apikey') 
-    dirname = dir + "_" + apikey   
+    dirname = secure_filename(dir) + "_" + apikey   
     makestudy_dir = dirname + "/" + graphml_file   #for makestudy
     dir_path = os.path.abspath(os.path.join(concore_path, graphml_file)) #path for ./build
-    if not os.path.exists(secure_filename(dir_path)):
+    if not os.path.exists(dir_path):
         proc = call(["./makestudy", makestudy_dir], cwd=concore_path)
         if(proc == 0):
             resp = jsonify({'message': 'Directory successfully created'})
@@ -79,6 +79,7 @@ def build(dir):
 
 @app.route('/debug/<dir>', methods=['POST'])
 def debug(dir):
+    dir = secure_filename(dir)
     dir_path = os.path.abspath(os.path.join(concore_path, dir))
     proc = call(["./debug"], cwd=dir_path)
     if(proc == 0):
@@ -93,6 +94,7 @@ def debug(dir):
 
 @app.route('/run/<dir>', methods=['POST'])
 def run(dir):
+    dir = secure_filename(dir)
     dir_path = os.path.abspath(os.path.join(concore_path, dir))
     proc = call(["./run"], cwd=dir_path)
     if(proc == 0):
@@ -106,6 +108,7 @@ def run(dir):
 
 @app.route('/stop/<dir>', methods=['POST'])
 def stop(dir):
+    dir = secure_filename(dir)
     dir_path = os.path.abspath(os.path.join(concore_path, dir))
     proc = call(["./stop"], cwd=dir_path)
     if(proc == 0):
@@ -120,6 +123,7 @@ def stop(dir):
 
 @app.route('/clear/<dir>', methods=['POST'])
 def clear(dir):
+    dir = secure_filename(dir)
     dir_path = os.path.abspath(os.path.join(concore_path, dir))
     proc = call(["./clear"], cwd=dir_path)
     if(proc == 0):
@@ -131,20 +135,17 @@ def clear(dir):
         resp.status_code = 500
         return resp
 
-# to download /download/<dir>?fetch=<downloadfile>. For example, /download/test?fetch=example.py.out&apikey=xyz
+# to download /download/<dir>?fetch=<downloadfile>. For example, /download/test?fetchDir=xyz&fetch=u
 @app.route('/download/<dir>', methods=['POST', 'GET'])
 def download(dir):
     download_file = request.args.get('fetch')
-    apikey = request.args.get('apikey')
-    dirname = dir + "_" + apikey
-    directory_name = os.path.abspath(os.path.join(concore_path, secure_filename(dirname)))
-
-
-    if not os.path.exists(secure_filename(dirname)):
+    sub_folder = request.args.get('fetchDir')
+    dirname = secure_filename(dir) + "/" + secure_filename(sub_folder)
+    directory_name = os.path.abspath(os.path.join(concore_path, dirname))
+    if not os.path.exists(directory_name):
         resp = jsonify({'message': 'Directory not found'})
         resp.status_code = 400
         return resp
-
     try:
         return send_from_directory(directory_name, download_file, as_attachment=True)
     except:
@@ -155,6 +156,7 @@ def download(dir):
 
 @app.route('/destroy/<dir>', methods=['DELETE'])
 def destroy(dir):
+    dir = secure_filename(dir)
     proc = call(["./destroy", dir], cwd=concore_path)
     if(proc == 0):
         resp = jsonify({'message': 'Successfuly deleted Dirctory'})
@@ -167,7 +169,9 @@ def destroy(dir):
 
 @app.route('/getFilesList/<dir>', methods=['POST'])
 def getFilesList(dir):
-    dir_path = os.path.abspath(os.path.join(concore_path, dir))
+    sub_dir = request.args.get('fetch')
+    dirname = secure_filename(dir) + "/" + secure_filename(sub_dir)
+    dir_path = os.path.abspath(os.path.join(concore_path, dirname))
     res = []
     res = os.listdir(dir_path) 
     res = json.dumps(res)  

fri/test.py

@@ -8,22 +8,14 @@
 
 def upload(files):
   url = "http://127.0.0.1:5000/upload/test?apikey=xyz"
-
   payload={}
-  # files=[
-  #   ('files[]',('example.py',open(path,'rb'),'application/octet-stream'))
-  # ]
   headers = {}
-
   response = requests.request("POST", url, headers=headers, data=payload, files=files)
-
   print(response.text)
 
 
 # # *******
 
-
-
 # function to check build
 def build(dir, graphml, apikey):
   url = "http://127.0.0.1:5000/build/"+dir+"?"+"fetch="+graphml+"&"+"apikey="+apikey
@@ -60,8 +52,8 @@ def destroy(dir):
 
   print(response.text)  
 
-def getFilesList(dir):
-  url = "http://127.0.0.1:5000/getFilesList/" + dir
+def getFilesList(dir, sub_dir = ""):
+  url = "http://127.0.0.1:5000/getFilesList/" + dir + "?"+"fetch="+sub_dir
   response = requests.request("POST", url)
   print(response.text) 
 
@@ -71,29 +63,45 @@ def openJupyter():
   print(response.text)
 
 # function to test download() method.
-def download():
-  url = "http://127.0.0.1:5000/download/test?fetch=f1.txt&apikey=xyz"
-  urllib.request.urlretrieve(url, "f1.txt")
+def download(dir, subDir, fileName ):
+  url = "http://127.0.0.1:5000/download/"+dir+"?"+"fetchDir="+subDir+"&"+"fetch="+ fileName
+  urllib.request.urlretrieve(url, fileName)
 
 # file list to be uploaded
+cur_path = os.path.dirname(os.path.abspath(__file__))
+demo_path = os.path.abspath(os.path.join(cur_path, '../demo'))
+file_name1 = "controller.py"
+file_name2 = "pm.py"
+file_name3 = "sample1.graphml"
+path_file1 = demo_path + "/" +file_name1
+path_file2 = demo_path + "/" +file_name2
+path_file3 = demo_path + "/" +file_name3
 files=[
   #('files[]',(file_name,open(file_path,'rb'),'application/octet-stream'))
-  ('files[]',('controller.py',open('/home/amit/Desktop/test_xyz/controller.py','rb'),'application/octet-stream')),
-  ('files[]',('pm.py',open('/home/amit/Desktop/test_xyz/pm.py','rb'),'application/octet-stream')),
-  ('files[]',('sample1.graphml',open('/home/amit/Desktop/test_xyz/sample1.graphml','rb'),'application/octet-stream')),
-  # ('files[]',('example.py',open('/home/amit/Desktop/fri/example.py','rb'),'application/octet-stream'))
+  ('files[]',(file_name1,open(path_file1,'rb'),'application/octet-stream')),
+  ('files[]',(file_name2,open(path_file2,'rb'),'application/octet-stream')),
+  ('files[]',(file_name3,open(path_file3,'rb'),'application/octet-stream')),
 ]
 
 
-# upload(files)
-# build("test", "sample1", "xyz")
-# time.sleep(6)
-# debug("sample1")
-# run("sample1")
-# clear("sample1")
-# stop("sample1")
-# getFilesList("sample1")
-# destroy("sample1")
-# openJupyter()
-# download()
+upload(files)
+time.sleep(2)
+build("test", "sample1", "xyz")
+time.sleep(6)
+method = input("methods - 1 for debug, 0 for run :")
+if method == 1:
+  debug("sample1")
+else:  
+  run("sample1")
+time.sleep(2)  
+stop("sample1")
+time.sleep(2) 
+getFilesList("sample1", "cu")
+getFilesList("sample1", "pym") 
+time.sleep(5)
+download("sample1", "cu", "u")
+clear("sample1")
+destroy("sample1")
+openJupyter()
+