Re: [PATCH] network: fix handling of AlwaysRandomizeAddress/AddressOverride

Re: [PATCH] network: fix handling of AlwaysRandomizeAddress/AddressOverride

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 698 bytes --]

Hi James,

On 6/3/22 15:54, James Prestwood wrote:
> For network configuration files the man pages (iwd.network) state
> that [General].{AlwaysRandomizeAddress,AddressOverride} are only
> used if main.conf has [General].AddressRandomization=network.
> 
> This actually was not being enforced and both iwd.network settings
> were still taken into account regardless of what AddressRandomization
> was set to (even disabled).
> 
> The handshake setup code now checks the AddressRandomization value
> and if anything other than 'network' skips the randomization.
> ---
>   src/network.c | 11 +++++++++++
>   1 file changed, 11 insertions(+)
> 

Applied, thanks.

Regards,
-Denis

[PATCH] network: fix handling of AlwaysRandomizeAddress/AddressOverride

[James Prestwood]

[-- Attachment #1: Type: text/plain, Size: 1864 bytes --]

For network configuration files the man pages (iwd.network) state
that [General].{AlwaysRandomizeAddress,AddressOverride} are only
used if main.conf has [General].AddressRandomization=network.

This actually was not being enforced and both iwd.network settings
were still taken into account regardless of what AddressRandomization
was set to (even disabled).

The handshake setup code now checks the AddressRandomization value
and if anything other than 'network' skips the randomization.
---
 src/network.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/network.c b/src/network.c
index 7bc97121..70cb925c 100644
--- a/src/network.c
+++ b/src/network.c
@@ -485,10 +485,12 @@ int network_handshake_setup(struct network *network, struct scan_bss *bss,
 	struct station *station = network->station;
 	struct wiphy *wiphy = station_get_wiphy(station);
 	struct l_settings *settings = network->settings;
+	const struct l_settings *config = iwd_get_config();
 	struct network_info *info = network->info;
 	uint32_t eapol_proto_version;
 	uint8_t new_addr[ETH_ALEN];
 	int r;
+	const char *str;
 
 	switch (network->security) {
 	case SECURITY_PSK:
@@ -523,6 +525,15 @@ int network_handshake_setup(struct network *network, struct scan_bss *bss,
 		handshake_state_set_protocol_version(hs, eapol_proto_version);
 	}
 
+	/*
+	 * The randomization options in the provisioning file are dependent on
+	 * main.conf: [General].AddressRandomization=network. Any other value
+	 * should disqualify the three network-specific settings below.
+	 */
+	str = l_settings_get_value(config, "General", "AddressRandomization");
+	if (!(str && !strcmp(str, "network")))
+		return 0;
+
 	/*
 	 * We have three possible options here:
 	 * 1. per-network MAC generation (default, no option in network config)
-- 
2.34.1