Merge branch 'master' into dependabot/pip/django-taggit-approx-eq-6.1.0

Author: nemesifier

.github/FUNDING.yml

@@ -1,5 +1,5 @@
 # These are supported funding model platforms
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [openwisp]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,15 +3,15 @@ name: Bug report
 about: Open a bug report
 title: "[bug] "
 labels: bug
-assignees: ''
-
+assignees: ""
 ---
 
 **Describe the bug**
 A clear and concise description of the bug or unexpected behavior.
 
 **Steps To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,7 +24,8 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **System Informatioon:**
- - OS: [e.g. Ubuntu 24.04 LTS]
- - Python Version: [e.g. Python 3.11.2]
- - Django Version: [e.g. Django 4.2.5]
- - Browser and Browser Version (if applicable): [e.g. Chromium v126.0.6478.126]
+
+- OS: [e.g. Ubuntu 24.04 LTS]
+- Python Version: [e.g. Python 3.11.2]
+- Django Version: [e.g. Django 4.2.5]
+- Browser and Browser Version (if applicable): [e.g. Chromium v126.0.6478.126]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,8 +3,7 @@ name: Feature request
 about: Suggest an idea for this project
 title: "[feature] "
 labels: enhancement
-assignees: ''
-
+assignees: ""
 ---
 
 **Is your feature request related to a problem? Please describe.**

.github/ISSUE_TEMPLATE/question.md

@@ -3,8 +3,7 @@ name: Question
 about: Please use the Discussion Forum to ask questions
 title: "[question] "
 labels: question
