bencode2 0.3.28__py3-none-any.whl → 0.3.30__py3-none-any.whl

bencode2/__decoder.py

@@ -13,6 +13,8 @@ char_9: Final = ord("9")
 char_dash: Final = ord("-")
 char_colon: Final = ord(":")
 
+_MAX_DECODE_DEPTH: Final = 4096
+
 
 class BencodeDecodeError(ValueError):
     """Bencode decode error."""
@@ -28,7 +30,7 @@ class Decoder:
     index: int
     size: int
 
-    __slots__ = ("value", "index", "size")
+    __slots__ = ("value", "index", "size", "_depth")
 
     def __init__(self, value: memoryview) -> None:
         self.size = len(value)
@@ -37,6 +39,7 @@ class Decoder:
 
         self.value = value
         self.index = 0
+        self._depth = 0
 
     def decode(self) -> object:
         data = self.__decode()
@@ -47,6 +50,10 @@ class Decoder:
         return data
 
     def __decode(self) -> object:
+        self._depth += 1
+        if self._depth > _MAX_DECODE_DEPTH:
+            raise BencodeDecodeError("exceeded maximum decode depth")
+
         if char_0 <= self.value[self.index] <= char_9:
             return self.__decode_bytes()
         if self.value[self.index] == char_i:
@@ -81,6 +88,10 @@ class Decoder:
         if self.value[self.index] == char_dash:
             n = -1
             offset = 1
+            if self.index + offset >= index_end:
+                raise BencodeDecodeError(
+                    f"invalid int, '-' with no digits at {self.index}"
+                )
 
         total: int = 0
         for c in self.value[self.index + offset : index_end]:

bencode2/decode.cpp

@@ -13,10 +13,18 @@
 
 namespace nb = nanobind;
 
-nb::object decodeAny(const char *buf, Py_ssize_t &index, Py_ssize_t size);
+#define BENCODE_MAX_DECODE_DEPTH 4096
+
+nb::object decodeAny(const char *buf, Py_ssize_t &index, Py_ssize_t size, uint_fast32_t depth);
 
 #define decoderError(f, ...) throw DecodeError(fmt::format(f, ##__VA_ARGS__))
 
