cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #245413 from oddlama/fix-hostapd-mac-allow

Browse source
This commit is contained in:
Ryan Lahfa 2023-07-28 19:19:02 +02:00 committed by GitHub
commit 2a0aaa7e8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/networking/hostapd.nix
View file

@ -921,9 +921,7 @@ in {
}; };
config = let config = let
bss = bssSubmod.name;
bssCfg = bssSubmod.config; bssCfg = bssSubmod.config;
pairwiseCiphers = pairwiseCiphers =
concatStringsSep " " (unique (bssCfg.authentication.pairwiseCiphers concatStringsSep " " (unique (bssCfg.authentication.pairwiseCiphers
++ optionals bssCfg.authentication.enableRecommendedPairwiseCiphers ["CCMP" "CCMP-256" "GCMP" "GCMP-256"])); ++ optionals bssCfg.authentication.enableRecommendedPairwiseCiphers ["CCMP" "CCMP-256" "GCMP" "GCMP-256"]));
@ -964,9 +962,9 @@ in {
} // optionalAttrs (bssCfg.bssid != null) { } // optionalAttrs (bssCfg.bssid != null) {
bssid = bssCfg.bssid; bssid = bssCfg.bssid;
} // optionalAttrs (bssCfg.macAllow != [] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow) { } // optionalAttrs (bssCfg.macAllow != [] || bssCfg.macAllowFile != null || bssCfg.authentication.saeAddToMacAllow) {
accept_mac_file = "/run/hostapd/${bss}.mac.allow"; accept_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.allow";
} // optionalAttrs (bssCfg.macDeny != [] || bssCfg.macDenyFile != null) { } // optionalAttrs (bssCfg.macDeny != [] || bssCfg.macDenyFile != null) {
deny_mac_file = "/run/hostapd/${bss}.mac.deny"; deny_mac_file = "/run/hostapd/${bssCfg._module.args.name}.mac.deny";
} // optionalAttrs (bssCfg.authentication.mode == "none") { } // optionalAttrs (bssCfg.authentication.mode == "none") {
wpa = mkDefault 0; wpa = mkDefault 0;
} // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") { } // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae") {
@ -1051,7 +1049,6 @@ in {
}; };
config.settings = let config.settings = let
radio = radioSubmod.name;
radioCfg = radioSubmod.config; radioCfg = radioSubmod.config;
in { in {
driver = radioCfg.driver; driver = radioCfg.driver;

1
nixos/tests/wpa_supplicant.nix
View file

@ -34,6 +34,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}:
ssid = "nixos-test-mixed"; ssid = "nixos-test-mixed";
authentication = { authentication = {
mode = "wpa3-sae-transition"; mode = "wpa3-sae-transition";
saeAddToMacAllow = true;
saePasswordsFile = pkgs.writeText "password" "reproducibility"; saePasswordsFile = pkgs.writeText "password" "reproducibility";
wpaPasswordFile = pkgs.writeText "password" "reproducibility"; wpaPasswordFile = pkgs.writeText "password" "reproducibility";
}; };