pypcapkit 1.3.3.post1__tar.gz → 1.3.3.post2__tar.gz

{pypcapkit-1.3.3.post1/pypcapkit.egg-info → pypcapkit-1.3.3.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypcapkit
-Version: 1.3.3.post1
+Version: 1.3.3.post2
 Summary: PyPCAPKit: comprehensive network packet analysis library
 Author-email: Jarry Shaw <jarryshaw@icloud.com>
 Maintainer: Jarry Shaw

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2}/pcapkit/__init__.py

@@ -123,4 +123,4 @@ __all__ = [
 ]
 
 #: version number
-__version__ = '1.3.3.post1'
+__version__ = '1.3.3.post2'

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2}/pcapkit/const/ftp/return_code.py

@@ -194,8 +194,8 @@ class ReturnCode(IntEnum):
     #: command if the service knows it must shut down.
     CODE_421: 'ReturnCode' = 421, 'Service available, closing control connection.'
 
-    #: open data connection.
-    CODE_425: 'ReturnCode' = 425, 'open data connection.'
+    #: Can't open data connection.
+    CODE_425: 'ReturnCode' = 425, "Can't open data connection."
 
     #: Connection closed; transfer aborted.
     CODE_426: 'ReturnCode' = 426, 'Connection closed; transfer aborted.'

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2}/pcapkit/const/http/status_code.py

@@ -54,6 +54,10 @@ class StatusCode(IntEnum):
     #: Early Hints [:rfc:`8297`]
     CODE_103 = 103, 'Early Hints'
 
+    #: Upload Resumption Supported (TEMPORARY - registered 2024-11-13, expires
+    #: 2025-11-13) [draft-ietf-httpbis-resumable-upload-05]
+    CODE_104 = 104, 'Upload Resumption Supported'
+
     #: OK [:rfc:`9110#section-15.3.1`]
     CODE_200 = 200, 'OK'
 
@@ -267,7 +271,7 @@ class StatusCode(IntEnum):
         """
         if not (isinstance(value, int) and 100 <= value <= 599):
             raise ValueError('%r is not a valid %s' % (value, cls.__name__))
-        if 104 <= value <= 199:
+        if 105 <= value <= 199:
             #: Unassigned
             return extend_enum(cls, 'CODE_%d' % value, value, 'Unassigned')
         if 209 <= value <= 225:

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2}/pcapkit/const/mh/status_code.py

@@ -94,7 +94,7 @@ class StatusCode(IntEnum):
     #: MIPV6-MESG-ID-REQD [:rfc:`4285`]
     MIPV6_MESG_ID_REQD = 145
 
-    #: MIPV6-AUTH-FAIL [:rfc:`4285`]
+    #: MIPV6-AUTH-FAIL [:rfc:`4285`][RFC Errata 3463]
     MIPV6_AUTH_FAIL = 146
 
     #: Permanent home keygen token unavailable [:rfc:`4866`]

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2}/pcapkit/protocols/internet/internet.py

@@ -157,7 +157,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
 
     def _decode_next_layer(self, dict_: '_PT', proto: 'Optional[int]' = None,  # pylint: disable=arguments-differ
                            length: 'Optional[int]' = None, *, packet: 'Optional[dict[str, Any]]' = None,
-                           version: 'Literal[4, 6]' = 4, ipv6_exthdr: 'Optional[ProtoChain]' = None) -> '_PT':
+                           version: 'Literal[4, 6]' = 4, ipv6_exthdr: 'Optional[ProtoChain]' = None,
+                           payload: 'Optional[bytes]' = None) -> '_PT':
         r"""Decode next layer extractor.
 
         Arguments:
@@ -167,6 +168,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
             packet: packet info (passed from :meth:`self.unpack <pcapkit.protocols.protocol.Protocol.unpack>`)
             version: IP version
             ipv6_exthdr: protocol chain of IPv6 extension headers
