jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-11 11:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling with open or wpa-psk (#2239)

Browse Source
This commit is contained in:
Pascal Vizeli 2020-11-11 16:33:46 +01:00 committed by GitHub
parent 280d423bfe
commit 46e92036ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
supervisor/dbus/payloads/interface_update.tmpl
View File

@ -76,29 +76,26 @@
, ,
'802-11-wireless': '802-11-wireless':
{ {
'security': <'802-11-wireless-security'>,
'assigned-mac-address': <'stable'>, 'assigned-mac-address': <'stable'>,
'ssid': <[byte {{ interface.wifi.ssid }}]>, 'ssid': <[byte {{ interface.wifi.ssid }}]>,
'mode': <'{{ interface.wifi.mode.value }}'>, 'mode': <'{{ interface.wifi.mode.value }}'>,
'powersave': <uint32 1> 'powersave': <uint32 1>
{% if interface.wifi.auth != "open" %}
,
'security': <'802-11-wireless-security'>
}, },
'802-11-wireless-security': '802-11-wireless-security':
{ {
{% if interface.wifi.auth == "wep" %} {% if interface.wifi.auth == "wep" %}
'auth-alg': <'none'>, 'auth-alg': <'none'>,
'key-mgmt': <'none'> 'key-mgmt': <'none'>,
{% elif interface.wifi.auth == "wpa-psk" %} {% elif interface.wifi.auth == "wpa-psk" %}
'auth-alg': <'shared'>,
'key-mgmt': <'wpa-psk'>
{% elif interface.wifi.auth == "open" %}
'auth-alg': <'open'>, 'auth-alg': <'open'>,
'key-mgmt': <'none'> 'key-mgmt': <'wpa-psk'>,
{% endif %} {% endif %}
{% if interface.wifi.psk %}
,
'psk': <'{{ interface.wifi.psk }}'> 'psk': <'{{ interface.wifi.psk }}'>
{% endif %} {% endif %}
} }
{% endif %} {% endif %}
} }

7
supervisor/host/network.py
View File

@ -298,12 +298,13 @@ class Interface:
return None return None
# Authentication # Authentication
if inet.settings.wireless_security.auth_alg == "none": auth = None
if not inet.settings.wireless_security:
auth = AuthMethod.OPEN
if inet.settings.wireless_security.key_mgmt == "none":
auth = AuthMethod.WEP auth = AuthMethod.WEP
elif inet.settings.wireless_security.key_mgmt == "wpa-psk": elif inet.settings.wireless_security.key_mgmt == "wpa-psk":
auth = AuthMethod.WPA_PSK auth = AuthMethod.WPA_PSK
else:
auth = AuthMethod.OPEN
# Signal # Signal
if inet.wireless: if inet.wireless:

7
tests/dbus/payloads/test_interface_update_payload.py
View File

@ -110,7 +110,7 @@ async def test_interface_update_payload_wireless_wpa_psk(coresys):
assert DBus.parse_gvariant(data)["802-11-wireless"]["ssid"] == [84, 101, 115, 116] assert DBus.parse_gvariant(data)["802-11-wireless"]["ssid"] == [84, 101, 115, 116]
assert DBus.parse_gvariant(data)["802-11-wireless"]["mode"] == "infrastructure" assert DBus.parse_gvariant(data)["802-11-wireless"]["mode"] == "infrastructure"
assert DBus.parse_gvariant(data)["802-11-wireless-security"]["auth-alg"] == "shared" assert DBus.parse_gvariant(data)["802-11-wireless-security"]["auth-alg"] == "open"
assert ( assert (
DBus.parse_gvariant(data)["802-11-wireless-security"]["key-mgmt"] == "wpa-psk" DBus.parse_gvariant(data)["802-11-wireless-security"]["key-mgmt"] == "wpa-psk"
) )
@ -156,10 +156,7 @@ async def test_interface_update_payload_wireless_open(coresys):
assert ( assert (
DBus.parse_gvariant(data)["802-11-wireless"]["assigned-mac-address"] == "stable" DBus.parse_gvariant(data)["802-11-wireless"]["assigned-mac-address"] == "stable"
) )
assert "802-11-wireless-security" not in DBus.parse_gvariant(data)
assert DBus.parse_gvariant(data)["802-11-wireless-security"]["auth-alg"] == "open"
assert DBus.parse_gvariant(data)["802-11-wireless-security"]["key-mgmt"] == "none"
assert "psk" not in DBus.parse_gvariant(data)["802-11-wireless-security"]
@pytest.mark.asyncio @pytest.mark.asyncio