eapol: move HANDSHAKE_STARTED_EVENT to eapol_start()
PATCH 1/5 eapol: move HANDSHAKE_STARTED_EVENT to eapol_start()
This even is not used anywhere and can be leveraged in autotesting. Move the event to eapol_start() so it gets called unconditionally when the 4-way handshake is started.
--- src/eapol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
src/eapol.c +2 -2
@@ -1036,8 +1036,6 @@ static void __send_eapol_start(struct eapol_sm *sm, bool noencrypt)uint8_t buf[sizeof (struct eapol_frame )];struct eapol_frame *frame = (struct eapol_frame *) buf; -handshake_event (sm->handshake,HANDSHAKE_EVENT_STARTED ); - frame->header.protocol_version =EAPOL_PROTOCOL_VERSION_2001 ; frame->header.packet_type =1 ;l_put_be16 (0 , &frame->header.packet_len);
@@ -2858,6 +2856,8 @@ bool eapol_start(struct eapol_sm *sm)eap_set_peer_id (sm->eap, network_id); } +handshake_event (sm->handshake,HANDSHAKE_EVENT_STARTED ); + sm->started = true;if (sm->require_handshake)
Signature · 1 line
2.34.1
PATCH 2/5 station: add handshake-started debug event
--- src/station.c | 1 + 1 file changed, 1 insertion(+)
src/station.c +1 -0
@@ -1015,6 +1015,7 @@ static void station_handshake_event(struct handshake_state *hs,switch (event) {case HANDSHAKE_EVENT_STARTED :l_debug ("Handshaking" ); +station_debug_event (station,"handshake-started" );break ;case HANDSHAKE_EVENT_SETTING_KEYS :l_debug ("Setting keys" );
Signature · 1 line
2.34.1
PATCH 3/5 auto-t: add clear_events() to IWD class
In reply to James PrestwoodThe wait_for_event() function allows past events to cause this function to return immediately. This behavior is known, and relied on for some tests. But in some cases you want to only handle _new_ events, so we need a way to clear out prior events.
--- autotests/util/iwd.py | 6 ++++++ 1 file changed, 6 insertions(+)
autotests/util/iwd.py +6 -0
@@ -299,6 +299,9 @@ class StationDebug(IWDDBusAbstract): return False + def clear_events(self): + self._events = [] + def wait_for_event(self, event, timeout=10): return ctx.non_block_wait(self._poll_event, timeout, event, exception=TimeoutError("waiting for event"))
@@ -859,6 +862,9 @@ class Device(IWDDBusAbstract): def wait_for_event(self, event, timeout=10): self._station_debug.wait_for_event(event, timeout) + def clear_events(self): + self._station_debug.clear_events() + def event_ocurred(self, event): return self._station_debug.event_ocurred(event)
Signature · 1 line
2.34.1
PATCH 4/5 auto-t: add reason/test arguments to hostapd deauthenticate
In reply to James PrestwoodThe reason code is obvious, but the test argument is actually a toggle to send the frame encrypted or unencrypted.
--- autotests/util/hostapd.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
autotests/util/hostapd.py +5 -1
@@ -184,8 +184,12 @@ class HostapdCLI(object): cmd = self.cmdline + ['wps_pin', 'any', pin] ctx.start_process(cmd).wait() - def deauthenticate(self, client_address): + def deauthenticate(self, client_address, reason=None, test=None): cmd = self.cmdline + ['deauthenticate', client_address] + + if reason: + cmd.append(f"reason={reason} test={test}") + ctx.start_process(cmd).wait() def eapol_reauth(self, client_address):
Signature · 1 line
2.34.1
PATCH 5/5 auto-t: Add deauth during the 4-way handshake test
In reply to James PrestwoodThis test will fail with current upstream as IWD hangs when the deauthenticate event arrives. Once this is fixed the test should pass.
--- .../disconnect_during_handshake_test.py | 118 ++++++++++++++++++ autotests/testPSK-roam/ft-psk-ccmp-1.conf | 2 +- autotests/testPSK-roam/ft-psk-ccmp-2.conf | 2 +- autotests/testPSK-roam/ft-psk-ccmp-3.conf | 2 +- autotests/testPSK-roam/main.conf | 3 + 5 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 autotests/testPSK-roam/disconnect_during_handshake_test.py
autotests/testPSK-roam/disconnect_during_handshake_test.py new file +118 -0
@@ -0,0 +1,118 @@ +#! /usr/bin/python3 + +import unittest +import sys, os + +sys.path.append('../util') +import iwd +from iwd import IWD +from iwd import PSKAgent +from iwd import NetworkType +from hwsim import Hwsim +from hostapd import HostapdCLI +import testutil + +class Test(unittest.TestCase): + def validate_connection(self, wd): + device = wd.list_devices(1)[0] + + ordered_network = device.get_ordered_network('TestFT', full_scan=True) + + self.assertEqual(ordered_network.type, NetworkType.psk) + + condition = 'not obj.connected' + wd.wait_for_object_condition(ordered_network.network_object, condition) + + self.assertFalse(self.bss_hostapd[0].list_sta()) + self.assertFalse(self.bss_hostapd[1].list_sta()) + + device.connect_bssid(self.bss_hostapd[0].bssid) + + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) + + self.bss_hostapd[0].wait_for_event('AP-STA-CONNECTED %s' % device.address) + + testutil.test_iface_operstate(device.name) + testutil.test_ifaces_connected(self.bss_hostapd[0].ifname, device.name) + self.assertRaises(Exception, testutil.test_ifaces_connected, + (self.bss_hostapd[1].ifname, device.name, True, True)) + + self.rule0.enabled = True + + device.roam(self.bss_hostapd[1].bssid) + + device.clear_events() + device.wait_for_event("handshake-started") + self.bss_hostapd[1].deauthenticate(device.address, reason=15, test=1) + + # Check that iwd is on BSS 1 once out of roaming state and doesn't + # go through 'disconnected', 'autoconnect', 'connecting' in between + from_condition = 'obj.state == DeviceState.roaming' + to_condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_change(device, from_condition, to_condition) + + self.bss_hostapd[1].wait_for_event('AP-STA-CONNECTED %s' % device.address) + + testutil.test_iface_operstate(device.name) + testutil.test_ifaces_connected(self.bss_hostapd[1].ifname, device.name) + self.assertRaises(Exception, testutil.test_ifaces_connected, + (self.bss_hostapd[0].ifname, device.name, True, True)) + + def test_disconnect_during_handshake(self): + self.bss_hostapd[0].set_value('wpa_key_mgmt', 'WPA-PSK') + self.bss_hostapd[0].reload() + self.bss_hostapd[0].wait_for_event("AP-ENABLED") + + self.bss_hostapd[1].set_value('wpa_key_mgmt', 'WPA-PSK') + self.bss_hostapd[1].reload() + self.bss_hostapd[1].wait_for_event("AP-ENABLED") + + self.validate_connection(self.wd) + + def tearDown(self): + os.system('ip link set "' + self.bss_hostapd[0].ifname + '" down') + os.system('ip link set "' + self.bss_hostapd[1].ifname + '" down') + os.system('ip link set "' + self.bss_hostapd[0].ifname + '" up') + os.system('ip link set "' + self.bss_hostapd[1].ifname + '" up') + + for hapd in self.bss_hostapd: + hapd.default() + + self.wd.stop() + self.wd = None + + def setUp(self): + self.wd = IWD(True) + + @classmethod + def setUpClass(cls): + hwsim = Hwsim() + + IWD.copy_to_storage('TestFT.psk') + + cls.bss_hostapd = [ HostapdCLI(config='ft-psk-ccmp-1.conf'), + HostapdCLI(config='ft-psk-ccmp-2.conf') ] + + unused = HostapdCLI(config='ft-psk-ccmp-3.conf') + unused.disable() + + cls.bss_hostapd[0].set_address('12:00:00:00:00:01') + cls.bss_hostapd[1].set_address('12:00:00:00:00:02') + + rad1 = hwsim.get_radio('rad1') + + cls.rule0 = hwsim.rules.create() + cls.rule0.destination = rad1.addresses[0] + cls.rule0.prefix = '08' + cls.rule0.drop = True + + HostapdCLI.group_neighbors(*cls.bss_hostapd) + + @classmethod + def tearDownClass(cls): + IWD.clear_storage() + cls.bss_hostapd = None + +if __name__ == '__main__': + unittest.main(exit=True)
autotests/testPSK-roam/ft-psk-ccmp-1.conf +1 -1
@@ -13,7 +13,7 @@ wpa=2 wpa_key_mgmt=FT-PSK wpa_pairwise=CCMP wpa_passphrase=EasilyGuessedPassword -ieee80211w=1 +ieee80211w=0 rsn_preauth=1 rsn_preauth_interfaces=lo disable_pmksa_caching=0
autotests/testPSK-roam/ft-psk-ccmp-2.conf +1 -1
@@ -13,7 +13,7 @@ wpa=2 wpa_key_mgmt=FT-PSK wpa_pairwise=CCMP wpa_passphrase=EasilyGuessedPassword -ieee80211w=1 +ieee80211w=0 rsn_preauth=1 rsn_preauth_interfaces=lo disable_pmksa_caching=0
autotests/testPSK-roam/ft-psk-ccmp-3.conf +1 -1
@@ -13,7 +13,7 @@ wpa=2 wpa_key_mgmt=FT-PSK wpa_pairwise=CCMP wpa_passphrase=EasilyGuessedPassword -ieee80211w=1 +ieee80211w=0 rsn_preauth=1 rsn_preauth_interfaces=lo disable_pmksa_caching=0
autotests/testPSK-roam/main.conf +3 -0
@@ -3,3 +3,6 @@ DisableMacAddressRandomization=true [General] RoamRetryInterval=1 + +# For disconnect_during_handshake_test +ManagementFrameProtection=0
Signature · 1 line
2.34.1
Hi James,
Quoted 1 line · James Prestwood
This even is not used anywhere and can be leveraged in autotesting.
'even' -> 'event'?
Quoted 5 lines
Move the event to
eapol_start()so it gets called unconditionally when the 4-way handshake is started.--- src/eapol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Regards,
-Denis