hwsim: add MatchBytes/MatchBytesOffset rule properties
PATCH v3 1/6 hwsim: add MatchBytes/MatchBytesOffset rule properties
If set, a rule will start matching 'MatchBytes' some number of bytes into the frame (MatchBytesOffset). This is useful since header information, addresses, and sequence numbers may be unpredictable between test runs.
To avoid unintended matches the Prefix property is left unchanged and will match starting at the beginning of the frame.
--- tools/hwsim.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+)
tools/hwsim.c +106 -0
@@ -132,6 +132,9 @@ struct hwsim_rule {int delay;uint8_t *prefix;size_t prefix_len; +uint8_t *match; +size_t match_len; +uint16_t match_offset;int match_times;/* negative value indicates unused */ };
@@ -1218,6 +1221,14 @@ static void process_rules(const struct radio_info_rec *src_radio,continue ; } +if (rule->match && frame->payload_len >= + rule->match_len + rule->match_offset) { +if (memcmp (rule->match, + frame->payload + rule->match_offset, + rule->match_len)) +continue ; + } +/* Rule deemed to match frame, apply any changes */ if (rule->match_times ==0 )continue ;
@@ -2063,6 +2074,9 @@ static struct l_dbus_message *rule_remove(struct l_dbus *dbus,if (rule->prefix)l_free (rule->prefix); +if (rule->match) +l_free (rule->match); +l_free (rule);l_dbus_unregister_object (dbus, path);
@@ -2394,6 +2408,90 @@ invalid_args:return dbus_error_invalid_args (message); } +static bool rule_property_get_match (struct l_dbus *dbus, +struct l_dbus_message *message, +struct l_dbus_message_builder *builder, +void *user_data) +{ +struct hwsim_rule *rule = user_data; +size_t i; + +l_dbus_message_builder_enter_array (builder,"y" ); + +for (i =0 ; i < rule->match_len; i++) +l_dbus_message_builder_append_basic (builder,'y' , + rule->match + i); + +l_dbus_message_builder_leave_array (builder); + +return true; +} + +static struct l_dbus_message *rule_property_set_match ( +struct l_dbus *dbus, +struct l_dbus_message *message, +struct l_dbus_message_iter *new_value, +l_dbus_property_complete_cb_t complete, +void *user_data) +{ +struct hwsim_rule *rule = user_data; +struct l_dbus_message_iter iter; +const uint8_t *match; +uint32_t len; + +if (!l_dbus_message_iter_get_variant (new_value,"ay" , &iter)) + goto invalid_args; + +if (!l_dbus_message_iter_get_fixed_array (&iter, + (const void **)&match, &len)) + goto invalid_args; + +if (len >HWSIM_MAX_PREFIX_LEN ) + goto invalid_args; + +if (rule->match) +l_free (rule->match); + + rule->match =l_memdup (match, len); + rule->match_len = len; + +return l_dbus_message_new_method_return (message); + +invalid_args: +return dbus_error_invalid_args (message); +} + +static bool rule_property_get_match_offset (struct l_dbus *dbus, +struct l_dbus_message *message, +struct l_dbus_message_builder *builder, +void *user_data) +{ +struct hwsim_rule *rule = user_data; +uint16_t val = rule->match_offset; + +l_dbus_message_builder_append_basic (builder,'q' , &val); + +return true; +} + +static struct l_dbus_message *rule_property_set_match_offset ( +struct l_dbus *dbus, +struct l_dbus_message *message, +struct l_dbus_message_iter *new_value, +l_dbus_property_complete_cb_t complete, +void *user_data) +{ +struct hwsim_rule *rule = user_data; +uint16_t val; + +if (!l_dbus_message_iter_get_variant (new_value,"q" , &val)) +return dbus_error_invalid_args (message); + + rule->match_offset = val; + +return l_dbus_message_new_method_return (message); +} + static bool rule_property_get_enabled(struct l_dbus *dbus, struct l_dbus_message *message, struct l_dbus_message_builder *builder,
@@ -2527,6 +2625,14 @@ static void setup_rule_interface(struct l_dbus_interface *interface)L_DBUS_PROPERTY_FLAG_AUTO_EMIT ,"ay" , rule_property_get_prefix, rule_property_set_prefix); +l_dbus_interface_property (interface,"MatchBytes" , +L_DBUS_PROPERTY_FLAG_AUTO_EMIT ,"ay" , + rule_property_get_match, + rule_property_set_match); +l_dbus_interface_property (interface,"MatchBytesOffset" , +L_DBUS_PROPERTY_FLAG_AUTO_EMIT ,"q" , + rule_property_get_match_offset, + rule_property_set_match_offset); l_dbus_interface_property(interface, "Enabled", L_DBUS_PROPERTY_FLAG_AUTO_EMIT, "b", rule_property_get_enabled,
Signature · 1 line
2.31.1
Hi James,
Quoted 11 lines · James Prestwood
If set, a rule will start matching 'MatchBytes' some number of bytes into the frame (MatchBytesOffset). This is useful since header information, addresses, and sequence numbers may be unpredictable between test runs.
To avoid unintended matches the Prefix property is left unchanged and will match starting at the beginning of the frame.
--- tools/hwsim.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+)
All applied, thanks.
Regards,
-Denis
PATCH v3 2/6 auto-t: hwsim.py: add match/match_offset properties
In reply to James Prestwood--- autotests/util/hwsim.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
autotests/util/hwsim.py +16 -0
@@ -169,6 +169,22 @@ class Rule(HwsimDBusAbstract): def drop_ack(self, value): self._prop_proxy.Set(self._iface_name, 'DropAck', value) + @property + def match(self): + return self._properties['MatchBytes'] + + @match.setter + def match(self, value): + self._prop_proxy.Set(self._iface_name, 'MatchBytes', dbus.ByteArray.fromhex(value)) + + @property + def match_offset(self): + return self._properties(['MatchBytesOffset']) + + @match_offset.setter + def match_offset(self, value): + self._prop_proxy.Set(self._iface_name, 'MatchBytesOffset', dbus.UInt16(value)) + def remove(self): self._iface.Remove(reply_handler=self._success, error_handler=self._failure)
Signature · 1 line
2.31.1
PATCH v3 3/6 auto-t: change testSAE timeout_test to use match/offset
In reply to James PrestwoodThis makes things more clear on what frames are being blocked since it passes over header information to get to the actual SAE payload.
--- autotests/testSAE/timeout_test.py | 6 ++++++ 1 file changed, 6 insertions(+)
autotests/testSAE/timeout_test.py +6 -0
@@ -42,6 +42,8 @@ class Test(unittest.TestCase): # hostapd = HostapdCLI(config='ssidSAE.conf') hostapd.set_value('vendor_elements', 'dd0cf4f5e8050500000000000000') + hostapd.set_value('sae_groups', '19') + hostapd.reload() hwsim = Hwsim() bss_radio = hwsim.get_radio('rad0')
@@ -50,6 +52,8 @@ class Test(unittest.TestCase): rule0.source = bss_radio.addresses[0] rule0.drop = True rule0.prefix = 'b0' + rule0.match = '01 00 00 00 13 00' + rule0.match_offset = 26 rule0.match_times = 1 rule0.drop_ack = True rule0.enabled = True
@@ -57,6 +61,8 @@ class Test(unittest.TestCase): wd = IWD(True) self.validate_connection(wd) + rule0.remove() + @classmethod def setUpClass(cls): pass
Signature · 1 line
2.31.1
PATCH v3 4/6 auto-t: add SAE test for a non-ACKed confirm
In reply to James Prestwood--- autotests/testSAE/timeout_test.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
autotests/testSAE/timeout_test.py +24 -0
@@ -63,6 +63,30 @@ class Test(unittest.TestCase): rule0.remove() + def test_sta_confirm_not_acked(self): + hostapd = HostapdCLI(config='ssidSAE.conf') + hostapd.set_value('vendor_elements', 'dd0cf4f5e8050500000000000000') + hostapd.set_value('sae_groups', '19') + hostapd.reload() + + hwsim = Hwsim() + bss_radio = hwsim.get_radio('rad0') + + rule0 = hwsim.rules.create() + rule0.source = bss_radio.addresses[0] + rule0.drop = True + rule0.prefix = 'b0' + rule0.match = '02 00 00 00' + rule0.match_offset = 26 + rule0.match_times = 1 + rule0.drop_ack = True + rule0.enabled = True + + wd = IWD(True) + self.validate_connection(wd) + + rule0.remove() + @classmethod def setUpClass(cls): pass
Signature · 1 line
2.31.1
PATCH v3 5/6 auto-t: add SAE test for no supported groups
In reply to James Prestwood--- autotests/testSAE/failure_test.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
autotests/testSAE/failure_test.py +12 -3
@@ -8,11 +8,12 @@ import iwd from iwd import IWD from iwd import PSKAgent from iwd import NetworkType +from hostapd import HostapdCLI class Test(unittest.TestCase): - def validate_connection(self, wd): - psk_agent = PSKAgent("InvalidSecret") + def validate_connection(self, wd, passphrase): + psk_agent = PSKAgent(passphrase) wd.register_psk_agent(psk_agent) devices = wd.list_devices(1)
@@ -33,7 +34,15 @@ class Test(unittest.TestCase): def test_connection_success(self): wd = IWD(True) - self.validate_connection(wd) + self.validate_connection(wd, 'InvalidSecret') + + def test_no_supported_groups(self): + hostapd = HostapdCLI(config='ssidSAE.conf') + hostapd.set_value('sae_groups', '1') + hostapd.reload() + + wd = IWD(True) + self.validate_connection(wd, 'secret123') @classmethod def setUpClass(cls):
Signature · 1 line
2.31.1
PATCH v3 6/6 auto-t: remove ';' in testSAE autoconnect_test.py
In reply to James Prestwood--- autotests/testSAE/autoconnect_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
autotests/testSAE/autoconnect_test.py +4 -4
@@ -35,8 +35,8 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(ordered_network.network_object, condition) def test_SAE(self): - self.hostapd.set_value('sae_pwe', '0'); - self.hostapd.set_value('sae_groups', '19'); + self.hostapd.set_value('sae_pwe', '0') + self.hostapd.set_value('sae_groups', '19') self.hostapd.reload() self.hostapd.wait_for_event("AP-ENABLED")
@@ -44,8 +44,8 @@ class Test(unittest.TestCase): self.validate_connection(wd) def test_SAE_H2E(self): - self.hostapd.set_value('sae_pwe', '1'); - self.hostapd.set_value('sae_groups', '20'); + self.hostapd.set_value('sae_pwe', '1') + self.hostapd.set_value('sae_groups', '20') self.hostapd.reload() self.hostapd.wait_for_event("AP-ENABLED") wd = IWD(True)
Signature · 1 line
2.31.1