openwisp-controller 1.2__tar.gz → 1.2.2__tar.gz

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/CHANGES.rst

@@ -1,6 +1,30 @@
 Changelog
 =========
 
+Version 1.2.2 [2026-03-06]
+--------------------------
+
+Changes
+~~~~~~~
+
+Other changes
++++++++++++++
+
+- Improved help text of configuration variable fields
+- Minor fixes in the test suite
+
+Version 1.2.1 [2026-03-04]
+--------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Use context variables in Vpn.auto_client for OpenVPN backend
+- Fixed 500 FieldError in DeviceLocationView `#1110
+  <https://github.com/openwisp/openwisp-controller/issues/1110>`_
+- Fixed MultiValueDictKeyError on empty device form submission `#1057
+  <https://github.com/openwisp/openwisp-controller/issues/1057>`_
+
 Version 1.2.0 [2025-10-24]
 --------------------------
 

{openwisp_controller-1.2/openwisp_controller.egg-info → openwisp_controller-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwisp-controller
-Version: 1.2
+Version: 1.2.2
 Summary: OpenWISP Controller
 Home-page: http://openwisp.org
 Download-URL: https://github.com/openwisp/openwisp-controller/releases

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 2, 0, "final")
+VERSION = (1, 2, 2, "final")
 __version__ = VERSION  # alias
 
 

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/admin.py

@@ -352,10 +352,13 @@ class ConfigForm(AlwaysHasChangedMixin, BaseForm):
         config_model = self.Meta.model
         instance = config_model(**options)
         device_model = config_model.device.field.related_model
-        org = Organization.objects.get(pk=self.data["organization"])
+        if not (org_id := self.data.get("organization")):
+            # We cannot validate the templates without an organization.
+            return
+        org = Organization.objects.get(pk=org_id)
         instance.device = device_model(
-            name=self.data["name"],
-            mac_address=self.data["mac_address"],
+            name=self.data.get("name", ""),
+            mac_address=self.data.get("mac_address", ""),
             organization=org,
         )
         return instance
@@ -369,6 +372,12 @@ class ConfigForm(AlwaysHasChangedMixin, BaseForm):
             # when adding self.instance is empty, we need to create a
             # temporary instance that we'll use just for validation
             config = self.get_temp_model_instance(**data)
+            if not config:
+                # The request does not contain vaild data to create a temporary
+                # Device instance. Thus, we cannot validate the templates.
+                # The Device validation will be handled by DeviceAdmin.
+                # Therefore, we don't need to raise any error here.
+                return
         else:
             config = self.instance
         if config.backend and templates:

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/base/config.py

@@ -94,10 +94,10 @@ class AbstractConfig(ChecksumCacheMixin, BaseConfig):
         blank=True,
         default=dict,
         help_text=_(
-            "Additional "
-            '<a href="http://netjsonconfig.openwisp.org/'
-            'en/stable/general/basics.html#context" target="_blank">'
-            "context (configuration variables)</a> in JSON format"
+            "allows overriding "
+            '<a href="https://openwisp.io/docs/stable/controller/user/variables.html'
+            '" target="_blank">'
+            "configuration variables</a>"
         ),
         load_kwargs={"object_pairs_hook": collections.OrderedDict},
         dump_kwargs={"indent": 4},

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/base/device_group.py

@@ -42,8 +42,9 @@ class AbstractDeviceGroup(OrgMixin, TimeStampedEditableModel):
         load_kwargs={"object_pairs_hook": collections.OrderedDict},
         dump_kwargs={"indent": 4},
         help_text=_(
-            "Group meta data, use this field to store data which is related"
-            " to this group and can be retrieved via the REST API."
+            "Store custom metadata related to this group. This field is intended "
+            "for arbitrary data that does not affect device configuration and can "
+            "be retrieved via the REST API for integrations or external tools."
         ),
         verbose_name=_("Metadata"),
     )
@@ -53,8 +54,7 @@ class AbstractDeviceGroup(OrgMixin, TimeStampedEditableModel):
         load_kwargs={"object_pairs_hook": collections.OrderedDict},
         dump_kwargs={"indent": 4},
         help_text=_(
-            "This field can be used to add meta data for the group"
-            ' or to add "Configuration Variables" to the devices.'
+            "Define configuration variables available to all devices in this group"
         ),
         verbose_name=_("Configuration Variables"),
     )

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/base/multitenancy.py

@@ -37,7 +37,8 @@ class AbstractOrganizationConfigSettings(UUIDModel):
         load_kwargs={"object_pairs_hook": collections.OrderedDict},
         dump_kwargs={"indent": 4},
         help_text=_(
-            'This field can be used to add "Configuration Variables"' " to the devices."
+            "Define reusable configuration variables available "
+            "to all devices in this organization"
         ),
         verbose_name=_("Configuration Variables"),
     )

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/base/template.py

@@ -97,10 +97,9 @@ class AbstractTemplate(ShareableOrgMixinUniqueName, BaseConfig):
         default=dict,
         blank=True,
         help_text=_(
-            "A dictionary containing the default "
-            "values for the variables used by this "
-            "template; these default variables will "
-            "be used during schema validation."
+            "Define default values for the variables used in this template. "
+            "These values are used during validation and when a variable is "
+            "not provided by the device, group, or organization."
         ),
         load_kwargs={"object_pairs_hook": OrderedDict},
         dump_kwargs={"indent": 4},

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/base/vpn.py

@@ -648,7 +648,7 @@ class AbstractVpn(ConfigChecksumCacheMixin, ShareableOrgMixinUniqueName, BaseCon
                 context_keys.pop("ip_address", None)
                 context_keys.pop("vpn_subnet", None)
                 auto = backend.auto_client(
-                    host=self.host,
+                    host=vpn_host,
                     server=self.config[config_dict_key][0],
                     **context_keys,
                 )

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0023_update_context.py

@@ -18,9 +18,10 @@ class Migration(migrations.Migration):
                 default=dict,
                 dump_kwargs={"ensure_ascii": False, "indent": 4},
                 help_text=(
-                    'Additional <a href="http://netjsonconfig.openwisp.org'
-                    '/en/stable/general/basics.html#context" target="_blank">'
-                    "context (configuration variables)</a> in JSON format"
+                    "allows overriding "
+                    '<a href="https://openwisp.io/docs/stable/controller/user/variables.html'  # noqa: E501
+                    '" target="_blank">'
+                    "configuration variables</a>"
                 ),
                 load_kwargs={"object_pairs_hook": collections.OrderedDict},
             ),

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0028_template_default_values.py

@@ -18,9 +18,9 @@ class Migration(migrations.Migration):
                 default=dict,
                 dump_kwargs={"ensure_ascii": False, "indent": 4},
                 help_text=(
-                    "A dictionary containing the default values for "
-                    "the variables used by this template; these default "
-                    "variables will be used during schema validation."
+                    "Define default values for the variables used in this template. "
+                    "These values are used during validation and when a variable is "
+                    "not provided by the device, group, or organization."
                 ),
                 load_kwargs={"object_pairs_hook": collections.OrderedDict},
                 verbose_name="Default Values",

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0036_device_group.py

@@ -62,9 +62,11 @@ class Migration(migrations.Migration):
                         dump_kwargs={"ensure_ascii": False, "indent": 4},
                         load_kwargs={"object_pairs_hook": collections.OrderedDict},
                         help_text=(
-                            "Group meta data, use this field to store data which is"
-                            " related to this group and can be retrieved via the"
-                            " REST API."
+                            "Store custom metadata related to this group. "
+                            "This field is intended for arbitrary data that "
+                            "does not affect device configuration and can "
+                            "be retrieved via the REST API for integrations "
+                            "or external tools."
                         ),
                         verbose_name="Metadata",
                     ),

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0049_devicegroup_context.py

@@ -20,8 +20,8 @@ class Migration(migrations.Migration):
                 default=dict,
                 dump_kwargs={"ensure_ascii": False, "indent": 4},
                 help_text=(
-                    "This field can be used to add meta data for the group"
-                    ' or to add "Configuration Variables" to the devices.'
+                    "Define configuration variables available "
+                    "to all devices in this group"
                 ),
                 load_kwargs={"object_pairs_hook": collections.OrderedDict},
                 verbose_name="Configuration Variables",

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/migrations/0051_organizationconfigsettings_context.py

@@ -20,8 +20,8 @@ class Migration(migrations.Migration):
                 default=dict,
                 dump_kwargs={"indent": 4},
                 help_text=(
-                    'This field can be used to add "Configuration Variables"'
-                    " to the devices."
+                    "Define reusable configuration variables available "
+                    "to all devices in this organization"
                 ),
                 load_kwargs={"object_pairs_hook": collections.OrderedDict},
                 verbose_name="Configuration Variables",

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/tests/test_admin.py

@@ -2279,6 +2279,36 @@ class TestAdmin(
         config = self._create_config(organization=self._get_org())
         self._verify_template_queries(config, 10)
 
+    def test_empty_device_form_with_config_inline(self):
+        org = self._get_org()
+        template = self._create_template(organization=org)
+        path = reverse(f"admin:{self.app_label}_device_add")
+        # Submit form without required device fields but with config inline
+        # This reproduces the scenario where user clicks "Add another Configuration"
+        # and submits without filling device details
+        params = {
+            "config-0-backend": "netjsonconfig.OpenWrt",
+            "config-0-templates": str(template.pk),
+            "config-0-config": json.dumps({}),
+            "config-0-context": "",
+            "config-TOTAL_FORMS": 1,
+            "config-INITIAL_FORMS": 0,
+            "config-MIN_NUM_FORMS": 0,
+            "config-MAX_NUM_FORMS": 1,
+            "deviceconnection_set-TOTAL_FORMS": 0,
+            "deviceconnection_set-INITIAL_FORMS": 0,
+            "deviceconnection_set-MIN_NUM_FORMS": 0,
+            "deviceconnection_set-MAX_NUM_FORMS": 1000,
+            "command_set-TOTAL_FORMS": 0,
+            "command_set-INITIAL_FORMS": 0,
+            "command_set-MIN_NUM_FORMS": 0,
+            "command_set-MAX_NUM_FORMS": 1000,
+        }
+        response = self.client.post(path, params)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "errorlist")
+        self.assertEqual(Device.objects.count(), 0)
+
 
 class TestTransactionAdmin(
     CreateConfigTemplateMixin,

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/config/tests/test_vpn.py

@@ -3,12 +3,13 @@ import uuid
 from subprocess import CalledProcessError, TimeoutExpired
 from unittest import mock
 
+import requests
 from celery.exceptions import Retry, SoftTimeLimitExceeded
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db.models.signals import post_save
 from django.db.utils import IntegrityError
-from django.http.response import HttpResponse, HttpResponseNotFound
+from django.http.response import HttpResponse
 from django.test import TestCase, TransactionTestCase
 from requests.exceptions import ConnectionError, RequestException, Timeout
 from swapper import load_model
@@ -194,12 +195,13 @@ class TestVpn(BaseTestVpn, TestCase):
         vpn = self._create_vpn()
         auto = vpn.auto_client()
         context_keys = vpn._get_auto_context_keys()
-        del context_keys["vpn_host"]
         del context_keys["vpn_port"]
         for key in context_keys.keys():
             context_keys[key] = "{{%s}}" % context_keys[key]
         control = vpn.backend_class.auto_client(
-            host=vpn.host, server=self._vpn_config["openvpn"][0], **context_keys
+            host=context_keys.pop("vpn_host"),
+            server=self._vpn_config["openvpn"][0],
+            **context_keys,
         )
         control["files"] = [
             {
@@ -224,14 +226,15 @@ class TestVpn(BaseTestVpn, TestCase):
         vpn = self._create_vpn()
         auto = vpn.auto_client(auto_cert=False)
         context_keys = vpn._get_auto_context_keys()
-        del context_keys["vpn_host"]
         del context_keys["vpn_port"]
         for key in context_keys.keys():
             context_keys[key] = "{{%s}}" % context_keys[key]
         for key in ["cert_path", "cert_contents", "key_path", "key_contents"]:
             del context_keys[key]
         control = vpn.backend_class.auto_client(
-            host=vpn.host, server=self._vpn_config["openvpn"][0], **context_keys
+            host=context_keys.pop("vpn_host"),
+            server=self._vpn_config["openvpn"][0],
+            **context_keys,
         )
         control["files"] = [
             {
@@ -828,23 +831,33 @@ class TestWireguardTransaction(BaseTestVpn, TestWireguardVpnMixin, TransactionTe
         with self.subTest("Webhook endpoint and authentication endpoint is present"):
             vpn.webhook_endpoint = "https://example.com"
             vpn.auth_token = "super-secret-token"
-            vpn.save()
-            vpn_client.refresh_from_db()
+            success_response = mock.Mock(spec=requests.Response)
+            success_response.status_code = 200
+            success_response.raise_for_status = mock.Mock()
 
             with mock.patch(
                 "openwisp_controller.config.tasks.logger.info"
             ) as mocked_logger, mock.patch(
                 "requests.post", return_value=HttpResponse()
             ):
+                vpn.save()
+                vpn_client.refresh_from_db()
                 post_save.send(
                     instance=vpn_client, sender=vpn_client._meta.model, created=False
                 )
-                mocked_logger.assert_called_once_with(
+                expected_call = mock.call(
                     f"Triggered update webhook of VPN Server UUID: {vpn.pk}"
                 )
+                mocked_logger.assert_has_calls([expected_call, expected_call])
+                self.assertEqual(mocked_logger.call_count, 2)
 
+            fail_response = mock.Mock(spec=requests.Response)
+            fail_response.status_code = 404
+            fail_response.raise_for_status.side_effect = requests.exceptions.HTTPError(
+                "Not Found"
+            )
             with mock.patch("logging.Logger.error") as mocked_logger, mock.patch(
-                "requests.post", return_value=HttpResponseNotFound()
+                "requests.post", return_value=fail_response
             ):
                 post_save.send(
                     instance=vpn_client, sender=vpn_client._meta.model, created=False

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/geo/api/views.py

@@ -115,6 +115,7 @@ class DeviceLocationView(
     lookup_field = "content_object"
     lookup_url_kwarg = "pk"
     organization_field = "content_object__organization"
+    organization_lookup = "organization__in"
     _device_field = "content_object"
 
     def get_queryset(self):

{openwisp_controller-1.2 → openwisp_controller-1.2.2}/openwisp_controller/geo/tests/test_api.py

@@ -9,6 +9,7 @@ from django.test.client import BOUNDARY, MULTIPART_CONTENT, encode_multipart
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
 from PIL import Image
+from rest_framework import status
 from rest_framework.authtoken.models import Token
 from swapper import load_model
 
@@ -1036,3 +1037,20 @@ class TestGeoApi(
         with self.subTest("Test deleting DeviceLocation"):
             response = self.client.delete(url)
             self.assertEqual(response.status_code, 403)
+
+    def test_device_location_view_parent_permission(self):
+        org1 = self._create_org(name="Org One")
+        device1 = self._create_device(organization=org1)
+        org2 = self._create_org(name="Org Two")
+        manager_org2 = self._create_administrator(
+            organizations=[org2],
+            username="manager_org2",
+            password="test_password",
+            is_superuser=False,
+            is_staff=True,
+        )
+        self.client.force_login(manager_org2)
+        url = reverse("geo_api:device_location", args=[device1.pk])
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+        self.client.logout()

{openwisp_controller-1.2 → openwisp_controller-1.2.2/openwisp_controller.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openwisp-controller
-Version: 1.2
+Version: 1.2.2
 Summary: OpenWISP Controller
 Home-page: http://openwisp.org
 Download-URL: https://github.com/openwisp/openwisp-controller/releases