diff options
| author | Alan Somers <asomers@FreeBSD.org> | 2016-07-13 17:09:20 +0000 |
|---|---|---|
| committer | Alan Somers <asomers@FreeBSD.org> | 2016-07-13 17:09:20 +0000 |
| commit | e9e9b3528bf75d192d0a273a1d3f7e11a83103f7 (patch) | |
| tree | d952e000c012529909e030bb0233c1df7a85d28e /pw/pw_conf.c | |
| parent | 043e0d933a6fa3cedba9a0c0db9d995288aa5f53 (diff) | |
| download | pw-darwin-e9e9b3528bf75d192d0a273a1d3f7e11a83103f7.tar.gz pw-darwin-e9e9b3528bf75d192d0a273a1d3f7e11a83103f7.zip | |
pw should sanitize the argument of -w.
Otherwise, it will silently disable the login for the selected account if
the argument is unrecognizable.
usr.sbin/pw/pw.h
usr.sbin/pw/pw_conf.c
usr.sbin/pw/pw_user.c
Use separate rules to validate boolean parameters and passwd
parameters. Error out if a password parameter cannot be parsed.
usr.sbin/pw/tests/Makefile
usr.sbin/pw/tests/crypt.c
usr.sbin/pw/tests/pw_useradd.sh
usr.sbin/pw/tests/pw_usermod.sh
Add tests for the validation. Also, enhance existing
password-related tests to actually validate that the correct hash is
written to master.passwd.
Reviewed by: bapt
MFC after: 4 weeks
Sponsored by: Spectra Logic Corp
Differential Revision: https://reviews.freebsd.org/D6840
Diffstat (limited to 'pw/pw_conf.c')
| -rw-r--r-- | pw/pw_conf.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/pw/pw_conf.c b/pw/pw_conf.c index d30c80e..a3bd0bd 100644 --- a/pw/pw_conf.c +++ b/pw/pw_conf.c @@ -186,6 +186,22 @@ boolean_val(char const * str, int dflt) for (i = 0; boolfalse[i]; i++) if (strcmp(str, boolfalse[i]) == 0) return 0; + } + return dflt; +} + +int +passwd_val(char const * str, int dflt) +{ + if ((str = unquote(str)) != NULL) { + int i; + + for (i = 0; booltrue[i]; i++) + if (strcmp(str, booltrue[i]) == 0) + return 1; + for (i = 0; boolfalse[i]; i++) + if (strcmp(str, boolfalse[i]) == 0) + return 0; /* * Special cases for defaultpassword @@ -194,6 +210,8 @@ boolean_val(char const * str, int dflt) return -1; if (strcmp(str, "none") == 0) return -2; + + errx(1, "Invalid value for default password"); } return dflt; } @@ -258,7 +276,7 @@ read_userconfig(char const * file) #endif switch (i) { case _UC_DEFAULTPWD: - config.default_password = boolean_val(q, 1); + config.default_password = passwd_val(q, 1); break; case _UC_REUSEUID: config.reuse_uids = boolean_val(q, 0); |