diff options
| author | Sachin Kelkar <sachinkel19@gmail.com> | 2017-02-02 18:01:48 +0530 |
|---|---|---|
| committer | Sachin Kelkar <sachinkel19@gmail.com> | 2017-02-03 14:12:54 +0530 |
| commit | 88dbfd525719229154a7badcd7628857b4e16af4 (patch) | |
| tree | 94dce1b9a69179de97133659be36a1cdd3af4907 /mitmproxy/contentviews | |
| parent | abef020e07bcb6b0fd6493f73fbb48c8275f502e (diff) | |
| download | mitmproxy-88dbfd525719229154a7badcd7628857b4e16af4.tar.gz mitmproxy-88dbfd525719229154a7badcd7628857b4e16af4.tar.bz2 mitmproxy-88dbfd525719229154a7badcd7628857b4e16af4.zip | |
Add iTXt and zTXt tests
Diffstat (limited to 'mitmproxy/contentviews')
| -rw-r--r-- | mitmproxy/contentviews/image/image_parser.py | 4 | ||||
| -rw-r--r-- | mitmproxy/contentviews/image/png.py | 34 |
2 files changed, 37 insertions, 1 deletions
diff --git a/mitmproxy/contentviews/image/image_parser.py b/mitmproxy/contentviews/image/image_parser.py index e523def5..3a375006 100644 --- a/mitmproxy/contentviews/image/image_parser.py +++ b/mitmproxy/contentviews/image/image_parser.py @@ -19,4 +19,8 @@ def parse_png(data: bytes) -> Metadata: parts.append(tuple(['aspect', str(aspectx) + " x " + str(aspecty)])) elif chunk.type == 'tEXt': parts.append(tuple([chunk.body.keyword, chunk.body.text])) + elif chunk.type == 'iTXt': + parts.append(tuple([chunk.body.keyword, chunk.body.text])) + elif chunk.type == 'zTXt': + parts.append(tuple([chunk.body.keyword, chunk.body.text_datastream.decode('iso8859-1')])) return parts diff --git a/mitmproxy/contentviews/image/png.py b/mitmproxy/contentviews/image/png.py index 5996e3ce..53d39799 100644 --- a/mitmproxy/contentviews/image/png.py +++ b/mitmproxy/contentviews/image/png.py @@ -53,7 +53,11 @@ class Png(KaitaiStruct): self.len = self._io.read_u4be() self.type = self._io.read_str_byte_limit(4, "UTF-8") _on = self.type - if _on == u"gAMA": + if _on == u"iTXt": + self._raw_body = self._io.read_bytes(self.len) + io = KaitaiStream(BytesIO(self._raw_body)) + self.body = self._root.InternationalTextChunk(io, self, self._root) + elif _on == u"gAMA": self._raw_body = self._io.read_bytes(self.len) io = KaitaiStream(BytesIO(self._raw_body)) self.body = self._root.GamaChunk(io, self, self._root) @@ -85,6 +89,10 @@ class Png(KaitaiStruct): self._raw_body = self._io.read_bytes(self.len) io = KaitaiStream(BytesIO(self._raw_body)) self.body = self._root.SrgbChunk(io, self, self._root) + elif _on == u"zTXt": + self._raw_body = self._io.read_bytes(self.len) + io = KaitaiStream(BytesIO(self._raw_body)) + self.body = self._root.CompressedTextChunk(io, self, self._root) else: self.body = self._io.read_bytes(self.len) self.crc = self._io.read_bytes(4) @@ -181,6 +189,17 @@ class Png(KaitaiStruct): self.render_intent = self._root.Intent(self._io.read_u1()) + class CompressedTextChunk(KaitaiStruct): + def __init__(self, _io, _parent=None, _root=None): + self._io = _io + self._parent = _parent + self._root = _root if _root else self + self.keyword = self._io.read_strz("UTF-8", 0, False, True, True) + self.compression_method = self._io.read_u1() + self._raw_text_datastream = self._io.read_bytes_full() + self.text_datastream = zlib.decompress(self._raw_text_datastream) + + class BkgdTruecolor(KaitaiStruct): def __init__(self, _io, _parent=None, _root=None): self._io = _io @@ -235,6 +254,19 @@ class Png(KaitaiStruct): self.unit = self._root.PhysUnit(self._io.read_u1()) + class InternationalTextChunk(KaitaiStruct): + def __init__(self, _io, _parent=None, _root=None): + self._io = _io + self._parent = _parent + self._root = _root if _root else self + self.keyword = self._io.read_strz("UTF-8", 0, False, True, True) + self.compression_flag = self._io.read_u1() + self.compression_method = self._io.read_u1() + self.language_tag = self._io.read_strz("iso8859-1", 0, False, True, True) + self.translated_keyword = self._io.read_strz("UTF-8", 0, False, True, True) + self.text = self._io.read_str_eos("UTF-8") + + class TextChunk(KaitaiStruct): def __init__(self, _io, _parent=None, _root=None): self._io = _io |