Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-25 09:37:37 +00:00
Code Issues Projects Releases Wiki Activity

update kaitai and recompile formats

Browse Source
This commit is contained in:
Thomas Kriechbaumer 2017-04-16 15:05:58 +02:00
parent ec6be96f2a
commit dadb50946e
10 changed files with 74 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,6 +11,7 @@ MANIFEST
.cache/ .cache/
.tox*/ .tox*/
build/ build/
mitmproxy/contrib/kaitaistruct/*.ksy
# UI # UI

2
mitmproxy/contentviews/image/image_parser.py
View File

@ -37,7 +37,7 @@ def parse_gif(data: bytes) -> Metadata:
descriptor = img.logical_screen_descriptor descriptor = img.logical_screen_descriptor
parts = [ parts = [
('Format', 'Compuserve GIF'), ('Format', 'Compuserve GIF'),
('Version', "GIF{}".format(img.header.version.decode('ASCII'))), ('Version', "GIF{}".format(img.hdr.version)),
('Size', "{} x {} px".format(descriptor.screen_width, descriptor.screen_height)), ('Size', "{} x {} px".format(descriptor.screen_width, descriptor.screen_height)),
('background', str(descriptor.bg_color_index)) ('background', str(descriptor.bg_color_index))
] ]

12
mitmproxy/contrib/kaitaistruct/exif.py
View File

@ -1,16 +1,18 @@
# This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild # This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
# The source was exif.ksy from here - https://github.com/kaitai-io/kaitai_struct_formats/blob/24e2d00048b8084ceec30a187a79cb87a79a48ba/image/exif.ksy
import array import array
import struct import struct
import zlib import zlib
from enum import Enum from enum import Enum
from pkg_resources import parse_version
from kaitaistruct import KaitaiStruct, KaitaiStream, BytesIO from kaitaistruct import __version__ as ks_version, KaitaiStruct, KaitaiStream, BytesIO
from .exif_le import ExifLe if parse_version(ks_version) < parse_version('0.7'):
from .exif_be import ExifBe raise Exception("Incompatible Kaitai Struct Python API: 0.7 or later is required, but you have %s" % (ks_version))
from exif_le import ExifLe
class Exif(KaitaiStruct): class Exif(KaitaiStruct):
def __init__(self, _io, _parent=None, _root=None): def __init__(self, _io, _parent=None, _root=None):
self._io = _io self._io = _io
@ -22,3 +24,5 @@ class Exif(KaitaiStruct):
self.body = ExifLe(self._io) self.body = ExifLe(self._io)
elif _on == 19789: elif _on == 19789:
self.body = ExifBe(self._io) self.body = ExifBe(self._io)

9
mitmproxy/contrib/kaitaistruct/exif_be.py
View File

@ -1,14 +1,17 @@
# This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild # This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
# The source was exif_be.ksy from here - https://github.com/kaitai-io/kaitai_struct_formats/blob/24e2d00048b8084ceec30a187a79cb87a79a48ba/image/exif_be.ksy
import array import array
import struct import struct
import zlib import zlib
from enum import Enum from enum import Enum
from pkg_resources import parse_version
from kaitaistruct import KaitaiStruct, KaitaiStream, BytesIO from kaitaistruct import __version__ as ks_version, KaitaiStruct, KaitaiStream, BytesIO
if parse_version(ks_version) < parse_version('0.7'):
raise Exception("Incompatible Kaitai Struct Python API: 0.7 or later is required, but you have %s" % (ks_version))
class ExifBe(KaitaiStruct): class ExifBe(KaitaiStruct):
def __init__(self, _io, _parent=None, _root=None): def __init__(self, _io, _parent=None, _root=None):
self._io = _io self._io = _io
@ -569,3 +572,5 @@ class ExifBe(KaitaiStruct):
self._m_ifd0 = self._root.Ifd(self._io, self, self._root) self._m_ifd0 = self._root.Ifd(self._io, self, self._root)
self._io.seek(_pos) self._io.seek(_pos)
return self._m_ifd0 if hasattr(self, '_m_ifd0') else None return self._m_ifd0 if hasattr(self, '_m_ifd0') else None

9
mitmproxy/contrib/kaitaistruct/exif_le.py
View File

@ -1,14 +1,17 @@
# This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild # This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
# The source was exif_le.ksy from here - https://github.com/kaitai-io/kaitai_struct_formats/blob/24e2d00048b8084ceec30a187a79cb87a79a48ba/image/exif_le.ksy
import array import array
import struct import struct
import zlib import zlib
from enum import Enum from enum import Enum
from pkg_resources import parse_version
from kaitaistruct import KaitaiStruct, KaitaiStream, BytesIO from kaitaistruct import __version__ as ks_version, KaitaiStruct, KaitaiStream, BytesIO
if parse_version(ks_version) < parse_version('0.7'):
raise Exception("Incompatible Kaitai Struct Python API: 0.7 or later is required, but you have %s" % (ks_version))
class ExifLe(KaitaiStruct): class ExifLe(KaitaiStruct):
def __init__(self, _io, _parent=None, _root=None): def __init__(self, _io, _parent=None, _root=None):
self._io = _io self._io = _io
@ -569,3 +572,5 @@ class ExifLe(KaitaiStruct):
self._m_ifd0 = self._root.Ifd(self._io, self, self._root) self._m_ifd0 = self._root.Ifd(self._io, self, self._root)
self._io.seek(_pos) self._io.seek(_pos)
return self._m_ifd0 if hasattr(self, '_m_ifd0') else None return self._m_ifd0 if hasattr(self, '_m_ifd0') else None

18
mitmproxy/contrib/kaitaistruct/gif.py
View File

@ -1,14 +1,17 @@
# This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild # This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
# The source was png.ksy from here - https://github.com/kaitai-io/kaitai_struct_formats/blob/562154250bea0081fed4e232751b934bc270a0c7/image/gif.ksy
import array import array
import struct import struct
import zlib import zlib
from enum import Enum from enum import Enum
from pkg_resources import parse_version
from kaitaistruct import KaitaiStruct, KaitaiStream, BytesIO from kaitaistruct import __version__ as ks_version, KaitaiStruct, KaitaiStream, BytesIO
if parse_version(ks_version) < parse_version('0.7'):
raise Exception("Incompatible Kaitai Struct Python API: 0.7 or later is required, but you have %s" % (ks_version))
class Gif(KaitaiStruct): class Gif(KaitaiStruct):
class BlockType(Enum): class BlockType(Enum):
@ -24,8 +27,8 @@ class Gif(KaitaiStruct):
self._io = _io self._io = _io
self._parent = _parent self._parent = _parent
self._root = _root if _root else self self._root = _root if _root else self
self.header = self._root.Header(self._io, self, self._root) self.hdr = self._root.Header(self._io, self, self._root)
self.logical_screen_descriptor = self._root.LogicalScreenDescriptor(self._io, self, self._root) self.logical_screen_descriptor = self._root.LogicalScreenDescriptorStruct(self._io, self, self._root)
if self.logical_screen_descriptor.has_color_table: if self.logical_screen_descriptor.has_color_table:
self._raw_global_color_table = self._io.read_bytes((self.logical_screen_descriptor.color_table_size * 3)) self._raw_global_color_table = self._io.read_bytes((self.logical_screen_descriptor.color_table_size * 3))
io = KaitaiStream(BytesIO(self._raw_global_color_table)) io = KaitaiStream(BytesIO(self._raw_global_color_table))
@ -55,7 +58,7 @@ class Gif(KaitaiStruct):
self.blue = self._io.read_u1() self.blue = self._io.read_u1()
class LogicalScreenDescriptor(KaitaiStruct): class LogicalScreenDescriptorStruct(KaitaiStruct):
def __init__(self, _io, _parent=None, _root=None): def __init__(self, _io, _parent=None, _root=None):
self._io = _io self._io = _io
self._parent = _parent self._parent = _parent
@ -163,7 +166,7 @@ class Gif(KaitaiStruct):
self._parent = _parent self._parent = _parent
self._root = _root if _root else self self._root = _root if _root else self
self.magic = self._io.ensure_fixed_contents(struct.pack('3b', 71, 73, 70)) self.magic = self._io.ensure_fixed_contents(struct.pack('3b', 71, 73, 70))
self.version = self._io.read_bytes(3) self.version = (self._io.read_bytes(3)).decode(u"ASCII")
class ExtGraphicControl(KaitaiStruct): class ExtGraphicControl(KaitaiStruct):
@ -245,3 +248,6 @@ class Gif(KaitaiStruct):
self.body = self._root.ExtGraphicControl(self._io, self, self._root) self.body = self._root.ExtGraphicControl(self._io, self, self._root)
else: else:
self.body = self._root.Subblocks(self._io, self, self._root) self.body = self._root.Subblocks(self._io, self, self._root)

16
mitmproxy/contrib/kaitaistruct/jpeg.py
View File

@ -1,15 +1,18 @@
# This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild # This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
# The source was jpeg.ksy from here - https://github.com/kaitai-io/kaitai_struct_formats/blob/24e2d00048b8084ceec30a187a79cb87a79a48ba/image/jpeg.ksy
import array import array
import struct import struct
import zlib import zlib
from enum import Enum from enum import Enum
from pkg_resources import parse_version
from kaitaistruct import KaitaiStruct, KaitaiStream, BytesIO from kaitaistruct import __version__ as ks_version, KaitaiStruct, KaitaiStream, BytesIO
from .exif import Exif if parse_version(ks_version) < parse_version('0.7'):
raise Exception("Incompatible Kaitai Struct Python API: 0.7 or later is required, but you have %s" % (ks_version))
from exif import Exif
class Jpeg(KaitaiStruct): class Jpeg(KaitaiStruct):
class ComponentId(Enum): class ComponentId(Enum):
@ -127,7 +130,7 @@ class Jpeg(KaitaiStruct):
self._io = _io self._io = _io
self._parent = _parent self._parent = _parent
self._root = _root if _root else self self._root = _root if _root else self
self.magic = self._io.read_strz("ASCII", 0, False, True, True) self.magic = (self._io.read_bytes_term(0, False, True, True)).decode(u"ASCII")
_on = self.magic _on = self.magic
if _on == u"Exif": if _on == u"Exif":
self.body = self._root.ExifInJpeg(self._io, self, self._root) self.body = self._root.ExifInJpeg(self._io, self, self._root)
@ -195,7 +198,7 @@ class Jpeg(KaitaiStruct):
self._io = _io self._io = _io
self._parent = _parent self._parent = _parent
self._root = _root if _root else self self._root = _root if _root else self
self.magic = self._io.read_str_byte_limit(5, "ASCII") self.magic = (self._io.read_bytes(5)).decode(u"ASCII")
self.version_major = self._io.read_u1() self.version_major = self._io.read_u1()
self.version_minor = self._io.read_u1() self.version_minor = self._io.read_u1()
self.density_units = self._root.SegmentApp0.DensityUnit(self._io.read_u1()) self.density_units = self._root.SegmentApp0.DensityUnit(self._io.read_u1())
@ -204,3 +207,6 @@ class Jpeg(KaitaiStruct):
self.thumbnail_x = self._io.read_u1() self.thumbnail_x = self._io.read_u1()
self.thumbnail_y = self._io.read_u1() self.thumbnail_y = self._io.read_u1()
self.thumbnail = self._io.read_bytes(((self.thumbnail_x * self.thumbnail_y) * 3)) self.thumbnail = self._io.read_bytes(((self.thumbnail_x * self.thumbnail_y) * 3))

10
mitmproxy/contrib/kaitaistruct/make.sh Executable file
View File

@ -0,0 +1,10 @@
#!/usr/bin/env bash
wget -N https://raw.githubusercontent.com/kaitai-io/kaitai_struct_formats/master/image/exif_be.ksy
wget -N https://raw.githubusercontent.com/kaitai-io/kaitai_struct_formats/master/image/exif_le.ksy
wget -N https://raw.githubusercontent.com/kaitai-io/kaitai_struct_formats/master/image/exif.ksy
wget -N https://raw.githubusercontent.com/kaitai-io/kaitai_struct_formats/master/image/gif.ksy
wget -N https://raw.githubusercontent.com/kaitai-io/kaitai_struct_formats/master/image/jpeg.ksy
wget -N https://raw.githubusercontent.com/kaitai-io/kaitai_struct_formats/master/image/png.ksy
kaitai-struct-compiler --target python --opaque-types=true *.ksy

26
mitmproxy/contrib/kaitaistruct/png.py
View File

@ -1,14 +1,17 @@
# This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild # This is a generated file! Please edit source .ksy file and use kaitai-struct-compiler to rebuild
# The source was png.ksy from here - https://github.com/kaitai-io/kaitai_struct_formats/blob/9370c720b7d2ad329102d89bdc880ba6a706ef26/image/png.ksy
import array import array
import struct import struct
import zlib import zlib
from enum import Enum from enum import Enum
from pkg_resources import parse_version
from kaitaistruct import KaitaiStruct, KaitaiStream, BytesIO from kaitaistruct import __version__ as ks_version, KaitaiStruct, KaitaiStream, BytesIO
if parse_version(ks_version) < parse_version('0.7'):
raise Exception("Incompatible Kaitai Struct Python API: 0.7 or later is required, but you have %s" % (ks_version))
class Png(KaitaiStruct): class Png(KaitaiStruct):
class ColorType(Enum): class ColorType(Enum):
@ -51,7 +54,7 @@ class Png(KaitaiStruct):
self._parent = _parent self._parent = _parent
self._root = _root if _root else self self._root = _root if _root else self
self.len = self._io.read_u4be() self.len = self._io.read_u4be()
self.type = self._io.read_str_byte_limit(4, "UTF-8") self.type = (self._io.read_bytes(4)).decode(u"UTF-8")
_on = self.type _on = self.type
if _on == u"iTXt": if _on == u"iTXt":
self._raw_body = self._io.read_bytes(self.len) self._raw_body = self._io.read_bytes(self.len)
@ -194,7 +197,7 @@ class Png(KaitaiStruct):
self._io = _io self._io = _io
self._parent = _parent self._parent = _parent
self._root = _root if _root else self self._root = _root if _root else self
self.keyword = self._io.read_strz("UTF-8", 0, False, True, True) self.keyword = (self._io.read_bytes_term(0, False, True, True)).decode(u"UTF-8")
self.compression_method = self._io.read_u1() self.compression_method = self._io.read_u1()
self._raw_text_datastream = self._io.read_bytes_full() self._raw_text_datastream = self._io.read_bytes_full()
self.text_datastream = zlib.decompress(self._raw_text_datastream) self.text_datastream = zlib.decompress(self._raw_text_datastream)
@ -259,12 +262,12 @@ class Png(KaitaiStruct):
self._io = _io self._io = _io
self._parent = _parent self._parent = _parent
self._root = _root if _root else self self._root = _root if _root else self
self.keyword = self._io.read_strz("UTF-8", 0, False, True, True) self.keyword = (self._io.read_bytes_term(0, False, True, True)).decode(u"UTF-8")
self.compression_flag = self._io.read_u1() self.compression_flag = self._io.read_u1()
self.compression_method = self._io.read_u1() self.compression_method = self._io.read_u1()
self.language_tag = self._io.read_strz("ASCII", 0, False, True, True) self.language_tag = (self._io.read_bytes_term(0, False, True, True)).decode(u"ASCII")
self.translated_keyword = self._io.read_strz("UTF-8", 0, False, True, True) self.translated_keyword = (self._io.read_bytes_term(0, False, True, True)).decode(u"UTF-8")
self.text = self._io.read_str_eos("UTF-8") self.text = (self._io.read_bytes_full()).decode(u"UTF-8")
class TextChunk(KaitaiStruct): class TextChunk(KaitaiStruct):
@ -272,8 +275,8 @@ class Png(KaitaiStruct):
self._io = _io self._io = _io
self._parent = _parent self._parent = _parent
self._root = _root if _root else self self._root = _root if _root else self
self.keyword = self._io.read_strz("iso8859-1", 0, False, True, True) self.keyword = (self._io.read_bytes_term(0, False, True, True)).decode(u"iso8859-1")
self.text = self._io.read_str_eos("iso8859-1") self.text = (self._io.read_bytes_full()).decode(u"iso8859-1")
class TimeChunk(KaitaiStruct): class TimeChunk(KaitaiStruct):
@ -287,3 +290,6 @@ class Png(KaitaiStruct):
self.hour = self._io.read_u1() self.hour = self._io.read_u1()
self.minute = self._io.read_u1() self.minute = self._io.read_u1()
self.second = self._io.read_u1() self.second = self._io.read_u1()

2
setup.py
View File

@ -70,7 +70,7 @@ setup(
"html2text>=2016.1.8, <=2016.9.19", "html2text>=2016.1.8, <=2016.9.19",
"hyperframe>=5.0, <6", "hyperframe>=5.0, <6",
"jsbeautifier>=1.6.3, <1.7", "jsbeautifier>=1.6.3, <1.7",
"kaitaistruct>=0.6, <0.7", "kaitaistruct>=0.7, <0.8",
"passlib>=1.6.5, <1.8", "passlib>=1.6.5, <1.8",
"pyasn1>=0.1.9, <0.3", "pyasn1>=0.1.9, <0.3",
"pyOpenSSL>=16.0, <17.0", "pyOpenSSL>=16.0, <17.0",