Allowed compressed result file upload fescobar#149 using two approach…

…es :

- using formdata
- using application/zip and body

allure-docker-api-usage/send_results.sh

@@ -22,6 +22,10 @@ done
 set -o xtrace
 echo "------------------SEND-RESULTS------------------"
 curl -X POST "$ALLURE_SERVER/allure-docker-service/send-results?project_id=$PROJECT_ID" -H 'Content-Type: multipart/form-data' $FILES -ik
+# send archived allure-results files with form-data
+#curl -X POST "$ALLURE_SERVER/allure-docker-service/send-results?project_id=$PROJECT_ID" -H 'Content-Type: multipart/form-data' "-F zip=allure-results-example/allure-results-example.zip" -ik
+# send archived allure-results as body
+#curl -X POST "$ALLURE_SERVER/allure-docker-service/send-results?project_id=$PROJECT_ID" -H 'Content-Type: application/zip' --data-binary @'allure-results-example/allure-results-example.zip' -ik
 
 
 #If you want to generate reports on demand use the endpoint `GET /generate-report` and disable the Automatic Execution >> `CHECK_RESULTS_EVERY_SECONDS: NONE`

allure-docker-api/app.py

@@ -860,13 +860,14 @@ def send_results_endpoint(): #pylint: disable=too-many-branches
 
         content_type = str(request.content_type)
         if content_type is None:
-            raise Exception("Header 'Content-Type' should start with 'application/json' or 'multipart/form-data'") #pylint: disable=line-too-long
+            raise Exception("Header 'Content-Type' should start with 'application/json' or 'multipart/form-data' or 'application/zip'") #pylint: disable=line-too-long
 
         if (
                 content_type.startswith('application/json') is False and
+                content_type.startswith('application/zip') is False and
                 content_type.startswith('multipart/form-data') is False
             ):
-            raise Exception("Header 'Content-Type' should start with 'application/json' or 'multipart/form-data'") #pylint: disable=line-too-long
+            raise Exception("Header 'Content-Type' should start with 'application/json' or 'multipart/form-data' or 'application/zip'") #pylint: disable=line-too-long
 
         project_id = resolve_project(request.args.get('project_id'))
         if is_existent_project(project_id) is False:
@@ -897,8 +898,14 @@ def send_results_endpoint(): #pylint: disable=too-many-branches
             send_json_results(results_project, validated_results, processed_files, failed_files)
 
         if content_type.startswith('multipart/form-data') is True:
-            validated_results = validate_files_array(request.files.getlist('files[]'))
-            send_files_results(results_project, validated_results, processed_files, failed_files)
+            if request.files.getlist('files[]'): 
+                validated_results = validate_files_array(request.files.getlist('files[]'))
+                send_files_results(results_project, validated_results, processed_files, failed_files)
+            elif request.files.get('zip'):
+                extract_zipped_file_to_result(results_project, request.files.get('zip'), processed_files, failed_files)
+
+        if content_type.startswith('application/zip') is True:
+            extract_raw_zip_to_result(results_project, request.stream, processed_files, failed_files)
 
         failed_files_count = len(failed_files)
         if failed_files_count > 0:
@@ -1533,6 +1540,44 @@ def validate_json_results(results):
 
     return validated_results
 
+
+def extract_raw_zip_to_result(results_project, stream, processed_files, failed_files):
+    archive = tempfile.NamedTemporaryFile()
+    try:
+        chunk_size = 4096
+        while True:
+            chunk = stream.read(chunk_size)
+            if len(chunk) == 0:
+                break
+            archive.write(chunk)
+
+        with zipfile.ZipFile(archive, "r") as zip_ref:
+            zip_ref.extractall(results_project)
+
+        processed_files.append("allure-results.zip")
+    except Exception as ex:
+        LOGGER.error("Error occurred during saving allure zip archive '%s': %s", archive.name, str(ex))
+        failed_files.append("allure-results.zip")
+    finally:
+        archive.close()
+
+
+def extract_zipped_file_to_result(results_project, file, processed_files, failed_files):
+    filename = secure_filename(file.filename)
+    archive = tempfile.NamedTemporaryFile()
+    try:
+        file.save(archive)
+
+        with zipfile.ZipFile(archive, "r") as zip_ref:
+            zip_ref.extractall(results_project)
+
+        processed_files.append(filename)
+    except Exception as ex:
+        LOGGER.error("Error occurred during saving allure zip archive %s : %s", filename, str(ex))
+        failed_files.append(filename)
+    finally:
+        archive.close()
+
 def send_files_results(results_project, validated_results, processed_files, failed_files):
     for file in validated_results:
         try:

allure-docker-api/static/swagger/swagger.json

@@ -141,7 +141,8 @@
             "summary":"Send results files (from version 2.12.1)",
             "consumes":[
                "application/json",
-               "multipart/form-data"
+               "multipart/form-data",
+               "application/zip"
             ],
             "parameters":[
                {
@@ -189,6 +190,12 @@
                      "schema":{
                         "$ref":"#/components/schemas/files"
                      }
+                  },
+                  "application/zip": {
+                     "schema": {
+                        "type": "string",
+                        "format": "binary"
+                     }
                   }
                }
             },
@@ -773,13 +780,17 @@
          },
          "files":{
             "type":"object",
-            "properties":{
+            "properties": {
                "files[]":{
                   "type":"array",
                   "items":{
                      "type":"string",
                      "format":"binary"
                   }
+               },
+               "zip": {
+                  "type": "string",
+                  "format": "binary"
                }
             }
          }