tenant, web_util: ensure that the content type is actually application/json

keylime/cloud_verifier_common.py

@@ -199,8 +199,7 @@ def prepare_v(agent):
     post_data = {
         'encrypted_key': b64_encrypted_V
     }
-    v_json_message = json.dumps(post_data)
-    return v_json_message
+    return post_data
 
 
 def prepare_get_quote(agent):

keylime/tenant.py

@@ -1027,7 +1027,6 @@ def do_quote(self):
             if self.payload is not None:
                 data['payload'] = self.payload.decode('utf-8')
 
-            u_json_message = json.dumps(data)
 
             # post encrypted U back to CloudAgent
             params = f'/v{self.api_version}/keys/ukey'
@@ -1038,7 +1037,7 @@ def do_quote(self):
             post_ukey = RequestsClient(cloudagent_base_url, tls_enabled=False)
             response = post_ukey.post(
                 params,
-                data=u_json_message
+                json=data
             )
 
             if response.status_code == 503:

keylime/tornado_requests.py

@@ -7,6 +7,8 @@
 
 from tornado import httpclient
 
+from keylime import json
+
 
 async def request(method, url, params=None, data=None, context=None, headers=None):
 
@@ -20,6 +22,14 @@ async def request(method, url, params=None, data=None, context=None, headers=Non
     if context is not None:
         url = url.replace('http://', 'https://', 1)
 
+    # Convert dict to JSON before sending
+    if isinstance(data, dict):
+        data = json.dumps(data)
+        if headers is None:
+            headers = {}
+        if "Content-Type" not in headers:
+            headers["Content-Type"] = "application/json"
+
     try:
         req = httpclient.HTTPRequest(url=url,
                                      method=method,