tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2012/11/14 02:24:27 

[auth2-pubkey.c]
     fix username passed to helper program
     prepare stdio fds before closefrom()

     spotted by landry@
This commit is contained in:
Damien Miller 2012-11-14 19:04:02 +11:00
parent 0120c41d6b
commit 1e85469fcb
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
20121114
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2012/11/14 02:24:27
[auth2-pubkey.c]
fix username passed to helper program
prepare stdio fds before closefrom()
spotted by landry@
20121107 20121107
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
- eric@cvs.openbsd.org 2011/11/28 08:46:27 - eric@cvs.openbsd.org 2011/11/28 08:46:27

32
auth2-pubkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-pubkey.c,v 1.32 2012/11/04 10:38:43 djm Exp $ */ /* $OpenBSD: auth2-pubkey.c,v 1.33 2012/11/14 02:24:27 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -504,8 +504,8 @@ user_key_command_allowed2(struct passwd *user_pw, Key *key)
goto out; goto out;
} }
debug3("Running AuthorizedKeysCommand: \"%s\" as \"%s\"", debug3("Running AuthorizedKeysCommand: \"%s %s\" as \"%s\"",
options.authorized_keys_command, pw->pw_name); options.authorized_keys_command, user_pw->pw_name, pw->pw_name);
/* /*
* Don't want to call this in the child, where it can fatal() and * Don't want to call this in the child, where it can fatal() and
@ -523,7 +523,19 @@ user_key_command_allowed2(struct passwd *user_pw, Key *key)
for (i = 0; i < NSIG; i++) for (i = 0; i < NSIG; i++)
signal(i, SIG_DFL); signal(i, SIG_DFL);
if ((devnull = open(_PATH_DEVNULL, O_RDWR)) == -1) {
error("%s: open %s: %s", __func__, _PATH_DEVNULL,
strerror(errno));
_exit(1);
}
/* Keep stderr around a while longer to catch errors */
if (dup2(devnull, STDIN_FILENO) == -1 ||
dup2(p[1], STDOUT_FILENO) == -1) {
error("%s: dup2: %s", __func__, strerror(errno));
_exit(1);
}
closefrom(STDERR_FILENO + 1); closefrom(STDERR_FILENO + 1);
/* Don't use permanently_set_uid() here to avoid fatal() */ /* Don't use permanently_set_uid() here to avoid fatal() */
if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) != 0) { if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) != 0) {
error("setresgid %u: %s", (u_int)pw->pw_gid, error("setresgid %u: %s", (u_int)pw->pw_gid,
@ -535,22 +547,14 @@ user_key_command_allowed2(struct passwd *user_pw, Key *key)
strerror(errno)); strerror(errno));
_exit(1); _exit(1);
} }
/* stdin is pointed to /dev/null at this point */
close(p[0]); if (dup2(STDIN_FILENO, STDERR_FILENO) == -1) {
if ((devnull = open(_PATH_DEVNULL, O_RDWR)) == -1) {
error("%s: open %s: %s", __func__, _PATH_DEVNULL,
strerror(errno));
_exit(1);
}
if (dup2(devnull, STDIN_FILENO) == -1 ||
dup2(p[1], STDOUT_FILENO) == -1 ||
dup2(devnull, STDERR_FILENO) == -1) {
error("%s: dup2: %s", __func__, strerror(errno)); error("%s: dup2: %s", __func__, strerror(errno));
_exit(1); _exit(1);
} }
execl(options.authorized_keys_command, execl(options.authorized_keys_command,
options.authorized_keys_command, pw->pw_name, NULL); options.authorized_keys_command, user_pw->pw_name, NULL);
error("AuthorizedKeysCommand %s exec failed: %s", error("AuthorizedKeysCommand %s exec failed: %s",
options.authorized_keys_command, strerror(errno)); options.authorized_keys_command, strerror(errno));