Ensure TEST_SUITE.request_time is in UTC

This fixes an issue with the time set by @freeze_time being different
than the original test case request time.

Author: pburke-mdsol

tests/protocol_test_suite_helper.py

@@ -1,7 +1,7 @@
 # file to handle loading and parsing of mauth protocol test suite cases in order
 # to run them as unit tests
 
-from datetime import datetime
+from datetime import datetime, timezone
 import glob
 import os
 import json
@@ -29,7 +29,7 @@ def __init__(self):
         with open(os.path.join(MAUTH_PROTOCOL_DIR, "signing-params/rsa-key-pub"), "r") as key_file:
             self.public_key = key_file.read()
 
-        self.request_time = datetime.fromtimestamp(float(config["request_time"]))
+        self.request_time = datetime.fromtimestamp(float(config["request_time"]), timezone.utc)
         self.app_uuid = config["app_uuid"]
         self.signer = Signer(config["app_uuid"], private_key, "v2")
         self.additional_attributes = {"app_uuid": config["app_uuid"], "time": config["request_time"]}
@@ -44,7 +44,7 @@ def __init__(self, case_path):
         self.request_attributes = self.build_request_attributes(case_path)
         self.sts = self.read_file_by_extension(case_path, "sts")
         self.sig = self.read_file_by_extension(case_path, "sig")
-        self.auth_headers = self.read_json_by_extension(case_path, "authz")
+        self.auth_headers = {k: str(v) for k, v in self.read_json_by_extension(case_path, "authz").items()}
 
     def build_request_attributes(self, case_path):
         req = self.read_json_by_extension(case_path, "req")

tests/protocol_test_suite_test.py

@@ -27,7 +27,7 @@ def test_protocol_test_suite(self):
         for case_path in TEST_SUITE.cases():
             parser = ProtocolTestSuiteParser(case_path)
             request_signable = RequestSignable(**parser.request_attributes)
-            signed_headers_v2 = TEST_SUITE.signer.signed_headers_v2(request_signable, TEST_SUITE.additional_attributes)
+            signed_headers_v2 = TEST_SUITE.signer.signed_headers_v2(request_signable)
             if "authentication-only" not in case_path:
                 with self.subTest(test="string_to_sign_v2", case_name=parser.case_name):
                     string_to_sign = request_signable.string_to_sign_v2(TEST_SUITE.additional_attributes)