Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[change] OpenWrt: updated WPA enterprise settings #291 #292

Merged
merged 3 commits into from
Mar 20, 2024
Merged

[change] OpenWrt: updated WPA enterprise settings #291 #292

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91d8e8d
[change] OpenWrt: updated WPA enterprise settings #291
pandafy Jan 24, 2024
d6f19ac
[fix] Setting acct_server_port in NetJSON was not generating acct_por…
pandafy Feb 27, 2024
e0049b6
[req-changes] Removed pprint and refactor code
pandafy Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 38 additions & 12 deletions netjsonconfig/backends/openwrt/converters/wireless.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def __intermediate_encryption(self, wireless):
return {'encryption': 'none'}
# otherwise configure encryption
uci = encryption.copy()
for option in ['protocol', 'key', 'cipher', 'disabled']:
for option in ['protocol', 'key', 'cipher', 'disabled', 'acct_server_port']:
if option in uci:
del uci[option]
protocol = encryption['protocol']
Expand All @@ -124,15 +124,8 @@ def __intermediate_encryption(self, wireless):
if protocol == 'wep_open':
uci['key1'] = 's:{0}'.format(uci['key1'])
else:
if (
'enterprise' in protocol
and 'eap_type' in uci
and uci['eap_type'] == 'tls'
and 'auth' in uci
):
# remove auth if not needed
# (not applicable to EAP-TLS)
del uci['auth']
if 'enterprise' in protocol:
self.__intermediate_encryption_wpa_enterprise(wireless, encryption, uci)
if 'key' in encryption:
uci['key'] = encryption['key']
# add ciphers
Expand All @@ -141,6 +134,21 @@ def __intermediate_encryption(self, wireless):
uci['encryption'] += '+{0}'.format(cipher)
return uci

def __intermediate_encryption_wpa_enterprise(self, wireless, encryption, uci):
if 'eap_type' in uci and uci['eap_type'] == 'tls' and 'auth' in uci:
# remove auth if not needed
# (not applicable to EAP-TLS)
del uci['auth']
if wireless['mode'] == 'ap':
for option in ['server', 'port']:
if option in encryption:
uci[f'auth_{option}'] = encryption[option]
uci['auth_secret'] = encryption['key']
if not encryption.get('acct_secret'):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

uci['acct_secret'] = encryption['key']
if encryption.get('acct_server_port'):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

uci['acct_port'] = encryption.pop('acct_server_port')

