Skip to contentSkip to conversation

ie: add ie_parse_owe_transition_from_data

PATCH In review James Prestwood 2 participants 8 messages Sep 16, 2021

lore
Share & tools
lore

James Prestwood

author
#0 lore raw

PATCH v3 1/7 ie: add ie_parse_owe_transition_from_data

This is a parser for the WFA OWE Transition element. For now the optional band/channel bytes will not be parsed as hostapd does not yet support these and would also require the 802.11 appendix E-1 to be added to IWD. Because of this OWE Transition networks are assumed to be on the same channel as their open counterpart.

---
 src/ie.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
 src/ie.h |  5 +++++
 2 files changed, 50 insertions(+)

v3:
* Changed to handle non-utf8 SSIDs

src/ie.c +45 -0
index 1ce1d8a5..3b4564b2 100644
@@ -1343,6 +1343,8 @@ bool is_ie_wfa_ie(const uint8_t *data, uint8_t len, uint8_t oi_type)
 		return false;
 	else if (oi_type == IE_WFA_OI_HS20_INDICATION && len != 5 && len != 7)
 		return false;
+	else if (oi_type == IE_WFA_OI_OWE_TRANSITION && len < 12)
+		return false;
 	else if (len < 4) /* OI not handled, but at least check length */
 		return false;
 
@@ -2492,3 +2494,46 @@ int ie_parse_network_cost(const void *data, size_t len,
 	*flags = l_get_le16(ie + 8);
 	return 0;
 }
+
+int ie_parse_owe_transition(const void *data, size_t len,
+				uint8_t bssid[static 6],
+				uint8_t ssid[static 32],
+				size_t *ssid_len)
+{
+	const uint8_t *ie = data;
+	size_t slen;
+
+	if (len < 14 || ie[0] != IE_TYPE_VENDOR_SPECIFIC)
+		return -ENOMSG;
+
+	if (!is_ie_wfa_ie(ie + 2, len - 2, IE_WFA_OI_OWE_TRANSITION))
+		return -ENOMSG;
+
+	slen = l_get_u8(ie + 12);
+	if (slen > 32)
+		return -ENOMSG;
+
+	/*
+	 * WFA OWE Specification 2.3.1
+	 *
+	 * "Band Info and Channel Info are optional fields. If configured,
+	 * both fields shall be included in an OWE Transition Mode element"
+	 *
+	 * TODO: Support Band/Channel bytes:
+	 * For the time being the OWE transition AP is assumed to be on the same
+	 * channel as the open AP. This means there should be no band/channel
+	 * bytes at the end of the IE. Currently hostapd has no support for this
+	 * so it can be skipped. In addition 802.11 Appendix E-1 needs to be
+	 * encoded as a table to map Country/operating class to channels to make
+	 * any sense of it.
+	 */
+	if (len != slen + 13)
+		return -ENOMSG;
+
+	memcpy(bssid, ie + 6, 6);
+
+	memcpy(ssid, ie + 13, slen);
+	*ssid_len = slen;
+
+	return 0;
+}
src/ie.h +5 -0
index 4e1c5433..6d8fb9ca 100644
@@ -630,3 +630,8 @@ void ie_build_fils_ip_addr_response(
 
 int ie_parse_network_cost(const void *data, size_t len,
 				uint16_t *flags, uint16_t *level);
+
+int ie_parse_owe_transition(const void *data, size_t len,
+				uint8_t bssid[static 6],
+				uint8_t ssid[static 32],
+				size_t *ssid_len);
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH v3 2/7 scan: allow non-utf8 SSIDs to be scanned for

IWD has restricted SSIDs to only utf8 so they can be displayed but with the addition of OWE transition networks this is an unneeded restriction (for these networks). The SSID of an OWE transition network is never displayed to the user so limiting to utf8 isn't required.

Allow non-utf8 SSIDs to be scanned for by including the length in the scan parameters and not relying on strlen().

---
 src/p2p.c     |  6 ++++--
 src/scan.c    |  2 +-
 src/scan.h    |  3 ++-
 src/station.c | 10 +++++++---
 4 files changed, 14 insertions(+), 7 deletions(-)
src/p2p.c +4 -2
index 3328271b..3bfb771a 100644
@@ -1980,7 +1980,8 @@ static void p2p_provision_scan_start(struct p2p_device *dev)
 
 	params.flush = true;
 	params.no_cck_rates = true;
-	params.ssid = dev->go_group_id.ssid;
+	params.ssid = (const uint8_t *)dev->go_group_id.ssid;
+	params.ssid_len = strlen(dev->go_group_id.ssid);
 	params.extra_ie = p2p_build_scan_ies(dev, buf, sizeof(buf),
 						&params.extra_ie_size);
 	L_WARN_ON(!params.extra_ie);
@@ -3783,7 +3784,8 @@ static bool p2p_device_scan_start(struct p2p_device *dev)
 	L_WARN_ON(!params.extra_ie);
 	params.flush = true;
 	/* P2P Wildcard SSID because we don't need legacy networks to reply */
-	params.ssid = "DIRECT-";
+	params.ssid = (const uint8_t *)"DIRECT-";
+	params.ssid_len = strlen("DIRECT-");
 	/*
 	 * Must send probe requests at 6Mb/s, OFDM only.  The no-CCK rates
 	 * flag forces the drivers to do exactly this for 2.4GHz frames.
src/scan.c +1 -1
index cdc14dbd..1224e18b 100644
@@ -542,7 +542,7 @@ static void scan_cmds_add(struct l_queue *cmds, struct scan_context *sc,
 	if (params->ssid) {
 		/* direct probe request scan */
 		l_genl_msg_append_attr(cmd, NL80211_ATTR_SSID,
-					strlen(params->ssid), params->ssid);
+					params->ssid_len, params->ssid);
 		l_genl_msg_leave_nested(cmd);
 
 		l_queue_push_tail(cmds, cmd);