+            payload: payload from packet. If not provided, will extract from
+                :meth:`self.__header__.get_payload <pcapkit.protocols.schema.schema.Schema.get_payload>`
 
         Returns:
             Current protocol with next layer extracted.
@@ -179,7 +182,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
 
         """
         next_ = cast('Protocol',  # type: ignore[redundant-cast]
-                     self._import_next_layer(proto, length, packet=packet, version=version))  # type: ignore[arg-type,misc,call-arg]
+                     self._import_next_layer(proto, length, packet=packet, version=version,
+                                             payload=payload))  # type: ignore[arg-type,misc,call-arg]
         info, chain = next_.info, next_.protochain
 
         # make next layer protocol name
@@ -203,8 +207,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
 
     @beholder  # type: ignore[arg-type]
     def _import_next_layer(self, proto: 'int', length: 'Optional[int]' = None, *,  # pylint: disable=arguments-differ
-                           packet: 'Optional[dict[str, Any]]' = None,
-                           version: 'Literal[4, 6]' = 4, extension: 'bool' = False) -> 'Protocol':
+                           packet: 'Optional[dict[str, Any]]' = None, version: 'Literal[4, 6]' = 4,
+                           extension: 'bool' = False, payload: 'Optional[bytes]' = None) -> 'Protocol':
         """Import next layer extractor.
 
         Arguments:
@@ -213,6 +217,8 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
             packet: packet info (passed from :meth:`self.unpack <pcapkit.protocols.protocol.Protocol.unpack>`)
             version: IP protocol version
             extension: if is extension header
+            payload: payload from packet. If not provided, will extract from
+                :meth:`self.__header__.get_payload <pcapkit.protocols.schema.schema.Schema.get_payload>`
 
         Returns:
             Instance of next layer.
@@ -221,7 +227,10 @@ class Internet(Protocol[_PT, _ST], Generic[_PT, _ST]):  # pylint: disable=abstra
         if TYPE_CHECKING:
             protocol: 'Type[Protocol]'
 
-        file_ = self.__header__.get_payload()
+        if payload is not None:
+            file_ = self.__header__.get_payload()
+        else:
+            file_ = payload
         if length is None:
             length = len(file_)
 

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2}/pcapkit/protocols/internet/ipv6.py

@@ -31,11 +31,13 @@ from typing import TYPE_CHECKING
 
 from pcapkit.const.ipv6.extension_header import ExtensionHeader as Enum_ExtensionHeader
 from pcapkit.const.reg.transtype import TransType as Enum_TransType
+from pcapkit.corekit.module import ModuleDescriptor
 from pcapkit.corekit.multidict import OrderedMultiDict
 from pcapkit.corekit.protochain import ProtoChain
 from pcapkit.protocols.data.internet.ipv6 import IPv6 as Data_IPv6
 from pcapkit.protocols.internet.ip import IP
 from pcapkit.protocols.schema.internet.ipv6 import IPv6 as Schema_IPv6
+from pcapkit.utilities.decorators import beholder
 
 if TYPE_CHECKING:
     from enum import IntEnum as StdlibEnum
@@ -46,7 +48,6 @@ if TYPE_CHECKING:
     from typing_extensions import Literal
 
     from pcapkit.protocols.protocol import ProtocolBase as Protocol
-    from pcapkit.protocols.schema.schema import Schema
 
 __all__ = ['IPv6']
 