-assignees: ''
-
+assignees: ""
 ---
 
 Please use the [Discussion Forum](https://github.com/orgs/openwisp/discussions) to ask questions.

.github/workflows/ci.yml

@@ -1,5 +1,4 @@
 ---
-
 name: OpenWISP Controller CI Build
 
 on:
@@ -9,6 +8,9 @@ on:
   pull_request:
     branches:
       - master
+      - "1.1"
+      - gsoc25-map
+      - gsoc25-whois
 
 jobs:
   build:
@@ -39,76 +41,76 @@ jobs:
             django-version: django~=4.2.0
 
     steps:
-    - uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
-    - name: Cache APT packages
-      uses: actions/cache@v4
-      with:
-        path: /var/cache/apt/archives
-        key: apt-${{ runner.os }}-${{ hashFiles('.github/workflows/ci.yml') }}
-        restore-keys: |
-          apt-${{ runner.os }}-
+      - name: Cache APT packages
+        uses: actions/cache@v4
+        with:
+          path: /var/cache/apt/archives
+          key: apt-${{ runner.os }}-${{ hashFiles('.github/workflows/ci.yml') }}
+          restore-keys: |
+            apt-${{ runner.os }}-
 
-    - name: Disable man page auto-update
-      run: |
-        echo 'set man-db/auto-update false' | sudo debconf-communicate >/dev/null
-        sudo dpkg-reconfigure man-db
+      - name: Disable man page auto-update
+        run: |
+          echo 'set man-db/auto-update false' | sudo debconf-communicate >/dev/null
+          sudo dpkg-reconfigure man-db
 
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-        cache: 'pip'
-        cache-dependency-path: |
-          **/requirements*.txt
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: "pip"
+          cache-dependency-path: |
+            **/requirements*.txt
 
-    - name: Install Dependencies
-      id: deps
-      run: |
-        sudo apt update
-        sudo apt -qq -y install sqlite3 gdal-bin libproj-dev \
-          libgeos-dev libspatialite-dev spatialite-bin \
-          libsqlite3-mod-spatialite
-        sudo npm install -g prettier
-        pip install -U pip wheel setuptools
-        pip install -U -r requirements-test.txt
-        pip install -U -e .
-        pip install ${{ matrix.django-version }}
+      - name: Install Dependencies
+        id: deps
+        run: |
+          sudo apt update
+          sudo apt -qq -y install sqlite3 gdal-bin libproj-dev \
+            libgeos-dev libspatialite-dev spatialite-bin \
+            libsqlite3-mod-spatialite
+          sudo npm install -g prettier
+          pip install -U pip wheel setuptools
+          pip install -U -r requirements-test.txt
+          pip install -U -e .
+          pip install ${{ matrix.django-version }}
 
-    - name: Start postgres and redis
-      if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
-      run: docker compose up -d postgres redis
+      - name: Start postgres and redis
+        if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
+        run: docker compose up -d postgres redis
 
-    - name: QA checks
-      run: ./run-qa-checks
+      - name: QA checks
+        run: ./run-qa-checks
 
-    - name: Tests
-      if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
-      run: |
-        coverage run runtests.py --parallel || coverage run ./runtests.py
-        # tests the extension capability
-        SAMPLE_APP=1 coverage run ./runtests.py --parallel --keepdb --exclude-tag=selenium_tests \
-          || SAMPLE_APP=1 coverage run ./runtests.py --keepdb --exclude-tag=selenium_tests
-        coverage combine
-        coverage xml
-      env:
-        SELENIUM_HEADLESS: 1
-        GECKO_LOG: 1
+      - name: Tests
+        if: ${{ !cancelled() && steps.deps.conclusion == 'success' }}
+        run: |
+          coverage run runtests.py --parallel || coverage run ./runtests.py
+          # tests the extension capability
+          SAMPLE_APP=1 coverage run ./runtests.py --parallel --keepdb --exclude-tag=selenium_tests \
+            || SAMPLE_APP=1 coverage run ./runtests.py --keepdb --exclude-tag=selenium_tests
+          coverage combine
+          coverage xml
+        env:
+          SELENIUM_HEADLESS: 1
+          GECKO_LOG: 1
 
-    - name: Show gecko web driver log on failures
-      if: ${{ failure() }}
-      run: cat geckodriver.log
+      - name: Show gecko web driver log on failures
+        if: ${{ failure() }}
+        run: cat geckodriver.log
 
-    - name: Upload Coverage
-      if: ${{ success() }}
-      uses: coverallsapp/github-action@v2
-      with:
-        parallel: true
-        format: cobertura
-        flag-name: python-${{ matrix.env.env }}
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload Coverage
+        if: ${{ success() }}
+        uses: coverallsapp/github-action@v2
+        with:
+          parallel: true
+          format: cobertura
+          flag-name: python-${{ matrix.env.env }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
   coveralls:
     needs: build

.github/workflows/publiccode-yml-validation.yml

@@ -0,0 +1,12 @@
+name: publiccode.yml validation
+
+on: [pull_request, push]
+
+jobs:
+  publiccode_yml_validation:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: italia/publiccode-parser-action@v1
+        with:
+          publiccode: "publiccode.yml"

.github/workflows/pypi.yml

@@ -17,16 +17,16 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.10'
-    - name: Install dependencies
-      run: |
-        pip install -U pip
-        pip install build
-    - name: Build package
-      run: python -m build
-    - name: Publish package distributions to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.12.4
+      - uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+      - name: Install dependencies
+        run: |
+          pip install -U pip
+          pip install build
+      - name: Build package
+        run: python -m build
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@v1.13.0

CHANGES.rst

@@ -6,6 +6,41 @@ Version 1.2.0 [Unreleased]
 
 Work in progress.
 
+Version 1.1.2 [2025-08-01]
+--------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Fixed `compatibility of OpenWrt.update_config with openwisp-config >=
+  1.1.0 <https://github.com/openwisp/openwisp-controller/issues/964>`__.
+- Fixed `VPN-client template switch issue when switching between VPN
+  servers with the same address
+  <https://github.com/openwisp/openwisp-controller/issues/973>`__.
+- Fixed `missing config_changed signal when reverting a template
+  <https://github.com/openwisp/openwisp-controller/issues/836>`__.
+- Fixed `Zerotier network name being set to "ow_zt" instead of "global"
+  <https://github.com/openwisp/openwisp-controller/issues/982>`__.
+- Fixed error in preview when device has no name set.
+- Fixed live updates for "Send commands" when multiple websocket
+  connections are open for the same device.
+- Limited command results in the device admin to 30 entries to avoid
+  loading issues.
+- Fixed uncaught exception in ``leaflet.draw.i18n.js``.
+- Fixed `handling of devices without a DeviceConnection when creating
+  commands
+  <https://github.com/openwisp/openwisp-controller/issues/1016>`__.
+- Prevented `adding multiple VPN client templates pointing to the same VPN
+  server <https://github.com/openwisp/openwisp-controller/issues/832>`__.
+- Fixed timeout issues in VPN checksum and download configuration views
+  for large VPN setups (e.g., 2000+ WireGuard peers) by caching the
+  checksum and generated configuration.
+- Fixed an issue where enforcing required templates was accidentally
+  deleting `VpnClient` objects, causing them to be recreated whenever
+  device templates were modified in the Django admin.
+- Fixed ``HTTP 500 Server Error`` when geographic REST API endpoints
+  receive a malformed resource ID.
+
 Version 1.1.1 [2025-01-31]
 --------------------------
 

docs/developer/extending.rst

@@ -342,9 +342,7 @@ Once you have created the models, add the following to your
     CONFIG_TEMPLATE_MODEL = "sample_config.Template"
     CONFIG_VPN_MODEL = "sample_config.Vpn"
     CONFIG_VPNCLIENT_MODEL = "sample_config.VpnClient"
-    CONFIG_ORGANIZATIONCONFIGSETTINGS_MODEL = (
-        "sample_config.OrganizationConfigSettings"
-    )
+    CONFIG_ORGANIZATIONCONFIGSETTINGS_MODEL = "sample_config.OrganizationConfigSettings"
     CONFIG_ORGANIZATIONLIMITS_MODEL = "sample_config.OrganizationLimits"
     DJANGO_X509_CA_MODEL = "sample_pki.Ca"
     DJANGO_X509_CERT_MODEL = "sample_pki.Cert"
@@ -354,12 +352,8 @@ Once you have created the models, add the following to your
     CONNECTION_CREDENTIALS_MODEL = "sample_connection.Credentials"
     CONNECTION_DEVICECONNECTION_MODEL = "sample_connection.DeviceConnection"
     CONNECTION_COMMAND_MODEL = "sample_connection.Command"
-    SUBNET_DIVISION_SUBNETDIVISIONRULE_MODEL = (
-        "sample_subnet_division.SubnetDivisionRule"
-    )
-    SUBNET_DIVISION_SUBNETDIVISIONINDEX_MODEL = (
-        "sample_subnet_division.SubnetDivisionIndex"
-    )
+    SUBNET_DIVISION_SUBNETDIVISIONRULE_MODEL = "sample_subnet_division.SubnetDivisionRule"
+    SUBNET_DIVISION_SUBNETDIVISIONINDEX_MODEL = "sample_subnet_division.SubnetDivisionIndex"
 
 Substitute ``sample_config``, ``sample_pki``, ``sample_connection``,
 ``sample_geo`` & ``sample_subnet_division`` with the name you chose in
@@ -483,9 +477,7 @@ For example:
         SubnetDivisionRuleInlineAdmin,
     )
 
-    SubnetDivisionRuleInlineAdmin.fields += [
-        "example"
-    ]  # <-- monkey patching example
+    SubnetDivisionRuleInlineAdmin.fields += ["example"]  # <-- monkey patching example
 
 14.2. Inheriting admin classes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -843,9 +835,7 @@ them upon deletion for that device.
         # performs no operation for existing objects.
         @classmethod
         def provision_for_existing_objects(cls, rule_obj):
-            for device in Device.objects.filter(
-                organization=rule_obj.organization
-            ):
+            for device in Device.objects.filter(organization=rule_obj.organization):
                 cls.provision_receiver(device, created=True)
 
 After creating a class for your custom rule type, you will need to set