commit a50b9e6c230c06ec83eb20f0b317a71a5e8fcb11 · pyrox.dev/nixpkgs

+23 -5

nixos/modules/services/networking/wpa_supplicant.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       +
         package = if cfg.allowAuxiliaryImperativeNetworks

     

       7
       7
       +
           then pkgs.wpa_supplicant_ro_ssids

     

       8
       8
       +
           else pkgs.wpa_supplicant;

     

       9
       9
       +
       

     

       6
       10
        
         cfg = config.networking.wireless;

     

       7
       11
        
         configFile = if cfg.networks != {} || cfg.extraConfig != "" || cfg.userControlled.enable then pkgs.writeText "wpa_supplicant.conf" ''

     

       8
       12
        
           ${optionalString cfg.userControlled.enable ''

     
···

       45
       49
        
               type = types.str;

     

       46
       50
        
               default = "nl80211,wext";

     

       47
       51
        
               description = "Force a specific wpa_supplicant driver.";

     

       52
       52
       +
             };

     

       53
       53
       +
       

     

       54
       54
       +
             allowAuxiliaryImperativeNetworks = mkEnableOption "support for imperative & declarative networks" // {

     

       55
       55
       +
               description = ''

     

       56
       56
       +
                 Whether to allow configuring networks "imperatively" (e.g. via

     

       57
       57
       +
                 <package>wpa_supplicant_gui</package>) and declaratively via

     

       58
       58
       +
                 <xref linkend="opt-networking.wireless.networks" />.

     

       59
       59
       +
       

     

       60
       60
       +
                 Please note that this adds a custom patch to <package>wpa_supplicant</package>.

     

       61
       61
       +
               '';

     

       48
       62
        
             };

     

       49
       63
        
       

     

       50
       64
        
             networks = mkOption {

     
···

       211
       225
        
             message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive'';

     

       212
       226
        
           });

     

       213
       227
        
       

     

       214
       214
       -
           environment.systemPackages =  [ pkgs.wpa_supplicant ];

     

       228
       228
       +
           environment.systemPackages = [ package ];

     

       215
       229
        
       

     

       216
       216
       -
           services.dbus.packages = [ pkgs.wpa_supplicant ];

     

       230
       230
       +
           services.dbus.packages = [ package ];

     

       217
       231
        
           services.udev.packages = [ pkgs.crda ];

     

       218
       232
        
       

     

       219
       233
        
           # FIXME: start a separate wpa_supplicant instance per interface.

     
