API tests

framework/python/src/api/api.py

@@ -433,7 +433,7 @@ async def delete_report(self, request: Request, response: Response):
 
     if len(body_raw) == 0:
       response.status_code = 400
-      return self._generate_msg(False, "Invalid request received")
+      return self._generate_msg(False, "Invalid request received, missing body")
 
     try:
       body_json = json.loads(body_raw)
@@ -445,12 +445,18 @@ async def delete_report(self, request: Request, response: Response):
 
     if "mac_addr" not in body_json or "timestamp" not in body_json:
       response.status_code = 400
-      return self._generate_msg(False, "Invalid request received")
+      return self._generate_msg(False, "Missing mac address or timestamp")
 
     mac_addr = body_json.get("mac_addr").lower()
     timestamp = body_json.get("timestamp")
-    parsed_timestamp = datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S")
-    timestamp_formatted = parsed_timestamp.strftime("%Y-%m-%dT%H:%M:%S")
+
+    try:
+      parsed_timestamp = datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S")
+      timestamp_formatted = parsed_timestamp.strftime("%Y-%m-%dT%H:%M:%S")
+
+    except ValueError:
+      response.status_code = 400
+      return self._generate_msg(False, "Incorrect timestamp format")
 
     # Get device from MAC address
     device = self._session.get_device(mac_addr)
@@ -541,7 +547,7 @@ async def save_device(self, request: Request, response: Response):
       )
 
       # Check if device folder exists
