maxminddb 2.5.1__tar.gz → 2.5.2__tar.gz

{maxminddb-2.5.1 → maxminddb-2.5.2}/HISTORY.rst

@@ -3,6 +3,13 @@
 History
 -------
 
+2.5.2 (2024-01-09)
+++++++++++++++++++
+
+* The vendored ``libmaxminddb`` version was updated to 1.9.0. This fixes
+  an issue when reading databases with a search tree exceeding 2 GB.
+  Reported by Sami Salonen. GitHub #146.
+
 2.5.1 (2023-11-09)
 ++++++++++++++++++
 

{maxminddb-2.5.1 → maxminddb-2.5.2}/MANIFEST.in

@@ -1,3 +1,4 @@
+exclude .* .github/**/* dev-bin/*
 include HISTORY.rst README.rst LICENSE maxminddb/py.typed maxminddb/extension.pyi
 recursive-include extension/libmaxminddb/include *.h
 recursive-include extension/libmaxminddb/src *.c *.h

{maxminddb-2.5.1 → maxminddb-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maxminddb
-Version: 2.5.1
+Version: 2.5.2
 Summary: Reader for the MaxMind DB format
 Author-email: Gregory Oschwald <goschwald@maxmind.com>
 License: Apache License, Version 2.0

{maxminddb-2.5.1 → maxminddb-2.5.2}/examples/benchmark.py

@@ -30,4 +30,4 @@ elapsed = timeit.timeit(
     number=args.count,
 )
 
-print(args.count / elapsed, "lookups per second")
+print("{:,}".format(int(args.count / elapsed)), "lookups per second")

{maxminddb-2.5.1 → maxminddb-2.5.2}/extension/libmaxminddb/include/maxminddb.h

@@ -17,8 +17,6 @@ extern "C" {
 #include <ws2tcpip.h>
 /* libmaxminddb package version from configure */
 
-typedef ADDRESS_FAMILY sa_family_t;
-
 #if defined(_MSC_VER)
 /* MSVC doesn't define signed size_t, copy it from configure */
 #define ssize_t SSIZE_T

{maxminddb-2.5.1 → maxminddb-2.5.2}/extension/libmaxminddb/src/data-pool.c