@@ -310,6 +311,7 @@ class IPv6(IP[Data_IPv6, Schema_IPv6],
         _protos = []                # ProtoChain buffer
 
         # traverse if next header is an extensive header
+        payload = self.__header__.get_payload()
         while True:
             try:
                 ex_proto = Enum_ExtensionHeader(proto)
@@ -322,7 +324,8 @@ class IPv6(IP[Data_IPv6, Schema_IPv6],
             #     break
 
             # make protocol name
-            next_ = self._import_next_layer(proto, packet=packet, version=6, extension=True)  # type: ignore[misc,call-arg,arg-type]
+            next_ = self._import_next_layer(proto, packet=packet, version=6, extension=True,
+                                            payload=payload)  # type: ignore[misc,call-arg,arg-type]
             info = next_.info
             name = next_.alias.lstrip('IPv6-').lower()
             ipv6.__update__({
@@ -348,6 +351,9 @@ class IPv6(IP[Data_IPv6, Schema_IPv6],
                 })
                 break
 
+            # update payload for next extension header
+            payload = payload[next_.length:]
+
         # record real header & payload length (headers exclude)
         ipv6.__update__({
             'hdr_len': hdr_len,
@@ -358,4 +364,49 @@ class IPv6(IP[Data_IPv6, Schema_IPv6],
         })
 
         ipv6_exthdr = ProtoChain.from_list(_protos)  # type: ignore[arg-type]
-        return super()._decode_next_layer(ipv6, proto, raw_len, packet=packet, ipv6_exthdr=ipv6_exthdr)
+        return super()._decode_next_layer(ipv6, proto, raw_len, packet=packet, ipv6_exthdr=ipv6_exthdr, payload=payload)
+
+    @beholder  # type: ignore[arg-type]
+    def _import_next_layer(self, proto: 'int', length: 'Optional[int]' = None, *,  # pylint: disable=arguments-differ
+                           packet: 'Optional[dict[str, Any]]' = None, version: 'Literal[4, 6]' = 4,
+                           extension: 'bool' = False, payload: 'Optional[bytes]' = None) -> 'Protocol':
+        """Import next layer extractor.
+
+        Arguments:
+            proto: next layer protocol index
+            length: valid (*non-padding*) length
+            packet: packet info (passed from :meth:`self.unpack <pcapkit.protocols.protocol.Protocol.unpack>`)
+            version: IP protocol version
+            extension: if is extension header
+            payload: payload from packet. If not provided, will extract from
+                :meth:`self.__header__.get_payload <pcapkit.protocols.schema.schema.Schema.get_payload>`
+
+        Returns:
+            Instance of next layer.
+
+        """
+        if TYPE_CHECKING:
+            protocol: 'Type[Protocol]'
+
+        if payload is None:
+            file_ = self.__header__.get_payload()
+        else:
+            file_ = payload
+        if length is None:
+            length = len(file_)
+
+        if length == 0:
+            from pcapkit.protocols.misc.null import \
+                NoPayload as protocol  # isort: skip # pylint: disable=import-outside-toplevel
+        elif self._sigterm:
+            from pcapkit.protocols.misc.raw import \
+                Raw as protocol  # isort: skip # pylint: disable=import-outside-toplevel
+        else:
+            protocol = self.__proto__[proto]  # type: ignore[assignment]
+            if isinstance(protocol, ModuleDescriptor):
+                protocol = protocol.klass  # type: ignore[unreachable]
+                self.__proto__[proto] = protocol  # update mapping upon import
+
+        next_ = protocol(file_, length, version=version, extension=extension,  # type: ignore[abstract]
+                         alias=proto, packet=packet, layer=self._exlayer, protocol=self._exproto)
+        return next_

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2}/pcapkit/protocols/internet/ipv6_route.py

@@ -48,14 +48,12 @@ from pcapkit.utilities.warnings import RegistryWarning, warn
 if TYPE_CHECKING:
     from enum import IntEnum as StdlibEnum
     from ipaddress import IPv6Address
-    from typing import IO, Any, Callable, DefaultDict, NoReturn, Optional, Type
+    from typing import IO, Any, Callable, DefaultDict, Optional, Type
 
     from aenum import IntEnum as AenumEnum
     from mypy_extensions import DefaultArg, KwArg, NamedArg
     from typing_extensions import Literal
 
-    from pcapkit.corekit.protochain import ProtoChain
-    from pcapkit.protocols.protocol import ProtocolBase as Protocol
     from pcapkit.protocols.schema.internet.ipv6_route import RoutingType as Schema_RoutingType
 
     TypeParser = Callable[[Schema_RoutingType, NamedArg(Schema_IPv6_Route, 'header')], Data_IPv6_Route]
@@ -402,7 +400,7 @@ class IPv6_Route(Internet[Data_IPv6_Route, Schema_IPv6_Route],
         """
         ipv6_route = Data_UnknownType(
             next=header.next,
-            length=header.length,
+            length=header.length * 8 + 8,
             type=header.type,
             seg_left=header.seg_left,
             data=schema.data,
@@ -463,7 +461,7 @@ class IPv6_Route(Internet[Data_IPv6_Route, Schema_IPv6_Route],
 
         ipv6_route = Data_SourceRoute(
             next=header.next,
-            length=header.length,
+            length=header.length * 8 + 8,
             type=header.type,
             seg_left=header.seg_left,
             ip=tuple(schema.ip),
@@ -507,7 +505,7 @@ class IPv6_Route(Internet[Data_IPv6_Route, Schema_IPv6_Route],
 
         ipv6_route = Data_Type2(
             next=header.next,
-            length=header.length,
+            length=header.length * 8 + 8,
             type=header.type,
             seg_left=header.seg_left,
             ip=schema.ip,
@@ -547,7 +545,7 @@ class IPv6_Route(Internet[Data_IPv6_Route, Schema_IPv6_Route],
 
         ipv6_route = Data_RPL(
             next=header.next,
-            length=header.length,
+            length=header.length * 8 + 8,
             type=header.type,
             seg_left=header.seg_left,
             cmpr_i=schema.cmpr_i,

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2}/pcapkit/protocols/schema/internet/ipv6_route.py

@@ -24,10 +24,9 @@ __all__ = [
 
 if TYPE_CHECKING:
     from ipaddress import IPv6Address
-    from typing import Any, Optional
+    from typing import Any
 
     from pcapkit.corekit.fields.field import FieldBase as Field
-    from pcapkit.protocols.protocol import ProtocolBase as Protocol
 
 if SPHINX_TYPE_CHECKING:
     from typing_extensions import TypedDict
@@ -52,7 +51,7 @@ def ipv6_route_data_selector(pkt: 'dict[str, Any]') -> 'Field':
     """
     type = cast('Enum_Routing', pkt['type'])
     schema = RoutingType.registry[type]
-    return SchemaField(length=pkt['length'] * 8 - 4, schema=schema)
+    return SchemaField(length=pkt['length'] * 8, schema=schema)
 
 
 @schema_final

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2}/pcapkit/utilities/decorators.py

@@ -14,6 +14,7 @@ decorators, including :func:`~pcapkit.utilities.decorators.seekset`,
 import functools
 import io
 import os
+import traceback
 from typing import TYPE_CHECKING, cast
 
 from pcapkit.utilities.exceptions import StructError, stacklevel
@@ -122,7 +123,11 @@ def beholder(func: 'Callable[Concatenate[Protocol, int, Optional[int], P], R_beh
             # error = traceback.format_exc(limit=1).strip().rsplit(os.linesep, maxsplit=1)[-1]
 
             # log error
-            logger.warning(str(exc), exc_info=exc if VERBOSE else None, stack_info=DEVMODE, stacklevel=stacklevel())
+            logger.warning(str(exc), stack_info=DEVMODE, stacklevel=stacklevel())
+
+            if VERBOSE:
+                logger.error('The following error occurred while parsing the packet:')
+                traceback.print_exc()
 
             file_ = self.__header__.get_payload()
             next_ = protocol(file_, length, error=str(exc))

{pypcapkit-1.3.3.post1 → pypcapkit-1.3.3.post2/pypcapkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypcapkit
-Version: 1.3.3.post1
+Version: 1.3.3.post2
 Summary: PyPCAPKit: comprehensive network packet analysis library
 Author-email: Jarry Shaw <jarryshaw@icloud.com>
 Maintainer: Jarry Shaw