-      device_folder = os.path.join(self._test_run.get_root_dir(),
+      device_folder = os.path.join(self._testrun.get_root_dir(),
                                      DEVICES_PATH,
                                      device_json.get(DEVICE_MANUFACTURER_KEY) +
                                      " " +
@@ -647,6 +653,12 @@ async def edit_device(self, request: Request, response: Response):
   async def get_report(self, response: Response, device_name, timestamp):
     device = self._session.get_device_by_name(device_name)
 
+    # If the device not found
+    if device is None:
+      LOGGER.info("Device not found, returning 404")
+      response.status_code = 404
+      return self._generate_msg(False, "Device not found")
+
     # 1.3 file path
     file_path = os.path.join(
       DEVICES_PATH,
@@ -700,16 +712,34 @@ async def get_results(self, request: Request, response: Response, device_name,
       return self._generate_msg(False,
                                 "A device with that name could not be found")
 
-    file_path = self._get_testrun().get_test_orc().zip_results(
+    # Check if report exists (1.3 file path)
+    report_file_path = os.path.join(
+      DEVICES_PATH,
+      device_name,
+      "reports",
+      timestamp,"test",
+          device.mac_addr.replace(":",""))
+
+    if not os.path.isdir(report_file_path):
+      # pre 1.3 file path
+      report_file_path = os.path.join(DEVICES_PATH, device_name, "reports",
+                                                    timestamp)
+
+    if not os.path.isdir(report_file_path):
+      LOGGER.info("Report could not be found, returning 404")
+      response.status_code = 404
+      return self._generate_msg(False, "Report could not be found")
+
+    zip_file_path = self._get_testrun().get_test_orc().zip_results(
         device, timestamp, profile)
 
-    if file_path is None:
+    if zip_file_path is None:
       response.status_code = status.HTTP_500_INTERNAL_SERVER_ERROR
       return self._generate_msg(
           False, "An error occurred whilst archiving test results")
 
-    if os.path.isfile(file_path):
-      return FileResponse(file_path)
+    if os.path.isfile(zip_file_path):
+      return FileResponse(zip_file_path)
     else:
       LOGGER.info("Test results could not be found, returning 404")
       response.status_code = 404

framework/requirements.txt

@@ -21,8 +21,6 @@ pydantic==2.7.1
 # Requirements for testing
 pytest==7.4.4
 pytest-timeout==2.2.0
-responses==0.25.3
-
 
 # Requirements for the report
 markdown==3.5.2

testing/api/certificates/WR2.pem

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFCzCCAvOgAwIBAgIQf/AFoHxM3tEArZ1mpRB7mDANBgkqhkiG9w0BAQsFADBH
+MQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExM
+QzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwHhcNMjMxMjEzMDkwMDAwWhcNMjkwMjIw
+MTQwMDAwWjA7MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVR29vZ2xlIFRydXN0IFNl
+cnZpY2VzMQwwCgYDVQQDEwNXUjIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCp/5x/RR5wqFOfytnlDd5GV1d9vI+aWqxG8YSau5HbyfsvAfuSCQAWXqAc
++MGr+XgvSszYhaLYWTwO0xj7sfUkDSbutltkdnwUxy96zqhMt/TZCPzfhyM1IKji
+aeKMTj+xWfpgoh6zySBTGYLKNlNtYE3pAJH8do1cCA8Kwtzxc2vFE24KT3rC8gIc
+LrRjg9ox9i11MLL7q8Ju26nADrn5Z9TDJVd06wW06Y613ijNzHoU5HEDy01hLmFX
+xRmpC5iEGuh5KdmyjS//V2pm4M6rlagplmNwEmceOuHbsCFx13ye/aoXbv4r+zgX
+FNFmp6+atXDMyGOBOozAKql2N87jAgMBAAGjgf4wgfswDgYDVR0PAQH/BAQDAgGG
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/
+AgEAMB0GA1UdDgQWBBTeGx7teRXUPjckwyG77DQ5bUKyMDAfBgNVHSMEGDAWgBTk
+rysmcRorSCeFL1JmLO/wiRNxPjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAKG
+GGh0dHA6Ly9pLnBraS5nb29nL3IxLmNydDArBgNVHR8EJDAiMCCgHqAchhpodHRw
+Oi8vYy5wa2kuZ29vZy9yL3IxLmNybDATBgNVHSAEDDAKMAgGBmeBDAECATANBgkq
+hkiG9w0BAQsFAAOCAgEARXWL5R87RBOWGqtY8TXJbz3S0DNKhjO6V1FP7sQ02hYS
+TL8Tnw3UVOlIecAwPJQl8hr0ujKUtjNyC4XuCRElNJThb0Lbgpt7fyqaqf9/qdLe
+SiDLs/sDA7j4BwXaWZIvGEaYzq9yviQmsR4ATb0IrZNBRAq7x9UBhb+TV+PfdBJT
+DhEl05vc3ssnbrPCuTNiOcLgNeFbpwkuGcuRKnZc8d/KI4RApW//mkHgte8y0YWu
+ryUJ8GLFbsLIbjL9uNrizkqRSvOFVU6xddZIMy9vhNkSXJ/UcZhjJY1pXAprffJB
+vei7j+Qi151lRehMCofa6WBmiA4fx+FOVsV2/7R6V2nyAiIJJkEd2nSi5SnzxJrl
+Xdaqev3htytmOPvoKWa676ATL/hzfvDaQBEcXd2Ppvy+275W+DKcH0FBbX62xevG
+iza3F4ydzxl6NJ8hk8R+dDXSqv1MbRT1ybB5W0k8878XSOjvmiYTDIfyc9acxVJr
+Y/cykHipa+te1pOhv7wYPYtZ9orGBV5SGOJm4NrB3K1aJar0RfzxC3ikr7Dyc6Qw
+qDTBU39CluVIQeuQRgwG3MuSxl7zRERDRilGoKb8uY45JzmxWuKxrfwT/478JuHU
+/oTxUFqOl2stKnn7QGTq8z29W+GgBLCXSBxC9epaHM0myFH/FJlniXJfHeytWt0=
+-----END CERTIFICATE-----

testing/api/certificates/crt.pem

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFVzCCAz+gAwIBAgINAgPlk28xsBNJiGuiFzANBgkqhkiG9w0BAQwFADBHMQsw
+CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEU
+MBIGA1UEAxMLR1RTIFJvb3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAw
+MDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZp
+Y2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx9vaMf/vo
+27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7w
+Cl7raKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjw
+TcLCeoiKu7rPWRnWr4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0Pfybl
+qAj+lug8aJRT7oM6iCsVlgmy4HqMLnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaH
+szVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly4cpk9+aCEI3oncKKiPo4Zor8
+Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr06zqkUspzBmk
+MiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
+wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70p
+aDPvOmbsB4om3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrN
+VjzRlwW5y0vtOUucxD/SVRNuJLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQID
+AQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEMBQADggIBAJ+qQibb
+C5u+/x6Wki4+omVKapi6Ist9wTrYggoGxval3sBOh2Z5ofmmWJyq+bXmYOfg6LEe
+QkEzCzc9zolwFcq1JKjPa7XSQCGYzyI0zzvFIoTgxQ6KfF2I5DUkzps+GlQebtuy
+h6f88/qBVRRiClmpIgUxPoLW7ttXNLwzldMXG+gnoot7TiYaelpkttGsN/H9oPM4
+7HLwEXWdyzRSjeZ2axfG34arJ45JK3VmgRAhpuo+9K4l/3wV3s6MJT/KYnAK9y8J
+ZgfIPxz88NtFMN9iiMG1D53Dn0reWVlHxYciNuaCp+0KueIHoI17eko8cdLiA6Ef
+MgfdG+RCzgwARWGAtQsgWSl4vflVy2PFPEz0tv/bal8xa5meLMFrUKTX5hgUvYU/
+Z6tGn6D/Qqc6f1zLXbBwHSs09dR2CQzreExZBfMzQsNhFRAbd03OIozUhfJFfbdT
+6u9AWpQKXCBfTkBdYiJ23//OYb2MI3jSNwLgjt7RETeJ9r/tSQdirpLsQBqvFAnZ
+0E6yove+7u7Y/9waLd64NnHi/Hm3lCXRSHNboTXns5lndcEZOitHTtNCjv0xyBZm
+2tIMPNuzjsmhDYAPexZ3FL//2wmUspO8IFgV6dtxQ/PeEMMA3KgqlbbC1j+Qa3bb
+bP6MvPJwNQzcmRk13NfIRmPVNnGuV/u3gm3c
+-----END CERTIFICATE-----

testing/api/certificates/invalid.pem

@@ -0,0 +1 @@
+

testing/api/certificates/invalidname1234567891234.pem

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFVzCCAz+gAwIBAgINAgPlk28xsBNJiGuiFzANBgkqhkiG9w0BAQwFADBHMQsw
+CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEU
+MBIGA1UEAxMLR1RTIFJvb3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAw
+MDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZp
+Y2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx9vaMf/vo
+27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7w
+Cl7raKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjw
+TcLCeoiKu7rPWRnWr4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0Pfybl
+qAj+lug8aJRT7oM6iCsVlgmy4HqMLnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaH
+szVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly4cpk9+aCEI3oncKKiPo4Zor8
+Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr06zqkUspzBmk
+MiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
+wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70p
+aDPvOmbsB4om3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrN
+VjzRlwW5y0vtOUucxD/SVRNuJLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQID
+AQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEMBQADggIBAJ+qQibb
+C5u+/x6Wki4+omVKapi6Ist9wTrYggoGxval3sBOh2Z5ofmmWJyq+bXmYOfg6LEe
+QkEzCzc9zolwFcq1JKjPa7XSQCGYzyI0zzvFIoTgxQ6KfF2I5DUkzps+GlQebtuy
+h6f88/qBVRRiClmpIgUxPoLW7ttXNLwzldMXG+gnoot7TiYaelpkttGsN/H9oPM4
+7HLwEXWdyzRSjeZ2axfG34arJ45JK3VmgRAhpuo+9K4l/3wV3s6MJT/KYnAK9y8J
+ZgfIPxz88NtFMN9iiMG1D53Dn0reWVlHxYciNuaCp+0KueIHoI17eko8cdLiA6Ef
+MgfdG+RCzgwARWGAtQsgWSl4vflVy2PFPEz0tv/bal8xa5meLMFrUKTX5hgUvYU/
+Z6tGn6D/Qqc6f1zLXbBwHSs09dR2CQzreExZBfMzQsNhFRAbd03OIozUhfJFfbdT
+6u9AWpQKXCBfTkBdYiJ23//OYb2MI3jSNwLgjt7RETeJ9r/tSQdirpLsQBqvFAnZ
+0E6yove+7u7Y/9waLd64NnHi/Hm3lCXRSHNboTXns5lndcEZOitHTtNCjv0xyBZm
+2tIMPNuzjsmhDYAPexZ3FL//2wmUspO8IFgV6dtxQ/PeEMMA3KgqlbbC1j+Qa3bb
+bP6MvPJwNQzcmRk13NfIRmPVNnGuV/u3gm3c
+-----END CERTIFICATE-----

testing/api/profiles/new_profile.json

@@ -2,10 +2,6 @@
     "name": "New Profile",
     "status": "Valid",
     "questions": [
-      {
-        "question": "What type of device is this?",
-        "answer": "IoT Gateway"
-      },
       {
         "question": "How will this device be used at Google?",
         "answer": "Monitoring"
@@ -18,17 +14,11 @@
         "question": "Will the third-party device administrator be able to grant access to authorized Google personnel upon request?",
         "answer": "N/A"
       },
-      {
-        "question": "Are any of the following statements true about your device?",
-        "answer": [
-          0
-        ]
-      },
       {
         "question": "Which of the following statements are true about this device?",
         "answer": [
           0
-        ]
+      ]
       },
       {
         "question": "Does the network protocol assure server-to-client identity verification?",
@@ -38,7 +28,7 @@
         "question": "Click the statements that best describe the characteristics of this device.",
         "answer": [
           0
-        ]
+      ]
       },
       {
         "question": "Are any of the following statements true about this device?",

testing/api/profiles/new_profile_2.json

@@ -2,55 +2,35 @@
     "name": "New Profile 2",
     "status": "Draft",
     "questions": [
-        {
-            "question": "What type of device is this?",
-            "answer": "IoT Gateway"
-        },
-        {
-            "question": "How will this device be used at Google?",
-            "answer": "Installed in a building"
-        },
-        {
-            "question": "Is this device going to be managed by Google or a third party?",
-            "answer": "Google"
-        },
-        {
-            "question": "Will the third-party device administrator be able to grant access to authorized Google personnel upon request?",
-            "answer": "Yes"
-        },
-        {
-            "question": "Are any of the following statements true about your device?",
-            "answer": [
-                0,
-                2
-            ]
-        },
-        {
-            "question": "Which of the following statements are true about this device?",
-            "answer": [
-                0,
-                1,
-                5
-            ]
-        },
-        {
-            "question": "Does the network protocol assure server-to-client identity verification?",
-            "answer": "Yes"
-        },
-        {
-            "question": "Click the statements that best describe the characteristics of this device.",
-            "answer": [
-                0,
-                1,
-                2
-            ]
-        },
-        {
-            "question": "Are any of the following statements true about this device?",
-            "answer": [
-                2,
-                3
-            ]
-        }
+    {
+      "question": "How will this device be used at Google?",
+      "answer": "Monitoring"
+    },
+    {
+      "question": "Is this device going to be managed by Google or a third party?",
+      "answer": "Google"
+    },
+    {
+      "question": "Will the third-party device administrator be able to grant access to authorized Google personnel upon request?",
+      "answer": "N/A"
+    },
+    {
+      "question": "Which of the following statements are true about this device?",
+      "answer": []
+    },
+    {
+      "question": "Does the network protocol assure server-to-client identity verification?",
+      "answer": "Yes"
+    },
+    {
+      "question": "Click the statements that best describe the characteristics of this device.",
+      "answer": []
+    },
+    {
+      "question": "Are any of the following statements true about this device?",
+      "answer": [
+            0
+        ]
+    }
     ]
 }