@@ -9,8 +9,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-static bool can_multiply(size_t const, size_t const, size_t const);
-
 // Allocate an MMDB_data_pool_s. It initially has space for size
 // MMDB_entry_data_list_s structs.
 MMDB_data_pool_s *data_pool_new(size_t const size) {
@@ -43,7 +41,7 @@ MMDB_data_pool_s *data_pool_new(size_t const size) {
 // the given max. max will typically be SIZE_MAX.
 //
 // We want to know if we'll wrap around.
-static bool can_multiply(size_t const max, size_t const m, size_t const n) {
+bool can_multiply(size_t const max, size_t const m, size_t const n) {
     if (m == 0) {
         return false;
     }

{maxminddb-2.5.1 → maxminddb-2.5.2}/extension/libmaxminddb/src/data-pool.h

@@ -44,6 +44,7 @@ typedef struct MMDB_data_pool_s {
     MMDB_entry_data_list_s *blocks[DATA_POOL_NUM_BLOCKS];
 } MMDB_data_pool_s;
 
+bool can_multiply(size_t const, size_t const, size_t const);
 MMDB_data_pool_s *data_pool_new(size_t const);
 void data_pool_destroy(MMDB_data_pool_s *const);
 MMDB_entry_data_list_s *data_pool_alloc(MMDB_data_pool_s *const);

{maxminddb-2.5.1 → maxminddb-2.5.2}/extension/libmaxminddb/src/maxminddb.c

@@ -23,6 +23,8 @@
 #endif
 #include <windows.h>
 #include <ws2ipdef.h>
+#define SSIZE_MAX INTPTR_MAX
+typedef ADDRESS_FAMILY sa_family_t;
 #else
 #include <arpa/inet.h>
 #include <sys/mman.h>
@@ -288,18 +290,29 @@ int MMDB_open(const char *const filename, uint32_t flags, MMDB_s *const mmdb) {
         goto cleanup;
     }
 
-    uint32_t search_tree_size =
-        mmdb->metadata.node_count * mmdb->full_record_byte_size;
+    if (!can_multiply(SSIZE_MAX,
+                      mmdb->metadata.node_count,
+                      mmdb->full_record_byte_size)) {
+        status = MMDB_INVALID_METADATA_ERROR;
+        goto cleanup;
+    }
+    ssize_t search_tree_size = (ssize_t)mmdb->metadata.node_count *
+                               (ssize_t)mmdb->full_record_byte_size;
 
     mmdb->data_section =
         mmdb->file_content + search_tree_size + MMDB_DATA_SECTION_SEPARATOR;
-    if (search_tree_size + MMDB_DATA_SECTION_SEPARATOR >
-        (uint32_t)mmdb->file_size) {
+    if (mmdb->file_size < MMDB_DATA_SECTION_SEPARATOR ||
+        search_tree_size > mmdb->file_size - MMDB_DATA_SECTION_SEPARATOR) {
+        status = MMDB_INVALID_METADATA_ERROR;
+        goto cleanup;
+    }
+    ssize_t data_section_size =
+        mmdb->file_size - search_tree_size - MMDB_DATA_SECTION_SEPARATOR;
+    if (data_section_size > UINT32_MAX || data_section_size <= 0) {
         status = MMDB_INVALID_METADATA_ERROR;
         goto cleanup;
     }
-    mmdb->data_section_size = (uint32_t)mmdb->file_size - search_tree_size -
-                              MMDB_DATA_SECTION_SEPARATOR;
+    mmdb->data_section_size = (uint32_t)data_section_size;
 
     // Although it is likely not possible to construct a database with valid
     // valid metadata, as parsed above, and a data_section_size less than 3,

{maxminddb-2.5.1 → maxminddb-2.5.2}/maxminddb/__init__.py

@@ -81,7 +81,7 @@ def open_database(
 
 
 __title__ = "maxminddb"
-__version__ = "2.5.1"
+__version__ = "2.5.2"
 __author__ = "Gregory Oschwald"
 __license__ = "Apache License, Version 2.0"
 __copyright__ = "Copyright 2013-2023 MaxMind, Inc."

{maxminddb-2.5.1 → maxminddb-2.5.2}/maxminddb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maxminddb
-Version: 2.5.1
+Version: 2.5.2
 Summary: Reader for the MaxMind DB format
 Author-email: Gregory Oschwald <goschwald@maxmind.com>
 License: Apache License, Version 2.0

{maxminddb-2.5.1 → maxminddb-2.5.2}/maxminddb.egg-info/SOURCES.txt

@@ -1,8 +1,3 @@
-.clang-format
-.gitignore
-.gitmodules
-.pylintrc
-.readthedocs.yaml
 HISTORY.rst
 LICENSE
 MANIFEST.in
@@ -10,15 +5,6 @@ README.rst
 pyproject.toml
 setup.cfg
 setup.py
-.github/dependabot.yml
-.github/workflows/address-sanitizer.yml
-.github/workflows/clang-analyzer.yml
-.github/workflows/codeql-analysis.yml
-.github/workflows/release.yml
-.github/workflows/test-libmaxminddb.yml
-.github/workflows/test.yml
-dev-bin/clang-format-all.sh
-dev-bin/release.sh
 docs/Makefile
 docs/conf.py
 docs/index.rst

{maxminddb-2.5.1 → maxminddb-2.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maxminddb"
-version = "2.5.1"
+version = "2.5.2"
 description = "Reader for the MaxMind DB format"
 authors = [
     {name = "Gregory Oschwald", email = "goschwald@maxmind.com"},
@@ -38,6 +38,9 @@ Documentation = "https://maxminddb.readthedocs.org/"
 "Source Code" = "https://github.com/maxmind/MaxMind-DB-Reader-python"
 "Issue Tracker" = "https://github.com/maxmind/MaxMind-DB-Reader-python/issues"
 
+[tool.setuptools.package-data]
+maxminddb = ["py.typed"]
+
 [tool.black]
 # src is showing up in our GitHub linting builds. It seems to
 # contain deps.

{maxminddb-2.5.1 → maxminddb-2.5.2}/tests/reader_test.py

@@ -675,7 +675,7 @@ class TestMemoryReader(BaseTestReader, unittest.TestCase):
 
 class TestFDReader(BaseTestReader, unittest.TestCase):
     def setUp(self):
-        self.open_database_patcher = mock.patch("reader_test.open_database")
+        self.open_database_patcher = mock.patch(__name__ + ".open_database")
         self.addCleanup(self.open_database_patcher.stop)
         self.open_database = self.open_database_patcher.start()
         self.open_database.side_effect = get_reader_from_file_descriptor

maxminddb-2.5.1/.clang-format

@@ -1,5 +0,0 @@
-BasedOnStyle: LLVM
-IndentWidth: 4
-BinPackArguments: false
-BinPackParameters: false
-IndentCaseLabels: true

maxminddb-2.5.1/.github/dependabot.yml

@@ -1,11 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: pip
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: daily

maxminddb-2.5.1/.github/workflows/address-sanitizer.yml

@@ -1,37 +0,0 @@
-name: Run Address Sanitizer
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: '13 15 * * SUN'
-jobs:
-  build:
-    name: Address Sanitizer
-    runs-on: ubuntu-latest
-    env:
-      ASAN_OPTIONS: strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:detect_invalid_pointer_pairs=2:detect_leaks=0
-      CC: clang
-      CFLAGS: -fsanitize=address -Wall -Wextra -Wpedantic -Wformat=2 -Walloca -Wvla -Wimplicit-fallthrough -Wcast-qual -Wconversion -Wshadow -Wundef -Wstrict-prototypes -Wswitch-enum -fstack-protector -D_FORTIFY_SOURCE=2 -Werror
-      LDFLAGS: -fsanitize=address
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.12
-
-      - name: Install dependencies
-        run: |
-              python -m pip install --upgrade pip
-              pip install setuptools tox tox-gh-actions wheel
-
-      - name: Test with tox
-        run: tox
-        env:
-          LD_PRELOAD: libasan.so.6
-          MAXMINDDB_REQUIRE_EXTENSION: 1
-          MM_FORCE_EXT_TESTS: 1

maxminddb-2.5.1/.github/workflows/clang-analyzer.yml

@@ -1,38 +0,0 @@
-name: Clang Static Analysis
-
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: '3 15 * * SUN'
-
-jobs:
-  clang-analyzer:
-    name: Clang Static Analysis
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Install clang-tools
-        run: sudo apt install clang-tools
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.12
-
-      - name: Install dependencies
-        run: |
-              python -m pip install --upgrade pip
-              pip install setuptools wheel
-
-      - name: Build and run analyzer
-        # We exclude extension/libmaxminddb/ as libmaxminddb has its own workflow
-        # for this and we are not able to correct any issues with that code here.
-        run: scan-build --exclude extension/libmaxminddb/ --status-bugs python setup.py build
-        env:
-          CFLAGS: "-Werror -Wall -Wextra"
-          MAXMINDDB_REQUIRE_EXTENSION: 1

maxminddb-2.5.1/.github/workflows/codeql-analysis.yml

@@ -1,54 +0,0 @@
-name: "Code scanning - action"
-
-on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-  pull_request:
-  schedule:
-    - cron: '0 18 * * 0'
-
-jobs:
-  CodeQL-Build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-        submodules: true
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-      
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      # Override language selection by uncommenting this and choosing your languages
-      with:
-        languages: python, cpp
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    - name: Install dependencies
-      run: |
-            python -m pip install --upgrade pip
-            pip install setuptools wheel
-
-    - run: python setup.py build
-      env:
-        MAXMINDDB_REQUIRE_EXTENSION: 1
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2

maxminddb-2.5.1/.github/workflows/release.yml

@@ -1,64 +0,0 @@
-name: Build and upload to PyPI
-
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - main
-  release:
-    types:
-      - published
-
-jobs:
-  build_wheels:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.2
-        env:
-          CIBW_BUILD_VERBOSITY: 1
-          MAXMINDDB_REQUIRE_EXTENSION: 1
-
-      - uses: actions/upload-artifact@v3
-        with:
-          path: ./wheelhouse/*.whl
-
-  build_sdist:
-    name: Build source distribution
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Build sdist
-        run: pipx run build --sdist
-
-      - uses: actions/upload-artifact@v3
-        with:
-          path: dist/*.tar.gz
-
-  upload_pypi:
-    needs: [build_wheels, build_sdist]
-    runs-on: ubuntu-latest
-    environment: release
-    permissions:
-      id-token: write
-    if: github.event_name == 'release' && github.event.action == 'published'
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: artifact
-          path: dist
-
-      - uses: pypa/gh-action-pypi-publish@release/v1

maxminddb-2.5.1/.github/workflows/test-libmaxminddb.yml

@@ -1,57 +0,0 @@
-name: Python tests (system libmaxminddb)
-
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: '3 15 * * SUN'
-
-jobs:
-  build:
-
-    strategy:
-      matrix:
-        # We don't test on Windows currently due to issues
-        # build libmaxminddb there.
-        platform: [macos-latest, ubuntu-latest]
-        python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
-
-    name: Python ${{ matrix.python-version }} on ${{ matrix.platform }}
-    runs-on: ${{ matrix.platform }}
-    env:
-      MAXMINDDB_REQUIRE_EXTENSION: 1
-      MAXMINDDB_USE_SYSTEM_LIBMAXMINDDB: 1
-      MM_FORCE_EXT_TESTS: 1
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: |
-              python -m pip install --upgrade pip
-              pip install setuptools tox tox-gh-actions wheel
-
-
-      - name: Install libmaxminddb
-        run: sudo apt install libmaxminddb-dev
-        if: matrix.platform == 'ubuntu-latest'
-
-      - name: Install libmaxminddb
-        run: brew install libmaxminddb
-        if: matrix.platform == 'macos-latest'
-
-      - name: Build with Werror and Wall
-        run: python setup.py build
-        env:
-          CFLAGS: "-Werror -Wall -Wextra"
-
-      - name: Test with tox (system libmaxminddb)
-        run: tox

maxminddb-2.5.1/.github/workflows/test.yml

@@ -1,40 +0,0 @@
-name: Python tests
-
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: '3 15 * * SUN'
-
-jobs:
-  build:
-
-    strategy:
-      matrix:
-        platform: [macos-latest, ubuntu-latest, windows-latest]
-        python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
-
-    name: Python ${{ matrix.python-version }} on ${{ matrix.platform }}
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: |
-              python -m pip install --upgrade pip
-              pip install tox tox-gh-actions
-
-      - name: Test with tox (vendored libmaxminddb)
-        run: tox
-        env:
-          MAXMINDDB_REQUIRE_EXTENSION: 1
-          MM_FORCE_EXT_TESTS: 1

maxminddb-2.5.1/.gitignore

@@ -1,24 +0,0 @@
-*.egg
-*.iml
-*.pyc
-*.so
-*.sw?
-*~
-.coverage
-.eggs
-.idea
-.pyre
-.tox
-build
-compile_flags.txt
-core
-dist
-docs/_build
-docs/doctrees
-docs/html
-env/
-MANIFEST
-maxminddb.egg-info/
-pylint.txt
-valgrind-python.supp
-violations.pyflakes.txt

maxminddb-2.5.1/.gitmodules

@@ -1,6 +0,0 @@
-[submodule "tests/data"]
-	path = tests/data
-	url = https://github.com/maxmind/MaxMind-DB
-[submodule "extension/libmaxminddb"]
-	path = extension/libmaxminddb
-	url = git@github.com:maxmind/libmaxminddb.git

maxminddb-2.5.1/.pylintrc

@@ -1,4 +0,0 @@
-[BASIC]
-
-no-docstring-rgx=_.*
-extension-pkg-allow-list=maxminddb.extension

maxminddb-2.5.1/.readthedocs.yaml

@@ -1,6 +0,0 @@
-version: 2
-
-build:
-  os: ubuntu-22.04
-  tools:
-    python: "3.12"

maxminddb-2.5.1/dev-bin/clang-format-all.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-format="clang-format -i -style=file"
-
-for dir in extension; do
-    c_files=`find $dir -maxdepth 1 -name '*.c'`
-    if [ "$c_files" != "" ]; then
-        $format $dir/*.c;
-    fi
-
-    h_files=`find $dir -maxdepth 1 -name '*.h'`
-    if [ "$h_files" != "" ]; then
-        $format $dir/*.h;
-    fi
-done

maxminddb-2.5.1/dev-bin/release.sh

@@ -1,65 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-pip install twine sphinx
-
-changelog=$(cat HISTORY.rst)
-
-regex='
-([0-9]+\.[0-9]+\.[0-9]+) \(([0-9]{4}-[0-9]{2}-[0-9]{2})\)
-\+*
-
-((.|
-)*)
-'
-
-if [[ ! $changelog =~ $regex ]]; then
-      echo "Could not find date line in change log!"
-      exit 1
-fi
-
-version="${BASH_REMATCH[1]}"
-date="${BASH_REMATCH[2]}"
-notes="$(echo "${BASH_REMATCH[3]}" | sed -n -e '/^[0-9]\+\.[0-9]\+\.[0-9]\+/,$!p')"
-
-if [[ "$date" !=  $(date +"%Y-%m-%d") ]]; then
-    echo "$date is not today!"
-    exit 1
-fi
-
-tag="v$version"
-
-if [ -n "$(git status --porcelain)" ]; then
-    echo ". is not clean." >&2
-    exit 1
-fi
-
-perl -pi -e "s/(?<=__version__ = \").+?(?=\")/$version/gsm" maxminddb/__init__.py
-perl -pi -e "s/(?<=^version = \").+?(?=\")/$version/gsm" pyproject.toml
-
-echo $"Test results:"
-tox
-
-echo $'\nDiff:'
-git diff
-
-echo $'\nRelease notes:'
-echo "$notes"
-
-read -e -p "Commit changes and push to origin? " should_push
-
-if [ "$should_push" != "y" ]; then
-    echo "Aborting"
-    exit 1
-fi
-
-if [ -n "$(git status --porcelain)" ]; then
-    git commit -m "Update for $tag" -a
-fi
-
-git push
-
-gh release create --target "$(git branch --show-current)" -t "$version" -n "$notes" "$tag"
-
-git push --tags