RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/02/09 06:18:46 

[auth.c]
     unbreak ChrootDirectory+internal-sftp by skipping check for executable
     shell when chrooting; reported by danh AT wzrd.com; ok dtucker@
This commit is contained in:
Damien Miller 2010-02-12 09:25:29 +11:00
parent 8922106fe9
commit 47cf16b8df
2 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -27,6 +27,10 @@
- djm@cvs.openbsd.org 2010/02/09 03:56:28 - djm@cvs.openbsd.org 2010/02/09 03:56:28
[buffer.c buffer.h] [buffer.c buffer.h]
constify the arguments to buffer_len, buffer_ptr and buffer_dump constify the arguments to buffer_len, buffer_ptr and buffer_dump
- djm@cvs.openbsd.org 2010/02/09 06:18:46
[auth.c]
unbreak ChrootDirectory+internal-sftp by skipping check for executable
shell when chrooting; reported by danh AT wzrd.com; ok dtucker@
20100210 20100210
- (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for

39
auth.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth.c,v 1.83 2010/01/13 23:47:26 djm Exp $ */ /* $OpenBSD: auth.c,v 1.84 2010/02/09 06:18:46 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -95,7 +95,6 @@ allowed_user(struct passwd * pw)
{ {
struct stat st; struct stat st;
const char *hostname = NULL, *ipaddr = NULL, *passwd = NULL; const char *hostname = NULL, *ipaddr = NULL, *passwd = NULL;
char *shell, *tmp, *chroot_path;
u_int i; u_int i;
#ifdef USE_SHADOW #ifdef USE_SHADOW
struct spwd *spw = NULL; struct spwd *spw = NULL;
@ -153,43 +152,29 @@ allowed_user(struct passwd * pw)
} }
/* /*
* Get the shell from the password data. An empty shell field is * Deny if shell does not exist or is not executable unless we
* legal, and means /bin/sh. * are chrooting.
*/ */
shell = xstrdup((pw->pw_shell[0] == '\0') ? if (options.chroot_directory == NULL ||
_PATH_BSHELL : pw->pw_shell); strcasecmp(options.chroot_directory, "none") == 0) {
char *shell = xstrdup((pw->pw_shell[0] == '\0') ?
_PATH_BSHELL : pw->pw_shell); /* empty = /bin/sh */
/*
* Amend shell if chroot is requested.
*/
if (options.chroot_directory != NULL &&
strcasecmp(options.chroot_directory, "none") != 0) {
tmp = tilde_expand_filename(options.chroot_directory,
pw->pw_uid);
chroot_path = percent_expand(tmp, "h", pw->pw_dir,
"u", pw->pw_name, (char *)NULL);
xfree(tmp);
xasprintf(&tmp, "%s/%s", chroot_path, shell);
xfree(shell);
shell = tmp;
free(chroot_path);
}
/* deny if shell does not exists or is not executable */
if (stat(shell, &st) != 0) { if (stat(shell, &st) != 0) {
logit("User %.100s not allowed because shell %.100s does not exist", logit("User %.100s not allowed because shell %.100s "
pw->pw_name, shell); "does not exist", pw->pw_name, shell);
xfree(shell); xfree(shell);
return 0; return 0;
} }
if (S_ISREG(st.st_mode) == 0 || if (S_ISREG(st.st_mode) == 0 ||
(st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) { (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) {
logit("User %.100s not allowed because shell %.100s is not executable", logit("User %.100s not allowed because shell %.100s "
pw->pw_name, shell); "is not executable", pw->pw_name, shell);
xfree(shell); xfree(shell);
return 0; return 0;
} }
xfree(shell); xfree(shell);
}
if (options.num_deny_users > 0 || options.num_allow_users > 0 || if (options.num_deny_users > 0 || options.num_allow_users > 0 ||
options.num_deny_groups > 0 || options.num_allow_groups > 0) { options.num_deny_groups > 0 || options.num_allow_groups > 0) {