Merge branch 'master' into issues/1049-send-generic-message

Author: stktyagi

.github/workflows/ci.yml

@@ -35,12 +35,12 @@ jobs:
             django-version: django~=4.2.0
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Cache APT packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: /var/cache/apt/archives
           key: apt-${{ runner.os }}-${{ hashFiles('.github/workflows/ci.yml') }}

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

@@ -6,7 +6,7 @@ jobs:
   publiccode_yml_validation:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: italia/publiccode-parser-action@v1
         with:
           publiccode: "publiccode.yml"

.github/workflows/pypi.yml

@@ -17,7 +17,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

docs/developer/extending.rst

@@ -37,7 +37,7 @@ a field ``social_security_number`` in the `sample_users/models.py
 
 Firstly, to get started you need to create a django project:
 
-.. code-block::
+.. code-block:: bash
 
     django-admin startproject mycontroller
 
@@ -55,7 +55,7 @@ of python scripts), in the following examples we'll call these django app
 ``sample_config``, ``sample_pki``, ``sample_connection``, ``sample_geo`` &
 ``sample_subnet_division``. but you can name it how you want:
 
-.. code-block::
+.. code-block:: bash
 
     django-admin startapp sample_config
     django-admin startapp sample_pki
@@ -77,7 +77,7 @@ apps, please refer to the `django documentation
 
 Install (and add to the requirement of your project) openwisp-controller:
 
-.. code-block::
+.. code-block:: bash
 
     pip install openwisp-controller
 
@@ -364,7 +364,7 @@ step 1.
 
 Create database migrations:
 
-.. code-block::
+.. code-block:: bash
 
     ./manage.py makemigrations
 
@@ -385,7 +385,7 @@ make a migrations file which would look like:
 
 Create database migrations:
 
-.. code-block::
+.. code-block:: bash
 
     ./manage.py migrate
 
@@ -723,7 +723,7 @@ For running the tests, you need to copy fixtures as well:
 
 You can then run tests with:
 
-.. code-block::
+.. code-block:: bash
 
     # the --parallel flag is optional
     ./manage.py test --parallel mycontroller

docs/developer/installation.rst

@@ -166,7 +166,7 @@ Unable to Load SpatiaLite library Extension?
 
 If you are incurring in the following exception:
 
-.. code-block::
+.. code-block:: text
 
     django.core.exceptions.ImproperlyConfigured: Unable to load the SpatiaLite library extension
 

docs/index.rst

@@ -6,10 +6,10 @@ Controller
     **Source code**: `github.com/openwisp/openwisp-controller
     <https://github.com/openwisp/openwisp-controller>`_.
 
-OpenWISP Controller is responsible of of managing the core resources of
-the network and allows automating several aspects like adoption,
-provisioning, VPN tunnel configuration, generation of X509 certificates,
-subnet and IP address allocation and more.
+OpenWISP Controller is responsible for managing the core resources of the
+network and allows automating several aspects like adoption, provisioning,
+VPN tunnel configuration, generation of X509 certificates, subnet and IP
+address allocation and more.
 
 For a full introduction please refer to :doc:`user/intro`.
 

docs/user/import-export.rst

@@ -16,7 +16,7 @@ needed, for example, the following CSV file will import a device named
 ``TestImport`` with mac address ``00:11:22:09:44:55`` in the organization
 with UUID ``3cb5e18c-0312-48ab-8dbd-038b8415bd6f``:
 
-.. code-block::
+.. code-block:: text
 
     organization,name,mac_address
     3cb5e18c-0312-48ab-8dbd-038b8415bd6f,TestImport,00:11:22:09:44:55

docs/user/openvpn.rst

@@ -65,14 +65,14 @@ After installing both Ansible and Git, install the required roles:
 Create an Ansible inventory file named ``inventory`` **on your local
 machine** (not on the server) with the following contents:
 
-.. code-block::
+.. code-block:: ini
 
     [openvpn]
     your_server_domain_or_ip
 
 For example, if your server IP is ``192.168.56.2``:
 
-.. code-block::
+.. code-block:: ini
 
     [openvpn]
     192.168.56.2

docs/user/templates.rst

@@ -165,7 +165,7 @@ device registers in the system.
 
 Here's the sample ``/etc/config/openwisp`` configuration for mesh devices:
 
-.. code-block::
+.. code-block:: ini
 
     config controller 'http'
         option url 'https://openwisp2.mynetwork.com'
@@ -184,7 +184,7 @@ assigned to them.
 The sample ``/etc/config/openwisp`` configuration for dumb access points
 is the following:
 
-.. code-block::
+.. code-block:: ini
 
     config controller 'http'
         option url 'https://openwisp2.mynetwork.com'

openwisp_controller/config/base/channels_consumer.py

@@ -10,13 +10,7 @@ class BaseDeviceConsumer(WebsocketConsumer):
     channel_layer_group = "config.device"
 
     def _is_user_authenticated(self):
-        try:
-            assert self.scope["user"].is_authenticated is True
-        except (KeyError, AssertionError):
-            self.close()
-            return False
-        else:
-            return True
+        return self.scope["user"].is_authenticated is True
 
     def is_user_authorized(self):
         user = self.scope["user"]