roaming_properties = (
'ft_over_ds',
'ft_psk_generate_local',
Expand Down Expand Up @@ -251,6 +259,8 @@ def __netjson_wifi_typecast(self, wifi):
'auth_cache',
'acct_port',
'acct_server',
'acct_secret',
'acct_interval',
'nasid',
'ownip',
'dae_client',
Expand Down Expand Up @@ -325,6 +335,18 @@ def __netjson_encryption(self, wifi): # noqa: C901
if key.startswith('s:'):
key = key[2:]
settings['key'] = key
if 'enterprise' in settings['protocol']:
if 'auth_secret' in settings:
settings['key'] = settings.pop('auth_secret')
if settings.get('acct_secret') and settings['acct_secret'] == settings.get(
'key'
):
settings.pop('acct_secret')
for option in ['server', 'port']:
if f'auth_{option}' in settings:
settings[option] = settings.pop(f'auth_{option}')
if settings.get('acct_port'):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not if 'acct_port' in settings? Why using get here? Is it on purpose?

settings['acct_server_port'] = settings.pop('acct_port')
# Management Frame Protection
if 'ieee80211w' in wifi:
settings['ieee80211w'] = wifi.pop('ieee80211w')
Expand All @@ -335,8 +357,12 @@ def __netjson_encryption_typecast(self, encryption):
# type casting
if 'port' in encryption:
encryption['port'] = int(encryption['port'])
if 'acct_port' in encryption:
encryption['acct_port'] = int(encryption['acct_port'])
if 'acct_server_port' in encryption:
encryption['acct_server_port'] = int(encryption['acct_server_port'])
if 'dae_port' in encryption:
encryption['dae_port'] = int(encryption['dae_port'])
if 'acct_interval' in encryption:
encryption['acct_interval'] = int(encryption['acct_interval'])
if 'wps_label' in encryption:
encryption['wps_label'] = encryption['wps_label'] == '1'
if 'wps_pushbutton' in encryption:
Expand Down
44 changes: 44 additions & 0 deletions netjsonconfig/backends/openwrt/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,50 @@
{"$ref": "#/definitions/radio_60g_band"},
]
},
"encryption_wpa_enterprise_ap_base_settings": {
"properties": {
"acct_secret": {
"title": "accounting shared secret",
"type": "string",
"propertyOrder": 9,
},
"acct_interval": {
"type": "integer",
"title": "accounting interval",
"default": 600,
"propertyOrder": 10,
},
"dae_client": {
"title": "DAE client",
"type": "string",
"description": (
"Dynamic Authorization Extension client."
" This client can send \"Disconnect-Request\""
" or \"CoA-Request\" packets to forcibly disconnect a client"
" or change connection parameters."
),
"propertyOrder": 11,
},
"dae_port": {
"type": "integer",
"title": "DAE port",
# "description": "port the Dynamic Authorization Extension server listens on.",
"default": 3799,
"propertyOrder": 12,
},
"dae_secret": {
"title": "DAE secret",
"type": "string",
"propertyOrder": 13,
},
"nasid": {
"title": "NAS ID",
"type": "string",
"description": "NAS ID for RADIUS authentication requests",
"propertyOrder": 13,
},
}
},
},
"properties": {
"general": {
Expand Down
32 changes: 30 additions & 2 deletions tests/openwrt/test_encryption.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ def test_parse_wpa_personal(self):
package wireless

config wifi-iface 'wifi_wlan0'
option acct_secret 'radius_secret'
option auth_secret 'radius_secret'
option auth_server '192.168.0.1'
option device 'radio0'
option encryption 'wpa3-mixed+ccmp'
option ieee80211w '1'
Expand Down Expand Up @@ -324,7 +327,11 @@ def test_parse_wpa2_enterprise_mixed_ap(self):
"server": "192.168.0.1",
"port": 1812,
"acct_server": "192.168.0.2",
"acct_port": 1813,
"acct_server_port": 1813,
"acct_interval": 300,
"dae_client": "192.168.0.2",
"dae_port": 3799,
"dae_secret": "radius_secret",
"nasid": "2",
"wpa_group_rekey": "350",
"ieee80211w": "2",
Expand All @@ -345,8 +352,16 @@ def test_parse_wpa2_enterprise_mixed_ap(self):
package wireless

config wifi-iface 'wifi_wlan0'
option acct_interval '300'
option acct_port '1813'
option acct_secret 'radius_secret'
option acct_server '192.168.0.2'
option auth_port '1812'
option auth_secret 'radius_secret'
option auth_server '192.168.0.1'
option dae_client '192.168.0.2'
option dae_port '3799'
option dae_secret 'radius_secret'
option device 'radio0'
option encryption 'wpa3+ccmp'
option ieee80211w '2'
Expand All @@ -368,6 +383,9 @@ def test_render_wpa3_enterprise(self):

def test_parse_wpa3_enterprise(self):
o = OpenWrt(native=self._wpa3_enterprise_ap_uci)
from pprint import pprint

pprint(dict(o.config))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems a leftover

self.assertEqual(o.config, self._wpa3_enterprise_ap_netjson)

_wpa2_enterprise_ap_netjson = {
Expand All @@ -386,7 +404,7 @@ def test_parse_wpa3_enterprise(self):
"server": "192.168.0.1",
"port": 1812,
"acct_server": "192.168.0.2",
"acct_port": 1813,
"acct_server_port": 1813,
"nasid": "2",
"wpa_group_rekey": "350",
},
Expand All @@ -407,7 +425,11 @@ def test_parse_wpa3_enterprise(self):

config wifi-iface 'wifi_wlan0'
option acct_port '1813'
option acct_secret 'radius_secret'
option acct_server '192.168.0.2'
option auth_port '1812'
option auth_secret 'radius_secret'
option auth_server '192.168.0.1'
option device 'radio0'
option encryption 'wpa2+tkip'
option ifname 'wlan0'
Expand Down Expand Up @@ -461,6 +483,9 @@ def test_parse_wpa2_enterprise(self):
package wireless

config wifi-iface 'wifi_wlan0'
option acct_secret 'radius_secret'
option auth_secret 'radius_secret'
option auth_server '192.168.0.1'
option device 'radio0'
option encryption 'wpa-mixed'
option ifname 'wlan0'
Expand Down Expand Up @@ -511,6 +536,9 @@ def test_parse_wpa_enterprise_mixed_ap(self):
package wireless

config wifi-iface 'wifi_wlan0'
option acct_secret 'radius_secret'
option auth_secret 'radius_secret'
option auth_server '192.168.0.1'
option device 'radio0'
option encryption 'wpa+ccmp'
option ifname 'wlan0'
Expand Down
Loading