jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

length of home path in ssh now limited by PATH_MAX

Browse Source
This commit is contained in:
Jan F. Chadima 2009-06-29 20:51:17 +00:00
parent eca05fc45d
commit f4b0b4b772
3 changed files with 47 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
openssh-5.2p1-homechroot.patch
View File

@ -1,7 +1,7 @@
diff -up /dev/null openssh-5.2p1/chrootenv.h diff -up /dev/null openssh-5.2p1/chrootenv.h
--- /dev/null 2009-06-11 17:05:12.257284457 +0200 --- /dev/null 2009-06-11 17:05:12.257284457 +0200
+++ openssh-5.2p1/chrootenv.h 2009-06-26 22:51:32.627222598 +0200 +++ openssh-5.2p1/chrootenv.h 2009-06-29 11:06:19.772277766 +0200
@@ -0,0 +1,33 @@ @@ -0,0 +1,32 @@
+/* $OpenBSD: session.h,v 1.30 2008/05/08 12:21:16 djm Exp $ */ +/* $OpenBSD: session.h,v 1.30 2008/05/08 12:21:16 djm Exp $ */
+ +
+/* +/*
@ -31,24 +31,22 @@ diff -up /dev/null openssh-5.2p1/chrootenv.h
+#define CHROOTENV_H +#define CHROOTENV_H
+ +
+extern int chroot_no_tree; +extern int chroot_no_tree;
+extern time_t timezone_diff;
+ +
+#endif +#endif
+ +
diff -up openssh-5.2p1/session.c.homechroot openssh-5.2p1/session.c diff -up openssh-5.2p1/session.c.homechroot openssh-5.2p1/session.c
--- openssh-5.2p1/session.c.homechroot 2009-06-26 22:51:32.327168352 +0200 --- openssh-5.2p1/session.c.homechroot 2009-06-29 10:58:43.715586616 +0200
+++ openssh-5.2p1/session.c 2009-06-27 07:37:49.181631924 +0200 +++ openssh-5.2p1/session.c 2009-06-29 11:04:58.684830462 +0200
@@ -119,6 +119,9 @@ void do_child(Session *, const char *); @@ -119,6 +119,8 @@ void do_child(Session *, const char *);
void do_motd(void); void do_motd(void);
int check_quietlogin(Session *, const char *); int check_quietlogin(Session *, const char *);
+int chroot_no_tree = 0; +int chroot_no_tree = 0;
+time_t timezone_diff;
+ +
static void do_authenticated1(Authctxt *); static void do_authenticated1(Authctxt *);
static void do_authenticated2(Authctxt *); static void do_authenticated2(Authctxt *);
@@ -784,6 +787,11 @@ do_exec(Session *s, const char *command) @@ -784,6 +786,11 @@ do_exec(Session *s, const char *command)
{ {
int ret; int ret;
@ -60,7 +58,7 @@ diff -up openssh-5.2p1/session.c.homechroot openssh-5.2p1/session.c
if (options.adm_forced_command) { if (options.adm_forced_command) {
original_command = command; original_command = command;
command = options.adm_forced_command; command = options.adm_forced_command;
@@ -1408,6 +1416,7 @@ safely_chroot(const char *path, uid_t ui @@ -1408,6 +1415,7 @@ safely_chroot(const char *path, uid_t ui
const char *cp; const char *cp;
char component[MAXPATHLEN]; char component[MAXPATHLEN];
struct stat st; struct stat st;
@ -68,7 +66,7 @@ diff -up openssh-5.2p1/session.c.homechroot openssh-5.2p1/session.c
if (*path != '/') if (*path != '/')
fatal("chroot path does not begin at root"); fatal("chroot path does not begin at root");
@@ -1419,7 +1428,7 @@ safely_chroot(const char *path, uid_t ui @@ -1419,7 +1427,7 @@ safely_chroot(const char *path, uid_t ui
* root-owned directory with strict permissions. * root-owned directory with strict permissions.
*/ */
for (cp = path; cp != NULL;) { for (cp = path; cp != NULL;) {
@ -77,7 +75,7 @@ diff -up openssh-5.2p1/session.c.homechroot openssh-5.2p1/session.c
strlcpy(component, path, sizeof(component)); strlcpy(component, path, sizeof(component));
else { else {
cp++; cp++;
@@ -1432,16 +1441,26 @@ safely_chroot(const char *path, uid_t ui @@ -1432,15 +1440,19 @@ safely_chroot(const char *path, uid_t ui
if (stat(component, &st) != 0) if (stat(component, &st) != 0)
fatal("%s: stat(\"%s\"): %s", __func__, fatal("%s: stat(\"%s\"): %s", __func__,
component, strerror(errno)); component, strerror(errno));
@ -89,23 +87,17 @@ diff -up openssh-5.2p1/session.c.homechroot openssh-5.2p1/session.c
if (!S_ISDIR(st.st_mode)) if (!S_ISDIR(st.st_mode))
fatal("chroot path %s\"%s\" is not a directory", fatal("chroot path %s\"%s\" is not a directory",
cp == NULL ? "" : "component ", component); cp == NULL ? "" : "component ", component);
+ } -
+ {
+ struct tm *tm;
+ time_t bou = time (NULL);
+ tm = localtime (&bou);
+ timezone_diff = tm->tm_gmtoff;
+ debug ("timezone_diff %ld\n", timezone_diff);
} }
+ setenv ("TZ", "/etc/localtime", 0);
+ tzset ();
+
+ if (st.st_uid != uid) + if (st.st_uid != uid)
+ ++chroot_no_tree; + ++chroot_no_tree;
+
if (chdir(path) == -1) if (chdir(path) == -1)
fatal("Unable to chdir to chroot path \"%s\": " fatal("Unable to chdir to chroot path \"%s\": "
"%s", path, strerror(errno)); @@ -1451,6 +1463,10 @@ safely_chroot(const char *path, uid_t ui
@@ -1451,6 +1470,10 @@ safely_chroot(const char *path, uid_t ui
if (chdir("/") == -1) if (chdir("/") == -1)
fatal("%s: chdir(/) after chroot: %s", fatal("%s: chdir(/) after chroot: %s",
__func__, strerror(errno)); __func__, strerror(errno));
@ -118,20 +110,19 @@ diff -up openssh-5.2p1/session.c.homechroot openssh-5.2p1/session.c
diff -up openssh-5.2p1/sftp.c.homechroot openssh-5.2p1/sftp.c diff -up openssh-5.2p1/sftp.c.homechroot openssh-5.2p1/sftp.c
--- openssh-5.2p1/sftp.c.homechroot 2009-02-14 06:26:19.000000000 +0100 --- openssh-5.2p1/sftp.c.homechroot 2009-02-14 06:26:19.000000000 +0100
+++ openssh-5.2p1/sftp.c 2009-06-26 22:51:32.635287402 +0200 +++ openssh-5.2p1/sftp.c 2009-06-29 11:06:59.610415272 +0200
@@ -94,6 +94,9 @@ int remote_glob(struct sftp_conn *, cons @@ -94,6 +94,8 @@ int remote_glob(struct sftp_conn *, cons
extern char *__progname; extern char *__progname;
+int chroot_no_tree = 0; +int chroot_no_tree = 0;
+time_t timezone_diff;
+ +
/* Separators for interactive commands */ /* Separators for interactive commands */
#define WHITESPACE " \t\r\n" #define WHITESPACE " \t\r\n"
diff -up openssh-5.2p1/sftp-common.c.homechroot openssh-5.2p1/sftp-common.c diff -up openssh-5.2p1/sftp-common.c.homechroot openssh-5.2p1/sftp-common.c
--- openssh-5.2p1/sftp-common.c.homechroot 2006-08-05 04:39:40.000000000 +0200 --- openssh-5.2p1/sftp-common.c.homechroot 2006-08-05 04:39:40.000000000 +0200
+++ openssh-5.2p1/sftp-common.c 2009-06-26 22:51:32.637218948 +0200 +++ openssh-5.2p1/sftp-common.c 2009-06-29 11:05:37.180134733 +0200
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"
@ -140,32 +131,7 @@ diff -up openssh-5.2p1/sftp-common.c.homechroot openssh-5.2p1/sftp-common.c
#include "sftp.h" #include "sftp.h"
#include "sftp-common.h" #include "sftp-common.h"
@@ -180,6 +181,18 @@ fx2txt(int status) @@ -194,13 +195,13 @@ ls_file(const char *name, const struct s
/* NOTREACHED */
}
+static struct tm *
+x_localtime (time_t *t)
+{
+ if (chroot_no_tree) {
+ time_t t2 = *t + timezone_diff;
+
+ return gmtime (&t2);
+ } else {
+ return localtime (t);
+ }
+}
+
/*
* drwxr-xr-x 5 markus markus 1024 Jan 13 18:39 .ssh
*/
@@ -189,18 +202,18 @@ ls_file(const char *name, const struct s
int ulen, glen, sz = 0;
struct passwd *pw;
struct group *gr;
- struct tm *ltime = localtime(&st->st_mtime);
+ struct tm *ltime = x_localtime(&st->st_mtime);
char *user, *group;
char buf[1024], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1]; char buf[1024], mode[11+1], tbuf[12+1], ubuf[11+1], gbuf[11+1];
strmode(st->st_mode, mode); strmode(st->st_mode, mode);
@ -183,8 +149,8 @@ diff -up openssh-5.2p1/sftp-common.c.homechroot openssh-5.2p1/sftp-common.c
snprintf(gbuf, sizeof gbuf, "%u", (u_int)st->st_gid); snprintf(gbuf, sizeof gbuf, "%u", (u_int)st->st_gid);
diff -up openssh-5.2p1/sftp-server-main.c.homechroot openssh-5.2p1/sftp-server-main.c diff -up openssh-5.2p1/sftp-server-main.c.homechroot openssh-5.2p1/sftp-server-main.c
--- openssh-5.2p1/sftp-server-main.c.homechroot 2009-02-21 22:47:02.000000000 +0100 --- openssh-5.2p1/sftp-server-main.c.homechroot 2009-02-21 22:47:02.000000000 +0100
+++ openssh-5.2p1/sftp-server-main.c 2009-06-26 22:51:32.639217850 +0200 +++ openssh-5.2p1/sftp-server-main.c 2009-06-29 11:07:13.704123635 +0200
@@ -22,11 +22,15 @@ @@ -22,11 +22,14 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -195,7 +161,6 @@ diff -up openssh-5.2p1/sftp-server-main.c.homechroot openssh-5.2p1/sftp-server-m
#include "misc.h" #include "misc.h"
+int chroot_no_tree = 0; +int chroot_no_tree = 0;
+time_t timezone_diff;
+ +
void void
cleanup_exit(int i) cleanup_exit(int i)

20
openssh-5.2p1-pathmax.patch Normal file
View File

@ -0,0 +1,20 @@
diff -up openssh-5.2p1/ssh.c.pathmax openssh-5.2p1/ssh.c
--- openssh-5.2p1/ssh.c.pathmax 2009-06-29 22:13:17.251360372 +0200
+++ openssh-5.2p1/ssh.c 2009-06-29 22:14:46.036292525 +0200
@@ -49,6 +49,7 @@
#include <sys/resource.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
+#include <sys/param.h>
#include <ctype.h>
#include <errno.h>
@@ -209,7 +210,7 @@ int
main(int ac, char **av)
{
int i, opt, exit_status, use_syslog;
- char *p, *cp, *line, buf[256];
+ char *p, *cp, *line, buf[PATH_MAX];
struct stat st;
struct passwd *pw;
int dummy, timeout_ms;

7
openssh.spec
View File

@ -63,7 +63,7 @@
Summary: An open source implementation of SSH protocol versions 1 and 2 Summary: An open source implementation of SSH protocol versions 1 and 2
Name: openssh Name: openssh
Version: 5.2p1 Version: 5.2p1
Release: 10%{?dist}%{?rescue_rel} Release: 11%{?dist}%{?rescue_rel}
URL: http://www.openssh.com/portable.html URL: http://www.openssh.com/portable.html
#Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
#Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
@ -99,6 +99,7 @@ Patch62: openssh-5.1p1-scp-manpage.patch
Patch65: openssh-5.2p1-fips.patch Patch65: openssh-5.2p1-fips.patch
Patch66: openssh-5.2p1-homechroot.patch Patch66: openssh-5.2p1-homechroot.patch
Patch67: openssh-5.2p1-xmodifiers.patch Patch67: openssh-5.2p1-xmodifiers.patch
Patch68: openssh-5.2p1-pathmax.patch
License: BSD License: BSD
Group: Applications/Internet Group: Applications/Internet
@ -232,6 +233,7 @@ an X11 passphrase dialog for OpenSSH.
%patch65 -p1 -b .fips %patch65 -p1 -b .fips
%patch66 -p1 -b .homechroot %patch66 -p1 -b .homechroot
%patch67 -p1 -b .xmodifiers %patch67 -p1 -b .xmodifiers
%patch68 -p1 -b .pathmax
autoreconf autoreconf
@ -466,6 +468,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Jun 29 2009 Jan F. Chadima <jchadima@redhat.com> - 5.2p1-11
- length of home path in ssh now limited by PATH_MAX
* Sat Jun 27 2009 Jan F. Chadima <jchadima@redhat.com> - 5.2p1-10 * Sat Jun 27 2009 Jan F. Chadima <jchadima@redhat.com> - 5.2p1-10
- final version chroot %%h (sftp only) - final version chroot %%h (sftp only)