+static inline void checkDepth(uint_fast32_t depth) {
+    if (depth > BENCODE_MAX_DECODE_DEPTH) {
+        throw DecodeError("exceeded maximum decode depth");
+    }
+}
+
 nb::object decodeInt(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
     Py_ssize_t index_e = 0;
     for (Py_ssize_t i = index + 1; i < size; i++) {
@@ -27,7 +35,7 @@ nb::object decodeInt(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
     }
 
     if (index_e == 0) {
-        throw DecodeError(fmt::format("invalid int, missing 'e': %zd", index));
+        decoderError("invalid int, missing 'e': {}", index);
     }
 
     // malformed 'ie'
@@ -44,16 +52,17 @@ nb::object decodeInt(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
     Py_ssize_t num_start = index;
 
     if (buf[index] == '-') {
-        if (buf[index + 1] == '0') {
-            decoderError("invalid int, '-0' found at %zd", index);
-        }
-
         num_start = 1 + index;
+        if (num_start >= index_e) {
+            decoderError("invalid int, '-' with no digits at {}", index);
+        }
+        if (buf[num_start] == '0') {
+            decoderError("invalid int, '-0' found at {}", index);
+        }
         sign = -1;
     } else if (buf[index] == '0') {
         if (index + 1 != index_e) {
-            decoderError("invalid int, non-zero int should not start with '0'. found at %zd",
-                         index);
+            decoderError("invalid int, non-zero int should not start with '0'. found at {}", index);
         }
     }
 
@@ -121,7 +130,6 @@ __OverFlow:;
 }
 
 // there is no bytes/Str in bencode, they only have 1 type for both of them.
-// TODO: check byte length overflow ssize_t
 static std::string_view decodeAsView(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
     Py_ssize_t index_sep = 0;
     for (Py_ssize_t i = index; i < size; i++) {
@@ -132,7 +140,7 @@ static std::string_view decodeAsView(const char *buf, Py_ssize_t &index, Py_ssiz
     }
 
     if (index_sep == 0) {
-        decoderError("invalid string, missing length: index %zd", index);
+        decoderError("invalid string, missing length: index {}", index);
     }
 
     if (buf[index] == '0' && index + 1 != index_sep) {
@@ -142,7 +150,10 @@ static std::string_view decodeAsView(const char *buf, Py_ssize_t &index, Py_ssiz
     Py_ssize_t len = 0;
     for (Py_ssize_t i = index; i < index_sep; i++) {
         if (buf[i] < '0' || buf[i] > '9') {
-            decoderError("invalid bytes length, found '%c' at %zd", buf[i], i);
+            decoderError("invalid bytes length, found '{:c}' at {}", buf[i], i);
+        }
+        if (len > (PY_SSIZE_T_MAX - 9) / 10) {
+            decoderError("bytes length overflow, index {}", index);
         }
         len = len * 10 + (buf[i] - '0');
     }
@@ -162,7 +173,7 @@ static nb::bytes decodeBytes(const char *buf, Py_ssize_t &index, Py_ssize_t size
     return nb::bytes(s.data(), s.length());
 }
 
-nb::object decodeList(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
+nb::object decodeList(const char *buf, Py_ssize_t &index, Py_ssize_t size, uint_fast32_t depth) {
     index = index + 1;
 
     nb::list l = nb::list();
@@ -176,7 +187,7 @@ nb::object decodeList(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
             break;
         }
 
-        nb::object obj = decodeAny(buf, index, size);
+        nb::object obj = decodeAny(buf, index, size, depth);
 
         l.append(obj);
     }
@@ -186,7 +197,7 @@ nb::object decodeList(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
     return l;
 }
 
-nb::object decodeDict(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
+nb::object decodeDict(const char *buf, Py_ssize_t &index, Py_ssize_t size, uint_fast32_t depth) {
     index = index + 1;
     std::optional<std::string_view> lastKey = std::nullopt;
 
@@ -207,7 +218,7 @@ nb::object decodeDict(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
         }
 
         auto key = decodeAsView(buf, index, size);
-        auto obj = decodeAny(buf, index, size);
+        auto obj = decodeAny(buf, index, size, depth);
 
         // skip first key
         if (lastKey.has_value()) {
@@ -228,7 +239,10 @@ nb::object decodeDict(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
     return d;
 }
 
-nb::object decodeAny(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
+nb::object decodeAny(const char *buf, Py_ssize_t &index, Py_ssize_t size, uint_fast32_t depth) {
+    depth++;
+    checkDepth(depth);
+
     // int
     if (buf[index] == 'i') {
         return decodeInt(buf, index, size);
@@ -241,12 +255,12 @@ nb::object decodeAny(const char *buf, Py_ssize_t &index, Py_ssize_t size) {
 
     // list
     if (buf[index] == 'l') {
-        return decodeList(buf, index, size);
+        return decodeList(buf, index, size, depth);
     }
 
     // dict
     if (buf[index] == 'd') {
-        return decodeDict(buf, index, size);
+        return decodeDict(buf, index, size, depth);
     }
 
     decoderError("invalid bencode prefix '{:c}', index {}", buf[index], index);
@@ -275,7 +289,7 @@ nb::object bdecode(nb::object b) {
 
     nb::object o;
     try {
-        o = decodeAny(buf, index, size);
+        o = decodeAny(buf, index, size, 0);
     } catch (std::exception &e) {
         PyBuffer_Release(&view);
         throw e;

bencode2/encode.cpp

@@ -22,15 +22,20 @@ static bool cmp(std::pair<std::string_view, nb::handle> &a,
 }
 
 static std::string_view py_string_view(nb::handle obj) {
+#ifndef Py_LIMITED_API
     // fast path for pure ascii string
     if (PyUnicode_IS_COMPACT_ASCII(obj.ptr())) {
         const char *s = (char *)PyUnicode_DATA(obj.ptr());
         Py_ssize_t size = ((PyASCIIObject *)(obj.ptr()))->length;
         return std::string_view(s, size);
     }
+#endif
 
     Py_ssize_t size = 0;
     const char *s = PyUnicode_AsUTF8AndSize(obj.ptr(), &size);
+    if (s == nullptr) {
+        throw nb::python_error();
+    }
     return std::string_view(s, size);
 }
 
@@ -242,6 +247,7 @@ void encodeComposeObject(EncodeContext *ctx, nb::handle obj, Encode encode) {
 void encodeStr(EncodeContext *ctx, const nb::handle obj) {
     debug_print("encode str");
 
+#ifndef Py_LIMITED_API
     // fast path for pure ascii string
     if (PyUnicode_IS_COMPACT_ASCII(obj.ptr())) {
         const char *s = (char *)PyUnicode_DATA(obj.ptr());
@@ -254,9 +260,13 @@ void encodeStr(EncodeContext *ctx, const nb::handle obj) {
         ctx->write(s, size);
         return;
     }
+#endif
 
     Py_ssize_t size = 0;
     const char *s = PyUnicode_AsUTF8AndSize(obj.ptr(), &size);
+    if (s == nullptr) {
+        throw nb::python_error();
+    }
 
     debug_print("write length");
     ctx->writeSize_t(size);
@@ -331,6 +341,7 @@ void encodeAny(EncodeContext *ctx, const nb::handle obj) {
         return;
     }
 
+#ifndef Py_LIMITED_API
     // fast path for memoryview
     if (PyMemoryView_Check(obj.ptr())) {
         Py_buffer *buf = PyMemoryView_GET_BUFFER(obj.ptr());
@@ -340,6 +351,7 @@ void encodeAny(EncodeContext *ctx, const nb::handle obj) {
 
         return;
     }
+#endif
 
     if (PyObject_CheckBuffer(obj.ptr())) {
         Py_buffer buf;

{bencode2-0.3.28.dist-info → bencode2-0.3.30.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: bencode2
-Version: 0.3.28
+Version: 0.3.30
 Summary: A fast and correct bencode serialize/deserialize library
 Keywords: bencode,bittorrent,bit-torrent,serialize,deserialize,p2p
 Author-email: trim21 <trim21me@gmail.com>
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
@@ -21,7 +21,6 @@ Project-URL: Repository, https://github.com/trim21/bencode-py
 
 [![PyPI](https://img.shields.io/pypi/v/bencode2)](https://pypi.org/project/bencode2/)
 [![tests](https://github.com/trim21/bencode-py/actions/workflows/tests.yaml/badge.svg)](https://github.com/trim21/bencode-py/actions/workflows/tests.yaml)
-[![CircleCI](https://dl.circleci.com/status-badge/img/gh/trim21/bencode-py/tree/master.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/trim21/bencode-py/tree/master)
 [![PyPI - Python Version](https://img.shields.io/badge/python-%3E%3D3.8%2C%3C4.0-blue)](https://pypi.org/project/bencode2/)
 [![Codecov branch](https://img.shields.io/codecov/c/github/Trim21/bencode-py/master)](https://codecov.io/gh/Trim21/bencode-py/branch/master)
 
@@ -111,7 +110,7 @@ bencode2 will decode bencode string to python `bytes`.
 | `bytes`, `bytearray`,`memoryview` |    string    |
 |   `list`, `tuple`, `NamedTuple`   |    array     |
 |       `dict`, `OrderedDict`       |  dictionary  |
-|       `types.MaapingProxy`        |  dictionary  |
+|       `types.MappingProxy`        |  dictionary  |
 |            dataclasses            |  dictionary  |
 
 ## free threading

{bencode2-0.3.28.dist-info → bencode2-0.3.30.dist-info}/RECORD

@@ -1,16 +1,16 @@
 bencode2/__bencode.pyi,sha256=R11h4PI4pSxBQgxslVunDxzx5sjrTcHq-_RpclDTlpY,137
-bencode2/__decoder.py,sha256=UVW_01zUSKATUHVddB-bX-5x8tulIeheweWE7_XbS3o,6192
+bencode2/__decoder.py,sha256=WWHd_HCdxxoJwYs7m22KOj5qrEBuCzEZEBWiYVK-tdY,6579
 bencode2/__encoder.py,sha256=ky4hMgkpZNe7PtoqYaTroyTsoH9ZDKLqxYICQpL-kbk,4196
 bencode2/__init__.py,sha256=H7VTW80hlELobN5j9dhyUi2l0pUuOon8ibTW2kVG78Y,383
 bencode2/__init__.pyi,sha256=rFe9L4Kof8XKp1CVLJj6zZeNRifRVLwVN7Ag4kRQndI,237
 bencode2/bencode.cpp,sha256=sn12w9hvaBdAdEMAJZjQdPM3pjPyfHVlhFIc-wlNNJ4,710
 bencode2/common.hpp,sha256=liOfMvppYm1Es8ki7G2UjVNkOP5pVuvZvNCyQ_cRAqA,1791
-bencode2/decode.cpp,sha256=MvhUdAJ1A0NYWW7O8_L9C0_ntvJ6gSIjm2fGiC1nKgQ,7266
-bencode2/encode.cpp,sha256=oyzl4VZPH7LX5eI5tC9FEUoeb1MCfu_HanKlQAP_F0c,11090
+bencode2/decode.cpp,sha256=smagKRJzWth8_L56OxPDyI8lBnlRDq6_XG2eCN6u8jk,7777
+bencode2/encode.cpp,sha256=IGNlXzr-gs4Mk0UMKetbjn8UISzdzOpwy_paM1u1Tc0,11308
 bencode2/encode_ctx.hpp,sha256=_CO3bHSsx6DYJBSnUeoCDqtZFFR3jOyIQJdv5YG0J44,1254
 bencode2/overflow.hpp,sha256=n3W-45ErhBf5ZGKKn03ll9j6bB5jY0R4eybbzTPKMnc,701
 bencode2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bencode2-0.3.28.dist-info/licenses/LICENSE,sha256=WraLL2GWym7_6EnkH1Zi8kU_-2iPhXGv7yegTIEX3E8,1085
-bencode2-0.3.28.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-bencode2-0.3.28.dist-info/METADATA,sha256=pnooWGThJ_Fl_P2Yp4MQhiNnlOZKE4hqvZiAxFd8iJw,5294
-bencode2-0.3.28.dist-info/RECORD,,
+bencode2-0.3.30.dist-info/licenses/LICENSE,sha256=WraLL2GWym7_6EnkH1Zi8kU_-2iPhXGv7yegTIEX3E8,1085
+bencode2-0.3.30.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+bencode2-0.3.30.dist-info/METADATA,sha256=Q27Lrz4VwtE2-crVnOjalvnay2NVeKfYLJs18ZaCJEE,5106
+bencode2-0.3.30.dist-info/RECORD,,