···

       230
       244
        
             wantedBy = [ "multi-user.target" ];

     

       231
       245
        
             stopIfChanged = false;

     

       232
       246
        
       

     

       233
       233
       -
             path = [ pkgs.wpa_supplicant ];

     

       247
       247
       +
             path = [ package ];

     

       234
       248
        
       

     

       235
       235
       -
             script = ''

     

       249
       249
       +
             script = let

     

       250
       250
       +
               configStr = if cfg.allowAuxiliaryImperativeNetworks

     

       251
       251
       +
                 then "-c /etc/wpa_supplicant.conf -I ${configFile}"

     

       252
       252
       +
                 else "-c ${configFile}";

     

       253
       253
       +
             in ''

     

       236
       254
        
               if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ]

     

       237
       255
        
               then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead."

     

       238
       256
        
               fi

     

       239
       239
       -
               iface_args="-s -u -D${cfg.driver} -c ${configFile}"

     

       257
       257
       +
               iface_args="-s -u -D${cfg.driver} ${configStr}"

     

       240
       258
        
               ${if ifaces == [] then ''

     

       241
       259
        
                 for i in $(cd /sys/class/net && echo *); do

     

       242
       260
        
                   DEVTYPE=

+130

pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch

···

       1
       1
       +
       From 99ae610f0ae3608a12c864caedf396f14e68327d Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Maximilian Bosch <maximilian@mbosch.me>

     

       3
       3
       +
       Date: Fri, 19 Feb 2021 19:44:21 +0100

     

       4
       4
       +
       Subject: [PATCH] Implement read-only mode for ssids

     

       5
       5
       +
       

     

       6
       6
       +
       With this change it's possible to define `network=`-sections in a second

     

       7
       7
       +
       config file specified via `-I` without having changes written to

     

       8
       8
       +
       `/etc/wpa_supplicant.conf`.

     

       9
       9
       +
       

     

       10
       10
       +
       This is helpful on e.g. NixOS to allow both declarative (i.e. read-only)

     

       11
       11
       +
       and imperative (i.e. mutable) networks.

     

       12
       12
       +
       ---

     

       13
       13
       +
        wpa_supplicant/config.h         | 2 +-

     

       14
       14
       +
        wpa_supplicant/config_file.c    | 5 +++--

     

       15
       15
       +
        wpa_supplicant/config_none.c    | 2 +-

     

       16
       16
       +
        wpa_supplicant/config_ssid.h    | 2 ++

     

       17
       17
       +
        wpa_supplicant/wpa_supplicant.c | 8 ++++----

     

       18
       18
       +
        5 files changed, 11 insertions(+), 8 deletions(-)

     

       19
       19
       +
       

     

       20
       20
       +
       diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h

     

       21
       21
       +
       index 6a297ecfe..adaf4d398 100644

     

       22
       22
       +
       --- a/wpa_supplicant/config.h

     

       23
       23
       +
       +++ b/wpa_supplicant/config.h

     

       24
       24
       +
       @@ -1614,7 +1614,7 @@ const char * wpa_config_get_global_field_name(unsigned int i, int *no_var);

     

       25
       25
       +
         *

     

       26
       26
       +
         * Each configuration backend needs to implement this function.

     

       27
       27
       +
         */

     

       28
       28
       +
       -struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp);

     

       29
       29
       +
       +struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro);

     

       30
       30
       +
        

     

       31
       31
       +
        /**

     

       32
       32
       +
         * wpa_config_write - Write or update configuration data

     

       33
       33
       +
       diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c

     

       34
       34
       +
       index 77c326df5..d5ed051b9 100644

     

       35
       35
       +
       --- a/wpa_supplicant/config_file.c

     

       36
       36
       +
       +++ b/wpa_supplicant/config_file.c

     

       37
       37
       +
       @@ -373,7 +373,7 @@ static int wpa_config_process_blob(struct wpa_config *config, FILE *f,

     

       38
       38
       +
        #endif /* CONFIG_NO_CONFIG_BLOBS */

     

       39
       39
       +
        

     

       40
       40
       +
        

     

       41
       41
       +
       -struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)

     

       42
       42
       +
       +struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro)

     

       43
       43
       +
        {

     

       44
       44
       +
        	FILE *f;

     

       45
       45
       +
        	char buf[512], *pos;

     

       46
       46
       +
       @@ -415,6 +415,7 @@ struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)

     

       47
       47
       +
        	while (wpa_config_get_line(buf, sizeof(buf), f, &line, &pos)) {

     

       48
       48
       +
        		if (os_strcmp(pos, "network={") == 0) {

     

       49
       49
       +
        			ssid = wpa_config_read_network(f, &line, id++);

     

       50
       50
       +
       +			ssid->ro = ro;

     

       51
       51
       +
        			if (ssid == NULL) {

     

       52
       52
       +
        				wpa_printf(MSG_ERROR, "Line %d: failed to "

     

       53
       53
       +
        					   "parse network block.", line);

     

       54
       54
       +
       @@ -1591,7 +1592,7 @@ int wpa_config_write(const char *name, struct wpa_config *config)

     

       55
       55
       +
        	}

     

       56
       56
       +
        

     

       57
       57
       +
        	for (ssid = config->ssid; ssid; ssid = ssid->next) {

     

       58
       58
       +
       -		if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary)

     

       59
       59
       +
       +		if (ssid->key_mgmt == WPA_KEY_MGMT_WPS || ssid->temporary || ssid->ro)

     

       60
       60
       +
        			continue; /* do not save temporary networks */

     

       61
       61
       +
        		if (wpa_key_mgmt_wpa_psk(ssid->key_mgmt) && !ssid->psk_set &&

     

       62
       62
       +
        		    !ssid->passphrase)

     

       63
       63
       +
       diff --git a/wpa_supplicant/config_none.c b/wpa_supplicant/config_none.c

     

       64
       64
       +
       index 2aac28fa3..02191b425 100644

     

       65
       65
       +
       --- a/wpa_supplicant/config_none.c

     

       66
       66
       +
       +++ b/wpa_supplicant/config_none.c

     

       67
       67
       +
       @@ -17,7 +17,7 @@

     

       68
       68
       +
        #include "base64.h"

     

       69
       69
       +
        

     

       70
       70
       +
        

     

       71
       71
       +
       -struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp)

     

       72
       72
       +
       +struct wpa_config * wpa_config_read(const char *name, struct wpa_config *cfgp, int ro)

     

       73
       73
       +
        {

     

       74
       74
       +
        	struct wpa_config *config;

     

       75
       75
       +
        

     

       76
       76
       +
       diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h

     

       77
       77
       +
       index d5c5c00a9..fd80c079c 100644

     

       78
       78
       +
       --- a/wpa_supplicant/config_ssid.h

     

       79
       79
       +
       +++ b/wpa_supplicant/config_ssid.h

     

       80
       80
       +
       @@ -93,6 +93,8 @@ struct wpa_ssid {

     

       81
       81
       +
        	 */

     

       82
       82
       +
        	int id;

     

       83
       83
       +
        

     

       84
       84
       +
       +	int ro;

     

       85
       85
       +
       +

     

       86
       86
       +
        	/**

     

       87
       87
       +
        	 * priority - Priority group

     

       88
       88
       +
        	 *

     

       89
       89
       +
       diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c

     

       90
       90
       +
       index 911d79d17..cb0cb99b1 100644

     

       91
       91
       +
       --- a/wpa_supplicant/wpa_supplicant.c

     

       92
       92
       +
       +++ b/wpa_supplicant/wpa_supplicant.c

     

       93
       93
       +
       @@ -1052,14 +1052,14 @@ int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s)

     

       94
       94
       +
        

     

       95
       95
       +
        	if (wpa_s->confname == NULL)

     

       96
       96
       +
        		return -1;

     

       97
       97
       +
       -	conf = wpa_config_read(wpa_s->confname, NULL);

     

       98
       98
       +
       +	conf = wpa_config_read(wpa_s->confname, NULL, 0);

     

       99
       99
       +
        	if (conf == NULL) {

     

       100
       100
       +
        		wpa_msg(wpa_s, MSG_ERROR, "Failed to parse the configuration "

     

       101
       101
       +
        			"file '%s' - exiting", wpa_s->confname);

     

       102
       102
       +
        		return -1;

     

       103
       103
       +
        	}

     

       104
       104
       +
        	if (wpa_s->confanother &&

     

       105
       105
       +
       -	    !wpa_config_read(wpa_s->confanother, conf)) {

     

       106
       106
       +
       +	    !wpa_config_read(wpa_s->confanother, conf, 1)) {

     

       107
       107
       +
        		wpa_msg(wpa_s, MSG_ERROR,

     

       108
       108
       +
        			"Failed to parse the configuration file '%s' - exiting",

     

       109
       109
       +
        			wpa_s->confanother);

     

       110
       110
       +
       @@ -5638,7 +5638,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,

     

       111
       111
       +
        #else /* CONFIG_BACKEND_FILE */

     

       112
       112
       +
        		wpa_s->confname = os_strdup(iface->confname);

     

       113
       113
       +
        #endif /* CONFIG_BACKEND_FILE */

     

       114
       114
       +
       -		wpa_s->conf = wpa_config_read(wpa_s->confname, NULL);

     

       115
       115
       +
       +		wpa_s->conf = wpa_config_read(wpa_s->confname, NULL, 0);

     

       116
       116
       +
        		if (wpa_s->conf == NULL) {

     

       117
       117
       +
        			wpa_printf(MSG_ERROR, "Failed to read or parse "

     

       118
       118
       +
        				   "configuration '%s'.", wpa_s->confname);

     

       119
       119
       +
       @@ -5646,7 +5646,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,

     

       120
       120
       +
        		}

     

       121
       121
       +
        		wpa_s->confanother = os_rel2abs_path(iface->confanother);

     

       122
       122
       +
        		if (wpa_s->confanother &&

     

       123
       123
       +
       -		    !wpa_config_read(wpa_s->confanother, wpa_s->conf)) {

     

       124
       124
       +
       +		    !wpa_config_read(wpa_s->confanother, wpa_s->conf, 1)) {

     

       125
       125
       +
        			wpa_printf(MSG_ERROR,

     

       126
       126
       +
        				   "Failed to read or parse configuration '%s'.",

     

       127
       127
       +
        				   wpa_s->confanother);

     

       128
       128
       +
       -- 

     

       129
       129
       +
       2.29.2

     

       130
       130
       +

+6 -1

pkgs/os-specific/linux/wpa_supplicant/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl

     

       2
       2
        
       , dbus, readline ? null, pcsclite ? null

     

       3
       3
       +
       

     

       4
       4
       +
       , readOnlyModeSSIDs ? false

     

       3
       5
        
       }:

     

       4
       6
        
       

     

       5
       7
        
       with lib;

     
···

       43
       45
        
             url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15";

     

       44
       46
        
             sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg";

     

       45
       47
        
           })

     

       48
       48
       +
         ] ++ lib.optionals readOnlyModeSSIDs [

     

       49
       49
       +
           # Allow read-only networks

     

       50
       50
       +
           ./0001-Implement-read-only-mode-for-ssids.patch

     

       46
       51
        
         ];

     

       47
       52
        
       

     

       48
       53
        
         # TODO: Patch epoll so that the dbus actually responds

     
···

       134
       139
        
           homepage = "https://w1.fi/wpa_supplicant/";

     

       135
       140
        
           description = "A tool for connecting to WPA and WPA2-protected wireless networks";

     

       136
       141
        
           license = licenses.bsd3;

     

       137
       137
       -
           maintainers = with maintainers; [ marcweber ];

     

       142
       142
       +
           maintainers = with maintainers; [ marcweber ma27 ];

     

       138
       143
        
           platforms = platforms.linux;

     

       139
       144
        
         };

     

       140
       145
        
       }

pkgs/top-level/all-packages.nix

···

       21080
       21080
        
       

     

       21081
       21081
        
         wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };

     

       21082
       21082
        
       

     

       21083
       21083
       +
         wpa_supplicant_ro_ssids = wpa_supplicant.override {

     

       21084
       21084
       +
           readOnlyModeSSIDs = true;

     

       21085
       21085
       +
         };

     

       21086
       21086
       +
       

     

       21083
       21087
        
         wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };

     

       21084
       21088
        
       

     

       21085
       21089
        
         xf86_input_cmt = callPackage ../os-specific/linux/xf86-input-cmt { };