Add jpeg app0 sof0 com parsing

3 files changed, 24 insertions, 0 deletions

diff --git a/test/mitmproxy/contentviews/test_image_parser.py b/test/mitmproxy/contentviews/test_image_parser.py
index 4241a1bb..6c78c07b 100644
--- a/test/mitmproxy/contentviews/test_image_parser.py
+++ b/test/mitmproxy/contentviews/test_image_parser.py
@@ -104,3 +104,27 @@ def test_parse_png(filename, metadata):
 def test_parse_gif(filename, metadata):
     with open(tutils.test_data.path(filename), 'rb') as f:
         assert metadata == image_parser.parse_gif(f.read())
+
+
+@pytest.mark.parametrize("filename, metadata", {
+    # check app0
+    "mitmproxy/data/image_parser/example.jpg": [
+        ('Format', 'JPEG (ISO 10918)'),
+        ('jfif_version', '(1, 1)'),
+        ('jfif_density', '(96, 96)'),
+        ('jfif_unit', '1'),
+        ('Size', '256 x 256 px')
+    ],
+    # check com
+    "mitmproxy/data/image_parser/comment.jpg": [
+        ('Format', 'JPEG (ISO 10918)'),
+        ('jfif_version', '(1, 1)'),
+        ('jfif_density', '(96, 96)'),
+        ('jfif_unit', '1'),
+        ('comment', "b'mitmproxy test image'"),
+        ('Size', '256 x 256 px')
+    ],
+}.items())
+def test_parse_jpeg(filename, metadata):
+    with open(tutils.test_data.path(filename), 'rb') as f:
+        assert metadata == image_parser.parse_jpeg(f.read())
diff --git a/test/mitmproxy/data/image_parser/comment.jpg b/test/mitmproxy/data/image_parser/comment.jpg
new file mode 100644
index 00000000..74d443dd
--- /dev/null
+++ b/test/mitmproxy/data/image_parser/comment.jpg
diff --git a/test/mitmproxy/data/image_parser/example.jpg b/test/mitmproxy/data/image_parser/example.jpg
new file mode 100644
index 00000000..415ee4b2
--- /dev/null
+++ b/test/mitmproxy/data/image_parser/example.jpg