src/scan.h +2 -1
index be8912e6..aa3974df 100644
@@ -97,7 +97,8 @@ struct scan_parameters {
 	bool randomize_mac_addr_hint : 1;
 	bool no_cck_rates : 1;
 	bool duration_mandatory : 1;
-	const char *ssid;	/* Used for direct probe request */
+	const uint8_t *ssid;	/* Used for direct probe request */
+	size_t ssid_len;
 	const uint8_t *source_mac;
 };
 
src/station.c +7 -3
index 6de5fd4a..2bd9ecfe 100644
@@ -2009,9 +2009,12 @@ static int station_roam_scan(struct station *station,
 
 	l_debug("ifindex: %u", netdev_get_ifindex(station->netdev));
 
-	if (station->connected_network)
+	if (station->connected_network) {
+		const char *ssid = network_get_ssid(station->connected_network);
 		/* Use direct probe request */
-		params.ssid = network_get_ssid(station->connected_network);
+		params.ssid = (const uint8_t *)ssid;
+		params.ssid_len = strlen(ssid);
+	}
 
 	if (!freq_set)
 		station->roam_scan_full = true;
@@ -2916,7 +2919,8 @@ static struct l_dbus_message *station_dbus_connect_hidden_network(
 		return dbus_error_not_hidden(message);
 	}
 
-	params.ssid = ssid;
+	params.ssid = (const uint8_t *)ssid;
+	params.ssid_len = strlen(ssid);
 
 	/* HW cannot randomize our MAC if connected */
 	if (!station->connected_bss)
Signature · 1 line
2.31.1
author
#2 lore raw

PATCH v3 3/7 scan: keep track of OWE Transition element

In reply to James Prestwood
---
 src/scan.c | 7 +++++++
 src/scan.h | 3 +++
 2 files changed, 10 insertions(+)

v3:
* Store SSID length to handle non-utf8 SSIDs

src/scan.c +7 -0
index 1224e18b..b2f199e5 100644
@@ -936,6 +936,13 @@ static void scan_parse_vendor_specific(struct scan_bss *bss, const void *data,
 		return;
 	}
 
+	if (is_ie_wfa_ie(data, len, IE_WFA_OI_OWE_TRANSITION)) {
+		ie_parse_owe_transition(data - 2, len + 2, bss->owe_trans_bssid,
+					bss->owe_trans_ssid,
+					&bss->owe_trans_ssid_len);
+		return;
+	}
+
 	if (!ie_parse_network_cost(data, len, &cost_level, &cost_flags)) {
 		bss->cost_level = cost_level;
 		bss->cost_flags = cost_flags;
src/scan.h +3 -0
index aa3974df..99c66bb8 100644
@@ -76,6 +76,9 @@ struct scan_bss {
 	uint64_t parent_tsf;
 	uint8_t *wfd;		/* Concatenated WFD IEs */
 	ssize_t wfd_size;	/* Size of Concatenated WFD IEs */
+	uint8_t owe_trans_ssid[32];
+	size_t owe_trans_ssid_len;
+	uint8_t owe_trans_bssid[6];
 	bool mde_present : 1;
 	bool cc_present : 1;
 	bool cap_rm_neighbor_report : 1;
Signature · 1 line
2.31.1
author
#3 lore raw

PATCH v3 4/7 monitor: parse WFA OWE Transition IE

In reply to James Prestwood
---
 monitor/nlmon.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

v3:
* Print SSIDs that are non-utf8

monitor/nlmon.c +20 -0
index 1a26f553..f705aa9c 100644
@@ -1009,6 +1009,22 @@ static void print_ipv4(unsigned int level, const char *label,
 			addr[0], addr[1], addr[2], addr[3]);
 }
 
+static void print_ie_wfa_owe_transition(unsigned int level, const char *label,
+						const void *data, uint16_t size)
+{
+	uint8_t bssid[6];
+	uint8_t ssid[32];
+	size_t ssid_len;
+
+	if (ie_parse_owe_transition(data, size, bssid, ssid, &ssid_len) < 0) {
+		print_attr(level + 1, "Error parsing");
+		return;
+	}
+
+	print_attr(level + 1, "BSSID: "MAC, MAC_STR(bssid));
+	print_attr(level + 1, "SSID: %s", util_ssid_to_utf8(ssid_len, ssid));
+}
+
 static void print_ie_vendor(unsigned int level, const char *label,
 				const void *data, uint16_t size)
 {
@@ -1054,6 +1070,10 @@ static void print_ie_vendor(unsigned int level, const char *label,
 		case 0x12:
 			print_ie_rsn_suites(level + 1, label, data, size);
 			return;
+		case 0x1c:
+			print_ie_wfa_owe_transition(level + 1, label,
+							data - 6, size + 6);
+			return;
 		default:
 			return;
 		}
Signature · 1 line
2.31.1
author
#4 lore raw

PATCH v3 5/7 station: handle OWE Transition procedure

In reply to James Prestwood

OWE Transition is described in the WiFi Alliance OWE Specification version 1.1. The idea behind it is to support both legacy devices without any concept of OWE as well as modern ones which support the OWE protocol.

OWE is a somewhat special type of network. Where it advertises an RSN element but is still "open". This apparently confuses older devices so the OWE transition procedure was created.

The idea is simple: have two BSS's, one open, and one as a hidden OWE network. Each network advertises a vendor IE which points to the other. A device sees the open network and can connect (legacy) or parse the IE, scan for the hidden OWE network, and connect to that instead.

Care was taken to handle connections to hidden networks directly. The policy is being set that any hidden network with the WFA OWE IE is not connectable via ConnectHiddenNetwork(). These networks are special, and can only be connected to via the network object for the paired open network.

When scan results come in from any source (DBus, quick, autoconnect) each BSS is checked for the OWE Transition IE. A few paths can be taken here when the IE is found:

1. The BSS is open. The BSSID in the IE is checked against the current scan results (excluding hidden networks). If a match is found we should already have the hidden OWE BSS and nothing else needs to be done (3).

2. The BSS is open. The BSSID in the IE is not found in the current scan results, and the open network also has no OWE BSS in it. Add this network to a list to scan for the hidden OWE BSS.

3. The BSS is not open and contains the OWE IE. This BSS will automatically get added to the network object and nothing else needs to be done.

After processing and networks added to this hidden OWE scan list are processed. Each network should contain a single open BSS with the OWE IE. The SSID from the IEs are added to the scan parameters and the scan is started.

The scan results should contain only the (previously hidden) OWE BSS's. These BSS's should contain the OWE IE which is used to look up the original open networks. If found the OWE BSS's are added to their respective networks.

Quoted 1 line

From here network.c can detect that this is an OWE transition

network and connect to the OWE BSS rather than the open one.

---
 src/station.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 248 insertions(+), 3 deletions(-)
src/station.c +248 -3
index 2bd9ecfe..d569ecc0 100644
@@ -87,6 +87,8 @@ struct station {
 	uint32_t dbus_scan_id;
 	uint32_t quick_scan_id;
 	uint32_t hidden_network_scan_id;
+	uint32_t owe_transition_scan_id;
+	struct l_queue* owe_network_list;
 
 	/* Roaming related members */
 	struct timespec roam_min_time;
@@ -361,6 +363,36 @@ static struct network *station_add_seen_bss(struct station *station,
 	if (station_parse_bss_security(station, bss, &security) < 0)
 		return NULL;
 
+	/* Hidden OWE transition network */
+	if (security == SECURITY_NONE && bss->rsne &&
+					!l_memeqzero(bss->owe_trans_bssid, 6)) {
+		/*
+		 * WiFi Alliance OWE Specification v1.1 - Section 2.2.1:
+		 *
+		 * "2. An OWE AP shall use two different SSIDs, one for OWE
+		 *     and one for Open"
+		 *
+		 * "4. The OWE BSS shall include the OWE Transition Mode element
+		 *     in all Beacon and Probe Response frames to encapsulate
+		 *     the BSSID and SSID of the Open BSS"
+		 *
+		 * Meaning the hidden SSID should not match the SSID in the
+		 * hidden network's OWE IE. Might as well restrict BSSID as well
+		 * to be safe.
+		 */
+		if (!memcmp(bss->owe_trans_ssid, bss->ssid, bss->ssid_len))
+			return NULL;
+
+		if (!memcmp(bss->owe_trans_bssid, bss->addr, 6))
+			return NULL;
+
+		memcpy(ssid, bss->owe_trans_ssid, sizeof(bss->owe_trans_ssid));
+		ssid[bss->owe_trans_ssid_len] = '\0';
+
+		l_debug("Found hidden OWE network, using %s for network lookup",
+				ssid);
+	}
+
 	path = iwd_network_get_path(station, ssid, security);
 
 	network = l_hashmap_lookup(station->networks, path);
@@ -625,6 +657,112 @@ static bool station_start_anqp(struct station *station, struct network *network,
 	return true;
 }
 
+static unsigned int station_owe_scan(struct station *station,
+					struct network *network);
+
+static bool station_owe_transition_results(int err, struct l_queue *bss_list,
+					const struct scan_freq_set *freqs,
+					void *userdata)
+{
+	struct station *station = userdata;
+	struct network *network = l_queue_peek_head(station->owe_network_list);
+	struct scan_bss *bss;
+
+	station->owe_transition_scan_id = 0;
+
+	station_property_set_scanning(station, false);
+
+	if (err)
+		return err == 0;
+
+	/*
+	 * Insert all BSS's into station/network BSS list but don't create a
+	 * network for them. The idea here is for the user to connect to the
+	 * open network and IWD will transition them to the OWE network
+	 * automatically.
+	 */
+	while ((bss = l_queue_pop_head(bss_list))) {
+		struct scan_bss *open;
+
+		/*
+		 * Don't parse the open BSS, hidden BSS, or BSS with
+		 * no OWE Transition IE
+		 */
+		if (!bss->rsne || l_memeqzero(bss->owe_trans_bssid, 6) ||
+				util_ssid_is_hidden(bss->ssid_len, bss->ssid))
+			goto free;
+
+		/* Check if the Open network IE matches the BSS we have */
+		open = network_bss_find_by_addr(network, bss->owe_trans_bssid);
+		if (!open)
+			goto free;
+
+		if (memcmp(open->owe_trans_bssid, bss->addr, 6)) {
+			l_warn("BSS in results did not match Open OWE IE!");
+			goto free;
+		}
+
+		l_debug("Adding OWE transition network "MAC" to %s",
+				MAC_STR(bss->addr), network_get_ssid(network));
+
+		l_queue_push_tail(station->bss_list, bss);
+		network_bss_add(network, bss);
+
+		continue;
+
+free:
+		scan_bss_free(bss);
+	}
+
+	l_queue_destroy(bss_list, NULL);
+
+	return true;
+}
+
+static void station_owe_transition_triggered(int err, void *user_data)
+{
+	struct station *station = user_data;
+
+	if (err < 0) {
+		l_debug("OWE transition scan trigger failed: %i", err);
+		return;
+	}
+
+	l_debug("OWE transition scan triggered");
+
+	station_property_set_scanning(station, true);
+}
+
+static void station_owe_transition_destroy(void *userdata)
+{
+	struct station *station = userdata;
+	struct network *network = l_queue_pop_head(station->owe_network_list);
+
+	WATCHLIST_NOTIFY(&event_watches, station_event_watch_func_t,
+				STATION_EVENT_OWE_HIDDEN_FINISHED, network);
+
+	network = l_queue_peek_head(station->owe_network_list);
+	if (network)
+		station->owe_transition_scan_id = station_owe_scan(station,
+								network);
+
+	/* More ongoing scans */
+	if (station->owe_transition_scan_id)
+		return;
+
+	/*
+	 * Must resume autoconnect here regardless of an error since this logic
+	 * was bypassed in station_set_scan_results
+	 */
+	l_queue_destroy(station->autoconnect_list, NULL);
+	station->autoconnect_list = l_queue_new();
+
+	if (station_is_autoconnecting(station)) {
+		station_network_foreach(station, network_add_foreach, station);
+		station_autoconnect_next(station);
+	}
+}
+
 static bool bss_free_if_ssid_not_utf8(void *data, void *user_data)
 {
 	struct scan_bss *bss = data;
@@ -641,6 +779,100 @@ static bool bss_free_if_ssid_not_utf8(void *data, void *user_data)
 	return true;
 }
 
+static bool match_bssid_not_hidden(const void *a, const void *b)
+{
+	const struct scan_bss *bss = a;
+	const uint8_t *bssid = b;
+
+	if (util_ssid_is_hidden(bss->ssid_len, bss->ssid))
+		return false;
+
+	return !memcmp(bss->addr, bssid, sizeof(bss->addr));
+}
+
+static unsigned int station_owe_scan(struct station *station,
+					struct network *network)
+{
+	unsigned int id;
+	struct scan_freq_set *freqs = NULL;
+	struct scan_parameters params = {
+		.flush = true,
+		.randomize_mac_addr_hint = false,
+	};
+	/*
+	 * Should be ok doing this as this network will only have a single open
+	 * BSS. This is ensured by the checks in station_start_owe_scan()
+	 */
+	struct scan_bss *open = network_bss_select(network, true);
+
+	freqs = scan_freq_set_new();
+	/* TODO: Add support for different channel/band info */
+	scan_freq_set_add(freqs, open->frequency);
+
+	params.freqs = freqs;
+	params.ssid = open->owe_trans_ssid;
+	params.ssid_len = open->owe_trans_ssid_len;
+
+	id = scan_active_full(netdev_get_wdev_id(station->netdev),
+				&params, station_owe_transition_triggered,
+				station_owe_transition_results, station,
+				station_owe_transition_destroy);
+
+	scan_freq_set_free(freqs);
+
+	return id;
+}
+
+static bool station_start_owe_scan(struct station *station,
+					struct l_queue *bss_list,
+					struct scan_bss *bss,
+					struct network *network)
+{
+	if (l_memeqzero(bss->owe_trans_bssid, 6))
+		return false;
+
+	/* only want the open networks with WFA OWE IE */
+	if (bss->rsne)
+		return false;
+
+	/* BSS already in network object */
+	if (network_bss_find_by_addr(network, bss->owe_trans_bssid))
+		return false;
+
+	/*
+	 * If the BSSID of the Open OWE IE is in the results we
+	 * are done. station_add_seen_bss will add this to the
+	 * network object.
+	 *
+	 * This is required if the Open BSS appears first in the
+	 * new_bss_list and the OWE network hasn't had a chance
+	 * to get added to the network.
+	 */
+	if (l_queue_find(bss_list, match_bssid_not_hidden,
+				bss->owe_trans_bssid))
+		return false;
+
+	if (!station->owe_transition_scan_id)
+		station->owe_transition_scan_id = station_owe_scan(station,
+								network);
+	if (!station->owe_transition_scan_id) {
+		l_error("Could not scan for hidden OWE network %s",
+				util_ssid_to_utf8(bss->owe_trans_ssid_len,
+							bss->owe_trans_ssid));
+		return false;
+	}
+
+	WATCHLIST_NOTIFY(&event_watches, station_event_watch_func_t,
+				STATION_EVENT_OWE_HIDDEN_STARTED, network);
+
+	if (!station->owe_network_list)
+		station->owe_network_list = l_queue_new();
+
+	l_queue_push_tail(station->owe_network_list, network);
+
+	return true;
+}
+
 /*
  * Used when scan results were obtained; either from scan running
  * inside station module or scans running in other state machines, e.g. wsc
@@ -652,7 +884,7 @@ void station_set_scan_results(struct station *station,
 {
 	const struct l_queue_entry *bss_entry;
 	struct network *network;
-	bool wait_for_anqp = false;
+	bool wait = false;
 
 	l_queue_foreach_remove(new_bss_list, bss_free_if_ssid_not_utf8, NULL);
 
@@ -700,14 +932,17 @@ void station_set_scan_results(struct station *station,
 			continue;
 
 		if (station_start_anqp(station, network, bss))
-			wait_for_anqp = true;
+			wait = true;
+
+		if (station_start_owe_scan(station, new_bss_list, bss, network))
+			wait = true;
 	}
 
 	station->bss_list = new_bss_list;
 
 	l_hashmap_foreach_remove(station->networks, process_network, station);
 
-	if (!wait_for_anqp && add_to_autoconnect) {
+	if (!wait && add_to_autoconnect) {
 		station_network_foreach(station, network_add_foreach, station);
 		station_autoconnect_next(station);
 	}
@@ -2905,6 +3140,10 @@ static struct l_dbus_message *station_dbus_connect_hidden_network(
 			l_queue_get_entries(station->hidden_bss_list_sorted);
 		struct scan_bss *target = network_bss_select(network, true);
 
+		/* Treat OWE transition networks special */
+		if (!l_memeqzero(target->owe_trans_bssid, 6))
+			goto not_hidden;
+
 		for (; entry; entry = entry->next) {
 			struct scan_bss *bss = entry->data;
 
@@ -2916,6 +3155,7 @@ static struct l_dbus_message *station_dbus_connect_hidden_network(
 								message);
 		}
 
+not_hidden:
 		return dbus_error_not_hidden(message);
 	}
 
@@ -3677,9 +3917,14 @@ static void station_free(struct station *station)
 		scan_cancel(netdev_get_wdev_id(station->netdev),
 				station->hidden_network_scan_id);
 
+	if (station->owe_transition_scan_id)
+		scan_cancel(netdev_get_wdev_id(station->netdev),
+				station->owe_transition_scan_id);
+
 	station_roam_state_clear(station);
 
 	l_queue_destroy(station->networks_sorted, NULL);
+	l_queue_destroy(station->owe_network_list, NULL);
 	l_hashmap_destroy(station->networks, network_free);
 	l_queue_destroy(station->bss_list, bss_free);
 	l_queue_destroy(station->hidden_bss_list_sorted, NULL);
Signature · 1 line
2.31.1
author
#5 lore raw

PATCH v3 6/7 network: prefer OWE transition BSS over open

In reply to James Prestwood

There isn't much control station has with how BSS's are inserted to a network object. The rank algorithm makes that decision. Because of this we could end up in a situation where the Open BSS is preferred over the OWE transition BSS.

In attempt to better handle this any Open BSS in this type of network will not be chosen unless its the only candidate (e.g. no other BSSs, inability to connect with OWE, or an improperly configured network).

---
 src/network.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
src/network.c +16 -0
index 4768b872..bc35ddea 100644
@@ -1105,6 +1105,11 @@ const struct l_queue_entry *network_bss_list_get_entries(
 	return l_queue_get_entries(network->bss_list);
 }
 
+static bool bss_is_owe(struct scan_bss *bss)
+{
+	return !l_memeqzero(bss->owe_trans_bssid, 6) && bss->rsne;
+}
+
 struct scan_bss *network_bss_select(struct network *network,
 						bool fallback_to_blacklist)
 {
@@ -1130,6 +1135,17 @@ struct scan_bss *network_bss_select(struct network *network,
 		if (!candidate)
 			candidate = bss;
 
+		/* OWE Transition BSS */
+		if (!l_memeqzero(bss->owe_trans_bssid, 6)) {
+			/* Don't want to connect to the Open BSS if possible */
+			if (!bss->rsne)
+				continue;
+
+			/* Candidate is not OWE, set this as new candidate */
+			if (!bss_is_owe(candidate))
+				candidate = bss;
+		}
+
 		/* check if temporarily blacklisted */
 		if (l_queue_find(network->blacklist, match_bss, bss))
 			continue;
Signature · 1 line
2.31.1
author
#6 lore raw

PATCH v3 7/7 auto-t: add testOWE-transition

In reply to James Prestwood

This adds several tests for OWE transition networks. Hostapd does have special options for these networks but currently their implementation is incorrect as the IE is not ever added to the OWE BSS. Besides that using vendor_elements provides a much easier way to create invalid IEs to test.

---
 .../testOWE-transition/connection_test.py     | 156 ++++++++++++++++++
 autotests/testOWE-transition/hw.conf          |  10 ++
 autotests/testOWE-transition/main.conf        |   2 +
 autotests/testOWE-transition/ssidOWE.conf     |  14 ++
 autotests/testOWE-transition/ssidOpen.conf    |   8 +
 autotests/testOWE-transition/transition.open  |   0
 6 files changed, 190 insertions(+)
 create mode 100644 autotests/testOWE-transition/connection_test.py
 create mode 100644 autotests/testOWE-transition/hw.conf
 create mode 100644 autotests/testOWE-transition/main.conf
 create mode 100644 autotests/testOWE-transition/ssidOWE.conf
 create mode 100644 autotests/testOWE-transition/ssidOpen.conf
 create mode 100644 autotests/testOWE-transition/transition.open
autotests/testOWE-transition/connection_test.py new file +156 -0
new file mode 100644
index 00000000..b85ea3c9
@@ -0,0 +1,156 @@
+#!/usr/bin/python3
+
+import unittest
+import sys
+
+sys.path.append('../util')
+import iwd
+from iwd import IWD
+from iwd import NetworkType
+from hostapd import HostapdCLI
+import testutil
+
+class Test(unittest.TestCase):
+
+    def validate(self, wd, target, autoconnect=False, connect_hidden=False):
+        devices = wd.list_devices(1)
+        device = devices[0]
+        device.autoconnect = autoconnect
+
+        if not autoconnect:
+            if not connect_hidden:
+                condition = 'not obj.scanning'
+                wd.wait_for_object_condition(device, condition)
+
+                device.scan()
+
+                condition = 'obj.scanning'
+                wd.wait_for_object_condition(device, condition)
+
+                condition = 'not obj.scanning'
+                wd.wait_for_object_condition(device, condition)
+
+                network = device.get_ordered_network('transition', scan_if_needed=False)
+
+                network.network_object.connect()
+            else:
+                device.connect_hidden_network('owe-hidden')
+
+        condition = 'obj.state == DeviceState.connected'
+        wd.wait_for_object_condition(device, condition)
+
+        testutil.test_iface_operstate()
+        testutil.test_ifaces_connected(device.name, target.ifname)
+
+        self.assertIn(device.address, target.list_sta())
+
+        device.disconnect()
+
+    # Normal success case
+    def test_owe_transition(self):
+        self.hapd_open.set_value('vendor_elements', 'dd15506f9a1c02000000f1000a6f77652d68696464656e')
+        self.hapd_open.reload()
+        self.hapd_owe.set_value('vendor_elements', 'dd15506f9a1c02000000f0000a7472616e736974696f6e')
+        self.hapd_owe.reload()
+        self.validate(self.wd, self.hapd_owe)
+
+    # Normal success case
+    def test_owe_transition_multi_network(self):
+        self.hapd_open.set_value('vendor_elements', 'dd15506f9a1c02000000f1000a6f77652d68696464656e')
+        self.hapd_open.reload()
+        self.hapd_owe.set_value('vendor_elements', 'dd15506f9a1c02000000f0000a7472616e736974696f6e')
+        self.hapd_owe.reload()
+
+        self.hapd_open2.set_value('vendor_elements', 'dd17506f9a1c02000000f1000c6f77652d68696464656e2d32')
+        self.hapd_open2.reload()
+        self.hapd_owe2.set_value('vendor_elements', 'dd17506f9a1c02000000f0000c7472616e736974696f6e2d32')
+        self.hapd_owe2.reload()
+
+        self.validate(self.wd, self.hapd_owe)
+
+    # Normal success autoconnect case
+    def test_owe_transition_autoconnect(self):
+        self.hapd_open.set_value('vendor_elements', 'dd15506f9a1c02000000f1000a6f77652d68696464656e')
+        self.hapd_open.reload()
+        self.hapd_owe.set_value('vendor_elements', 'dd15506f9a1c02000000f0000a7472616e736974696f6e')
+        self.hapd_owe.reload()
+        IWD.copy_to_storage('transition.open')
+
+        self.validate(self.wd, self.hapd_owe, autoconnect=True)
+
+    # Open BSS has invalid BSSID in OWE transition element
+    # Expected connection to Open BSS
+    def test_owe_transition_invalid_open_bssid(self):
+        self.hapd_open.set_value('vendor_elements', 'dd15506f9a1c02000000ff000a6f77652d68696464656e')
+        self.hapd_open.reload()
+        self.hapd_owe.set_value('vendor_elements', 'dd15506f9a1c02000000f0000a7472616e736974696f6e')
+        self.hapd_owe.reload()
+
+        self.validate(self.wd, self.hapd_open)
+
+    # OWE BSS has invalid BSSID in OWE transition element
+    # Expected connection to Open BSS
+    def test_owe_transition_invalid_owe_bssid(self):
+        self.hapd_open.set_value('vendor_elements', 'dd15506f9a1c02000000f1000a6f77652d68696464656e')
+        self.hapd_open.reload()
+        self.hapd_owe.set_value('vendor_elements', 'dd15506f9a1c02000000ff000a7472616e736974696f6e')
+        self.hapd_owe.reload()
+
+        self.validate(self.wd, self.hapd_open)
+
+    # No OWE hidden network exists
+    # Expected connection to Open BSS
+    def test_owe_transition_no_hidden_found(self):
+        self.hapd_open.set_value('vendor_elements', 'dd15506f9a1c02000000f1000a6f77652d68696464656e')
+        self.hapd_open.reload()
+        self.hapd_owe.disable()
+
+        self.validate(self.wd, self.hapd_open)
+
+    # Directly connect to valid OWE hidden network
+    # Expected connection failure
+    def test_owe_transition_connect_hidden_valid(self):
+        self.hapd_open.set_value('vendor_elements', 'dd15506f9a1c02000000f1000a6f77652d68696464656e')
+        self.hapd_open.reload()
+        self.hapd_owe.set_value('vendor_elements', 'dd15506f9a1c02000000f0000a7472616e736974696f6e')
+        self.hapd_owe.reload()
+
+        with self.assertRaises(iwd.NotFoundEx):
+            self.validate(self.wd, self.hapd_owe, connect_hidden=True)
+
+    # Directly connect to invalid OWE hidden network. The SSID in the OWE BSS
+    # IE points to itself. And the Open BSS IE points to a non-existent SSID.
+    # Expected connection failure
+    def test_owe_transition_connect_hidden_invalid(self):
+        self.hapd_open.set_value('vendor_elements', 'dd18506f9a1c02000000f1000d6e6f2d6f77652d68696464656e')
+        self.hapd_open.reload()
+        self.hapd_owe.set_value('vendor_elements', 'dd15506f9a1c02000000f0000a6f77652d68696464656e')
+        self.hapd_owe.reload()
+
+        with self.assertRaises(iwd.NotFoundEx):
+            self.validate(self.wd, self.hapd_owe, connect_hidden=True)
+
+    def setUp(self):
+        self.wd = IWD(True)
+        self.hapd_owe = HostapdCLI(config='ssidOWE.conf')
+        self.hapd_open = HostapdCLI(config='ssidOpen.conf')
+        self.hapd_owe2 = HostapdCLI(config='ssidOWE-2.conf')
+        self.hapd_open2 = HostapdCLI(config='ssidOpen-2.conf')
+
+    def tearDown(self):
+        IWD.clear_storage()
+
+        self.wd = None
+        self.hapd_open = None
+        self.hapd_owe = None
+
+    @classmethod
+    def setUpClass(cls):
+        pass
+
+    @classmethod
+    def tearDownClass(cls):
+        IWD.clear_storage()
+
+if __name__ == '__main__':
+    unittest.main(exit=True)
autotests/testOWE-transition/hw.conf new file +10 -0
new file mode 100644
index 00000000..dbd70597
@@ -0,0 +1,10 @@
+[SETUP]
+num_radios=5
+hwsim_medium=yes
+start_iwd=0
+
+[HOSTAPD]
+rad0=ssidOpen.conf
+rad1=ssidOWE.conf
+rad2=ssidOpen-2.conf
+rad3=ssidOWE-2.conf
autotests/testOWE-transition/main.conf new file +2 -0
new file mode 100644
index 00000000..9452fb6b
@@ -0,0 +1,2 @@
+[Scan]
+DisableMacAddressRandomization=true
autotests/testOWE-transition/ssidOWE.conf new file +14 -0
new file mode 100644
index 00000000..c54309ae
@@ -0,0 +1,14 @@
+ssid=owe-hidden
+bssid=02:00:00:00:f1:00
+channel=1
+ignore_broadcast_ssid=1
+ieee80211w=1
+
+wpa=2
+wpa_key_mgmt=OWE
+rsn_pairwise=CCMP
+
+# You would conventionally use these options but hostapd does not include an
+# IE for the OWE network, hence vendor_elements must be used directly
+#owe_transition_ssid="transition"
+#owe_transition_bssid=02:00:00:00:f0:00
autotests/testOWE-transition/ssidOpen.conf new file +8 -0
new file mode 100644
index 00000000..4fc68430
@@ -0,0 +1,8 @@
+channel=1
+ssid=transition
+bssid=02:00:00:00:f0:00
+
+# You would conventionally use these options but hostapd does not include an
+# IE for the OWE network, hence vendor_elements must be used directly
+#owe_transition_ssid="owe-hidden"
+#owe_transition_bssid=02:00:00:00:f1:00
autotests/testOWE-transition/transition.open new file +0 -0
new file mode 100644
index 00000000..e69de29b
Signature · 1 line
2.31.1
#7 lore raw
In reply to James Prestwood

Hi James,

Quoted 5 lines · James Prestwood

This is a parser for the WFA OWE Transition element. For now the optional band/channel bytes will not be parsed as hostapd does not yet support these and would also require the 802.11 appendix E-1 to be added to IWD. Because of this OWE Transition networks are assumed to be on the same channel as their open counterpart.

Quoted 8 lines
---
  src/ie.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
  src/ie.h |  5 +++++
  2 files changed, 50 insertions(+)

v3:
* Changed to handle non-utf8 SSIDs

Patches 1-4 applied, thanks.

Regards,
-Denis