From: Neil Horman <nhorman@openssl.org>
Date: Thu, 29 Feb 2024 17:01:31 +0000 (-0500)
Subject: Dump out qlog json if it is malformed
X-Git-Tag: openssl-3.3.0-alpha1~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5677992679b38950c6a0c3775fd57378e1879ba5;p=thirdparty%2Fopenssl.git

Dump out qlog json if it is malformed

We're still seeing periodic failures in qlog from malformed json output,
so lets try to catch it.

Modify the verify-qlog.py script to, in the event of an exception in
json.loads, to replay the entire json file to the console, followed by
an exception indicating what line it died trying to parse.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23715)
---

diff --git a/test/recipes/70-test_quic_multistream_data/verify-qlog.py b/test/recipes/70-test_quic_multistream_data/verify-qlog.py
index b056bf857c..ae11007f3e 100755
--- a/test/recipes/70-test_quic_multistream_data/verify-qlog.py
+++ b/test/recipes/70-test_quic_multistream_data/verify-qlog.py
@@ -14,6 +14,10 @@ class Unexpected(Exception):
     def __init__(self, filename, msg):
         Exception.__init__(self, f"file {repr(filename)}: {msg}")
 
+class Malformed(Exception):
+    def __init__(self, line, msg):
+        Exception.__init__(self, f"{line}: {msg}")
+
 event_type_counts = {}
 frame_type_counts = {}
 
@@ -25,7 +29,13 @@ def load_file(filename):
                 raise Unexpected(filename, "expected JSON-SEQ leader")
 
             line = line[1:]
-            objs.append(json.loads(line))
+            try:
+                objs.append(json.loads(line))
+            except:
+                fi.seek(0)
+                fdata = fi.read()
+                print(fdata)
+                raise Malformed(line, "Malformed json input")
     return objs
 
 def check_header(filename, hdr):