cryptoparser 0.11.2__tar.gz → 0.12.1__tar.gz

{CryptoParser-0.11.2 → CryptoParser-0.12.1}/CHANGELOG.rst

@@ -2,6 +2,38 @@
 Changelog
 =========
 
+-------------------
+0.12.1 - 2023-12-13
+-------------------
+
+Notable fixes
+=============
+
+-  SSH
+
+   -  add missing host key algorithms to key parser classes (#79)
+
+-  Generic
+
+   -  fix markdown generation in the case of TLS client versions (#80)
+
+-------------------
+0.12.0 - 2023-11-23
+-------------------
+
+Features
+========
+
+-  HTTP(S) (``http``)
+
+   -  Headers (``headers``)
+
+      -  add parsers for security related headers
+         (`Content Security Policy <https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP>`__ (CSP),
+         `Content-Security-Policy-Report-Only <https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only>`__)
+         (#59)
+
+
 -------------------
 0.11.2 - 2023-11-13
 -------------------

{CryptoParser-0.11.2 → CryptoParser-0.12.1/CryptoParser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CryptoParser
-Version: 0.11.2
+Version: 0.12.1
 Summary: Fast and flexible security protocol parser and generator
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu
@@ -48,7 +48,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs<22.0.1,>=20.3.0
-Requires-Dist: cryptodatahub==0.11.2
+Requires-Dist: cryptodatahub==0.12.1
 Requires-Dist: python-dateutil
 Requires-Dist: py2-ipaddress; python_version < "3.4"
 Requires-Dist: typing; python_version < "3.5"

{CryptoParser-0.11.2 → CryptoParser-0.12.1}/CryptoParser.egg-info/requires.txt

@@ -1,6 +1,6 @@
 asn1crypto
 attrs<22.0.1,>=20.3.0
-cryptodatahub==0.11.2
+cryptodatahub==0.12.1
 python-dateutil
 python-dateutil
 urllib3

{CryptoParser-0.11.2/CryptoParser.egg-info → CryptoParser-0.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: CryptoParser
-Version: 0.11.2
+Version: 0.12.1
 Summary: Fast and flexible security protocol parser and generator
 Author: Szilárd Pfeiffer
 Author-email: coroner@pfeifferszilard.hu
@@ -48,7 +48,7 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: asn1crypto
 Requires-Dist: attrs<22.0.1,>=20.3.0
-Requires-Dist: cryptodatahub==0.11.2
+Requires-Dist: cryptodatahub==0.12.1
 Requires-Dist: python-dateutil
 Requires-Dist: py2-ipaddress; python_version < "3.4"
 Requires-Dist: typing; python_version < "3.5"

{CryptoParser-0.11.2 → CryptoParser-0.12.1}/cryptoparser/__setup__.py

@@ -2,7 +2,7 @@
 
 __title__ = 'CryptoParser'
 __technical_name__ = __title__.lower()
-__version__ = '0.11.2'
+__version__ = '0.12.1'
 __description__ = 'Fast and flexible security protocol parser and generator'
 __author__ = 'Szilárd Pfeiffer'
 __author_email__ = 'coroner@pfeifferszilard.hu'

{CryptoParser-0.11.2 → CryptoParser-0.12.1}/cryptoparser/common/base.py

@@ -61,7 +61,6 @@ class SerializableTextEncoder(object):
 
 class Serializable(object):  # pylint: disable=too-few-public-methods
     _MARKDOWN_RESULT_STRING_CLASSES = (
-        CryptoDataParamsBase,
         ipaddress.IPv4Network,
         ipaddress.IPv6Network,
         urllib3.util.url.Url,
@@ -143,7 +142,7 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
             ])
         elif hasattr(obj, '__dict__'):
             result = Serializable._json_traverse(obj.__dict__, result_func)
-        elif isinstance(obj, (list, tuple)):
+        elif isinstance(obj, (list, tuple, frozenset, set)):
             result = [Serializable._json_traverse(item, result_func) for item in obj]
         else:
             result = result_func(obj)
@@ -227,7 +226,7 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
         return not isinstance(obj, enum.Enum) and isinstance(obj, six.string_types + six.integer_types + (float, ))
 
     @classmethod
-    def _markdown_result(cls, obj, level=0):  # pylint: disable=too-many-branches
+    def _markdown_result(cls, obj, level=0):  # pylint: disable=too-many-branches,too-many-return-statements
         if obj is None:
             result = cls.post_text_encoder('n/a', level)
         elif isinstance(obj, bool):
@@ -245,17 +244,19 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
                 return cls.post_text_encoder(obj.value, level)
 
             return cls.post_text_encoder(obj.name, level)
-        elif attr.has(type(obj)):
-            result = cls._markdown_result_complex(obj, level)
         elif isinstance(obj, cls._MARKDOWN_RESULT_STRING_CLASSES):
             return False, str(obj)
         elif isinstance(obj, datetime.timedelta):
             return False, str(obj.seconds)
+        elif isinstance(obj, CryptoDataParamsBase) and hasattr(obj, '__str__'):
+            return False, str(obj)
+        elif attr.has(type(obj)):
+            result = cls._markdown_result_complex(obj, level)
         elif hasattr(obj, '_asdict'):
             result = cls._markdown_result(obj._asdict(), level)
         elif hasattr(obj, '__dict__') or isinstance(obj, dict):
             result = cls._markdown_result_complex(obj, level)
-        elif isinstance(obj, (list, tuple, set, ArrayBase)):
+        elif isinstance(obj, (list, tuple, frozenset, set, ArrayBase)):
             result = cls._markdown_result_list(obj, level)
         elif isinstance(obj, (bytes, bytearray)):
             result = cls.post_text_encoder(bytes_to_hex_string(obj, separator=':', lowercase=False), level)
@@ -279,7 +280,7 @@ class Serializable(object):  # pylint: disable=too-few-public-methods
 
 
 @attr.s
-class VariantParsable(ParsableBase):
+class VariantParsableBase(ParsableBase):
     variant = attr.ib()
 
     _REGISTERED_VARIANTS = OrderedDict()
@@ -324,6 +325,21 @@ class VariantParsable(ParsableBase):
 
         registered_variants[variant_tag].append(parsable_class)
 
+    @classmethod
+    @abc.abstractmethod
+    def _parse(cls, parsable):
+        raise NotImplementedError()
+
+    def compose(self):
+        return self.variant.compose()
+
+
+class VariantParsable(VariantParsableBase):
+    @classmethod
+    @abc.abstractmethod
+    def _get_variants(cls):
+        raise NotImplementedError()
+
     @classmethod
     def _parse(cls, parsable):
         for variant_parser in cls._get_variant_types():
@@ -335,8 +351,23 @@ class VariantParsable(ParsableBase):
 
         raise InvalidValue(parsable, cls)
 
-    def compose(self):
-        return self.variant.compose()
+
+class VariantParsableExact(VariantParsableBase):
+    @classmethod
+    @abc.abstractmethod
+    def _get_variants(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    def _parse(cls, parsable):
+        for variant_parser in cls._get_variant_types():
+            try:
+                parsed_object = variant_parser.parse_exact_size(parsable)
+                return parsed_object, len(parsable)
+            except (InvalidType, InvalidValue, TooMuchData):
+                pass
+
+        raise InvalidValue(parsable, cls)
 
 
 @attr.s
@@ -825,7 +856,7 @@ class StringEnumParsableBase(ParsableBaseNoABC):
         enum_items.sort(key=lambda color: len(color.value.code), reverse=True)
 
         try:
-            code = six.ensure_text(parsable, 'ascii')
+            code = six.ensure_text(bytes(parsable), 'ascii')
         except UnicodeDecodeError as e:
             six.raise_from(InvalidValue(parsable, cls), e)
 

{CryptoParser-0.11.2 → CryptoParser-0.12.1}/cryptoparser/common/field.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
+# pylint: disable=too-many-lines
 
 import abc
 import collections
 import datetime
+import enum
 import json
 
 import attr
@@ -791,6 +793,63 @@ class FieldsSemicolonSeparated(FieldValueMultiple):
         return NameValuePairListSemicolonSeparated
 
 
+class MimeTypeRegistry(enum.Enum):
+    APPLICATION = 'application'
+    AUDIO = 'audio'
+    FONT = 'font'
+    EXAMPLE = 'example'
+    IMAGE = 'image'
+    MESSAGE = 'message'
+    MODEL = 'model'
+    MULTIPART = 'multipart'
+    TEXT = 'text'
+    VIDEO = 'video'
+
+
+@attr.s
+class FieldValueMimeType(FieldValueComponentBase):
+    type = attr.ib(
+        validator=attr.validators.instance_of(six.string_types),
+        default=None,
+    )
+    registry = attr.ib(
+        validator=attr.validators.optional(attr.validators.instance_of(MimeTypeRegistry)),
+        default=None,
+    )
+
+    def __str__(self):
+        return '{}/{}'.format(self.registry.value, self.type)
+
+    @property
+    def value(self):
+        return self
+
+    @classmethod
+    def get_canonical_name(cls):
+        return ''
+
+    @classmethod
+    def _parse(cls, parsable):
+        parser = ParserText(parsable)
+
+        parser.parse_string_until_separator('registry', '/', item_class=MimeTypeRegistry)
+        parser.parse_separator('/')
+        parser.parse_string_by_length('type', parser.unparsed_length)
+
+        return FieldValueMimeType(**parser), parser.parsed_length
+
+    def compose(self):
+        composer = ComposerText()
+
+        composer.compose_string(str(self))
+
+        return composer.composed
+
+    @classmethod
+    def _check_name(cls, name):
+        pass
+
+
 @attr.s
 class FieldValueSingleBase(FieldValueBase, Serializable):
     value = attr.ib()
@@ -916,6 +975,32 @@ class FieldValueDateTime(FieldValueSingleComplexBase):
         return self._markdown_result(self.value, level)
 
 
+class FieldValueStringBySeparatorBase(FieldValueSingleComplexBase):
+    @classmethod
+    @abc.abstractmethod
+    def _get_separators(cls):
+        raise NotImplementedError()
+
+    @classmethod
+    def _get_value_type(cls):
+        return six.string_types
+
+    @classmethod
+    def _parse(cls, parsable):
+        parser = ParserText(parsable)
+
+        parser.parse_string_until_separator_or_end('value', cls._get_separators())
+
+        return cls(parser['value']), parser.parsed_length
+
+    def compose(self):
+        composer = ComposerText()
+
+        composer.compose_string(self.value)
+
+        return composer.composed
+
+
 class FieldValueStringEnum(FieldValueSingleComplexBase):
     @classmethod
     @abc.abstractmethod

{CryptoParser-0.11.2 → CryptoParser-0.12.1}/cryptoparser/common/parse.py

@@ -201,7 +201,7 @@ class ParserText(ParserBase):
 
         return actual_offset - count_offset
 
-    def parse_separator(self, separator, min_length=1, max_length=1):
+    def parse_separator(self, separator, min_length=1, max_length=None):
         self._parsed_length += self._check_separators(
             'separator', self._parsed_length, separator, min_length, max_length
         )
@@ -405,15 +405,18 @@ class ParserText(ParserBase):
                 name, item_offset, separator, str, None, True, separator_spaces
             )
             if parsed_length:
-                parsed_value = self._apply_item_class(
-                    name,
-                    item_offset,
-                    item_offset + parsed_length,
-                    separator,
-                    item_class,
-                    fallback_class,
-                    True
-                )
+                if isinstance(item_class, type) and issubclass(item_class, ParsableBase):
+                    parsed_value = item_class.parse_exact_size(parsed_value.encode(self._encoding))
+                else:
+                    parsed_value = self._apply_item_class(
+                        name,
+                        item_offset,
+                        item_offset + parsed_length,
+                        separator,
+                        item_class,
+                        fallback_class,
+                        True
+                    )
                 value.append(parsed_value)
                 item_offset += parsed_length
             elif not skip_empty: