[feature] Added OWE encryption type #193

Closes #193

Co-authored-by: kellerman <ap1821@gmail.com>
Co-authored-by: Federico Capoano <f.capoano@openwisp.io>

Author: 3 people

netjsonconfig/backends/openwrt/converters/wireless.py

@@ -103,6 +103,7 @@ def __intermediate_encryption(self, wireless):
             'wpa_enterprise_mixed': 'wpa-mixed',
             'wpa2_enterprise_mixed': 'wpa3-mixed',
             'wps': 'psk',
+            'owe': 'owe',
         }
         # if encryption disabled return empty dict
         if not encryption or disabled or encryption['protocol'] == 'none':
@@ -310,6 +311,7 @@ def __netjson_encryption(self, wifi):  # noqa: C901
                 'wpa3': 'wpa3_enterprise',
                 'wpa-mixed': 'wpa_enterprise_mixed',
                 'wpa3-mixed': 'wpa2_enterprise_mixed',
+                'owe': 'owe',
             }
             settings['protocol'] = protocol_mapping[protocol]
             settings['cipher'] = cipher

netjsonconfig/schema.py

@@ -358,6 +358,7 @@
                     "propertyOrder": 20,
                     "oneOf": [
                         {"$ref": "#/definitions/encryption_none"},
+                        {"$ref": "#/definitions/encryption_owe"},
                         {"$ref": "#/definitions/encryption_wpa3_personal"},
                         {"$ref": "#/definitions/encryption_wpa3_enterprise_ap"},
                         {"$ref": "#/definitions/encryption_wpa3_personal_mixed"},
@@ -379,6 +380,7 @@
                     "propertyOrder": 20,
                     "oneOf": [
                         {"$ref": "#/definitions/encryption_none"},
+                        {"$ref": "#/definitions/encryption_owe"},
                         {"$ref": "#/definitions/encryption_wpa3_personal"},
                         {"$ref": "#/definitions/encryption_wpa3_enterprise_sta"},
                         {"$ref": "#/definitions/encryption_wpa3_personal_mixed"},
@@ -501,6 +503,25 @@
                 }
             },
         },
+        "encryption_owe": {
+            "title": "Opportunistic Wireless Encryption",
+            "allOf": [
+                {"$ref": "#/definitions/encryption_mfp_property"},
+                {
+                    "properties": {
+                        "protocol": {
+                            "type": "string",
+                            "title": "encryption protocol",
+                            "propertyOrder": 1,
+                            "enum": ["owe"],
+                            "options": {
+                                "enum_titles": ["Opportunistic Wireless Encryption"]
+                            },
+                        }
+                    }
+                },
+            ],
+        },
         "encryption_wpa3_personal": {
             "title": "WPA3 Personal",
             "allOf": [

tests/openwrt/test_encryption.py

@@ -1292,3 +1292,52 @@ def test_render_ieee80211w(self):
         }
         with self.assertRaises(ValidationError):
             OpenWrt(_netjson_wpa2_enterprise_mixed_cipher_tkip).render()
+
+    _owe_netjson = {
+        "interfaces": [
+            {
+                "name": "wlan0",
+                "type": "wireless",
+                "wireless": {
+                    "radio": "radio0",
+                    "mode": "access_point",
+                    "ssid": "owe_ssid",
+                    "encryption": {
+                        "protocol": "owe",
+                        "cipher": "auto",
+                        "ieee80211w": "1",
+                    },
+                },
+            }
+        ]
+    }
+
+    _owe_uci = """package network
+
+config device 'device_wlan0'
+    option name 'wlan0'
+
+config interface 'wlan0'
+    option device 'wlan0'
+    option proto 'none'
+
+package wireless
+
+config wifi-iface 'wifi_wlan0'
+    option device 'radio0'
+    option encryption 'owe'
+    option ieee80211w '1'
+    option ifname 'wlan0'
+    option mode 'ap'
+    option network 'wlan0'
+    option ssid 'owe_ssid'
+"""
+
+    def test_render_owe(self):
+        o = OpenWrt(self._owe_netjson)
+        expected = self._tabs(self._owe_uci)
+        self.assertEqual(o.render(), expected)
+
+    def test_parse_owe(self):
+        o = OpenWrt(native=self._owe_uci)
+        self.assertEqual(o.config, self._owe_netjson)