]> andersk Git - openssh.git/blobdiff - session.c
- (stevesk) OpenBSD CVS updates:
[openssh.git] / session.c
index a537efdd492f7d17e2f24d82037784565fc705b5..1e996f95a98da251b7f2a7b34c877e2fa865cf1f 100644 (file)
--- a/session.c
+++ b/session.c
@@ -1,21 +1,45 @@
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- */
-/*
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ *
  * SSH2 support by Markus Friedl.
  * Copyright (c) 2000 Markus Friedl. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.35 2000/09/04 19:07:21 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.44 2000/11/14 23:44:19 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
 #include "pty.h"
 #include "packet.h"
 #include "buffer.h"
-#include "cipher.h"
 #include "mpaux.h"
 #include "servconf.h"
 #include "uidswap.h"
@@ -31,6 +55,12 @@ RCSID("$OpenBSD: session.c,v 1.35 2000/09/04 19:07:21 markus Exp $");
 #ifdef WITH_IRIX_PROJECT
 #include <proj.h>
 #endif /* WITH_IRIX_PROJECT */
+#ifdef WITH_IRIX_JOBS
+#include <sys/resource.h>
+#endif 
+#ifdef WITH_IRIX_AUDIT
+#include <sat.h>
+#endif /* WITH_IRIX_AUDIT */
 
 #if defined(HAVE_USERSEC_H)
 #include <usersec.h>
@@ -95,7 +125,7 @@ void session_pty_cleanup(Session *s);
 void   session_proctitle(Session *s);
 void   do_exec_pty(Session *s, const char *command, struct passwd * pw);
 void   do_exec_no_pty(Session *s, const char *command, struct passwd * pw);
-void   do_login(Session *s);
+void   do_login(Session *s, const char *command);
 
 void
 do_child(const char *command, struct passwd * pw, const char *term,
@@ -104,12 +134,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
 
 /* import */
 extern ServerOptions options;
-#ifdef HAVE___PROGNAME
 extern char *__progname;
-#else /* HAVE___PROGNAME */
-static const char *__progname = "sshd";
-#endif /* HAVE___PROGNAME */
-
 extern int log_stderr;
 extern int debug_flag;
 extern unsigned int utmp_len;
@@ -125,6 +150,7 @@ char *original_command = NULL;
 /* data */
 #define MAX_SESSIONS 10
 Session        sessions[MAX_SESSIONS];
+
 #ifdef WITH_AIXAUTHENTICATE
 /* AIX's lastlogin message, set in auth1.c */
 char *aixloginmsg;
@@ -211,13 +237,13 @@ do_authenticated(struct passwd * pw)
         * by the client telling us, so we can equally well trust the client
         * not to request anything bogus.)
         */
-       if (!no_port_forwarding_flag)
+       if (!no_port_forwarding_flag && options.allow_tcp_forwarding)
                channel_permit_all_opens();
 
        s = session_new();
        s->pw = pw;
 
-#ifdef HAVE_LOGIN_CAP
+#if defined(HAVE_LOGIN_CAP) && defined(HAVE_PW_CLASS_IN_PASSWD)
        if ((lc = login_getclass(pw->pw_class)) == NULL) {
                error("unable to get login class");
                return;
@@ -363,6 +389,10 @@ do_authenticated(struct passwd * pw)
                                debug("Port forwarding not permitted for this authentication.");
                                break;
                        }
+                       if (!options.allow_tcp_forwarding) {
+                               debug("Port forwarding not permitted.");
+                               break;
+                       }
                        debug("Received TCP/IP port forwarding request.");
                        channel_input_port_forward_request(pw->pw_uid == 0, options.gateway_ports);
                        success = 1;
@@ -461,6 +491,8 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw)
                /* Child.  Reinitialize the log since the pid has changed. */
                log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
+               signal(SIGPIPE, SIG_DFL);
+
                /*
                 * Create a new session and process group since the 4.4BSD
                 * setlogin() affects the entire process group.
@@ -574,6 +606,8 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
                /* Child.  Reinitialize the log because the pid has changed. */
                log_init(__progname, options.log_level, options.log_facility, log_stderr);
 
+               signal(SIGPIPE, SIG_DFL);
+
                /* Close the master side of the pseudo tty. */
                close(ptyfd);
 
@@ -596,8 +630,8 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
                close(ttyfd);
 
                /* record login, etc. similar to login(1) */
-               if (command == NULL && !options.use_login)
-                       do_login(s);
+               if (!(options.use_login && command == NULL))
+                       do_login(s, command);
 
                /* Do common processing for the child, such as execing the command. */
                do_child(command, pw, s->term, s->display, s->auth_proto,
@@ -653,7 +687,7 @@ get_remote_name_or_ip(void)
 
 /* administrative, login(1)-like work */
 void
-do_login(Session *s)
+do_login(Session *s, const char *command)
 {
        FILE *f;
        char *time_string;
@@ -681,6 +715,7 @@ do_login(Session *s)
        }
 
        /* Get the time and hostname when the user last logged in. */
+       hostname[0] = '\0';
        last_login_time = get_last_login_time(pw->pw_uid, pw->pw_name,
            hostname, sizeof(hostname));
 
@@ -688,7 +723,20 @@ do_login(Session *s)
        record_login(pid, s->tty, pw->pw_name, pw->pw_uid,
            get_remote_name_or_ip(), (struct sockaddr *)&from);
 
-       /* Done if .hushlogin exists. */
+#ifdef USE_PAM
+       /*
+        * If password change is needed, do it now.
+        * This needs to occur before the ~/.hushlogin check.
+        */
+       if (pam_password_change_required()) {
+               print_pam_messages();
+               do_pam_chauthtok();
+       }
+#endif
+
+       /* Done if .hushlogin exists or a command given. */
+       if (command != NULL)
+               return;
        snprintf(buf, sizeof(buf), "%.200s/.hushlogin", pw->pw_dir);
 #ifdef HAVE_LOGIN_CAP
        if (login_getcapbool(lc, "hushlogin", 0) || stat(buf, &st) >= 0)
@@ -698,7 +746,8 @@ do_login(Session *s)
                return;
 
 #ifdef USE_PAM
-       print_pam_messages();
+       if (!pam_password_change_required())
+               print_pam_messages();
 #endif /* USE_PAM */
 #ifdef WITH_AIXAUTHENTICATE
        if (aixloginmsg && *aixloginmsg)
@@ -709,10 +758,10 @@ do_login(Session *s)
                time_string = ctime(&last_login_time);
                if (strchr(time_string, '\n'))
                        *strchr(time_string, '\n') = 0;
-               if (strcmp(buf, "") == 0)
+               if (strcmp(hostname, "") == 0)
                        printf("Last login: %s\r\n", time_string);
                else
-                       printf("Last login: %s from %s\r\n", time_string, buf);
+                       printf("Last login: %s from %s\r\n", time_string, hostname);
        }
        if (options.print_motd) {
 #ifdef HAVE_LOGIN_CAP
@@ -833,7 +882,7 @@ void do_pam_environment(char ***env, int *envsize)
                        strncpy(var_name, pam_env[i], equals - pam_env[i]);
                        strcpy(var_val, equals + 1);
 
-                       debug("PAM environment: %s=%s", var_name, var_val);
+                       debug3("PAM environment: %s=%s", var_name, var_val);
 
                        child_set_env(env, envsize, var_name, var_val);
                }
@@ -841,6 +890,32 @@ void do_pam_environment(char ***env, int *envsize)
 }
 #endif /* USE_PAM */
 
+
+#ifdef HAVE_CYGWIN
+void copy_environment(char ***env, int *envsize)
+{
+       char *equals, var_name[512], var_val[512];
+       int i;
+
+       for(i = 0; environ[i] != NULL; i++) {
+               if ((equals = strstr(environ[i], "=")) == NULL)
+                       continue;
+                       
+               if (strlen(environ[i]) < (sizeof(var_name) - 1)) {
+                       memset(var_name, '\0', sizeof(var_name));
+                       memset(var_val, '\0', sizeof(var_val));
+
+                       strncpy(var_name, environ[i], equals - environ[i]);
+                       strcpy(var_val, equals + 1);
+
+                       debug3("Copy environment: %s=%s", var_name, var_val);
+
+                       child_set_env(env, envsize, var_name, var_val);
+               }
+       }
+}
+#endif
+
 #if defined(HAVE_GETUSERATTR)
 /*
  * AIX-specific login initialisation
@@ -942,6 +1017,14 @@ do_child(const char *command, struct passwd * pw, const char *term,
 #ifdef WITH_IRIX_PROJECT
        prid_t projid;
 #endif /* WITH_IRIX_PROJECT */
+#ifdef WITH_IRIX_JOBS
+       jid_t jid = 0;
+#else
+#ifdef WITH_IRIX_ARRAY
+       int jid = 0;
+#endif /* WITH_IRIX_ARRAY */
+#endif /* WITH_IRIX_JOBS */
+
 
        /* login(1) is only called if we execute the login shell */
        if (options.use_login && command != NULL)
@@ -1014,11 +1097,20 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                exit(1);
                        }
                        endgrent();
+#  ifdef WITH_IRIX_JOBS
+                       jid = jlimit_startjob(pw->pw_name, pw->pw_uid, "interactive");
+                       if (jid == -1) {
+                               fatal("Failed to create job container: %.100s",
+                                     strerror(errno));
+                        }
+#  endif /* WITH_IRIX_JOBS */
 #  ifdef WITH_IRIX_ARRAY
                        /* initialize array session */
-                       if (newarraysess() != 0)
-                               fatal("Failed to set up new array session: %.100s",
-                                     strerror(errno));
+                       if (jid == 0) {
+                               if (newarraysess() != 0)
+                                       fatal("Failed to set up new array session: %.100s",
+                                             strerror(errno));
+                       }
 #  endif /* WITH_IRIX_ARRAY */
 #  ifdef WITH_IRIX_PROJECT
                        /* initialize irix project info */
@@ -1030,6 +1122,14 @@ do_child(const char *command, struct passwd * pw, const char *term,
                          fatal("Failed to initialize project %d for %s: %.100s",
                                (int)projid, pw->pw_name, strerror(errno));
 #  endif /* WITH_IRIX_PROJECT */
+#ifdef WITH_IRIX_AUDIT
+                       if (sysconf(_SC_AUDIT)) {
+                               debug("Setting sat id to %d", (int) pw->pw_uid);
+                               if (satsetid(pw->pw_uid))
+                                       debug("error setting satid: %.100s", strerror(errno));
+                       }
+#endif /* WITH_IRIX_AUDIT */
+
                        /* Permanently switch to the desired uid. */
                        permanently_set_uid(pw->pw_uid);
 # endif /* HAVE_LOGIN_CAP */
@@ -1073,15 +1173,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
         * The Windows environment contains some setting which are
         * important for a running system. They must not be dropped.
         */
-       {
-               char **ep;
-               for (ep = environ; *ep; ++ep) {
-                       char *esp = strchr(*ep, '=');
-                       *esp = '\0';
-                       child_set_env(&env, &envsize, *ep, esp + 1);
-                       *esp = '=';
-               }
-       }
+       copy_environment(&env, &envsize);
 #endif
 
        if (!options.use_login) {
@@ -1092,8 +1184,8 @@ do_child(const char *command, struct passwd * pw, const char *term,
 #ifdef HAVE_LOGIN_CAP
                (void) setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH);
                child_set_env(&env, &envsize, "PATH", getenv("PATH"));
-#else
-#ifndef HAVE_CYGWIN
+#else /* HAVE_LOGIN_CAP */
+# ifndef HAVE_CYGWIN
                /*
                 * There's no standard path on Windows. The path contains
                 * important components pointing to the system directories,
@@ -1101,8 +1193,8 @@ do_child(const char *command, struct passwd * pw, const char *term,
                 * remains intact here.
                 */
                child_set_env(&env, &envsize, "PATH", _PATH_STDPATH);
-#endif
-#endif
+# endif /* HAVE_CYGWIN */
+#endif /* HAVE_LOGIN_CAP */
 
                snprintf(buf, sizeof buf, "%.200s/%.50s",
                         _PATH_MAILDIR, pw->pw_name);
@@ -1144,15 +1236,11 @@ do_child(const char *command, struct passwd * pw, const char *term,
                    original_command);
 
 #ifdef _AIX
-       {
-           char *authstate,*krb5cc;
-
-          if ((authstate = getenv("AUTHSTATE")) != NULL)
-                child_set_env(&env,&envsize,"AUTHSTATE",authstate);
-
-          if ((krb5cc = getenv("KRB5CCNAME")) != NULL)
-                child_set_env(&env,&envsize,"KRB5CCNAME",krb5cc);
-       }
+       if ((cp = getenv("AUTHSTATE")) != NULL)
+               child_set_env(&env, &envsize, "AUTHSTATE", cp);
+       if ((cp = getenv("KRB5CCNAME")) != NULL)
+               child_set_env(&env, &envsize, "KRB5CCNAME", cp);
+       read_environment_file(&env, &envsize, "/etc/environment");
 #endif
 
 #ifdef KRB4
@@ -1169,8 +1257,6 @@ do_child(const char *command, struct passwd * pw, const char *term,
        do_pam_environment(&env, &envsize);
 #endif /* USE_PAM */
 
-       read_environment_file(&env,&envsize,"/etc/environment");
-
        if (xauthfile)
                child_set_env(&env, &envsize, "XAUTHORITY", xauthfile);
        if (auth_get_socket_name() != NULL)
@@ -1279,7 +1365,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                            "Running %.100s add %.100s %.100s %.100s\n",
                                            options.xauth_location, display,
                                            auth_proto, auth_data);
-#ifndef HAVE_CYGWIN
+#ifndef HAVE_CYGWIN /* Unix sockets are not supported */
                                        if (screen != NULL)
                                                fprintf(stderr,
                                                    "Adding %.*s/unix%s %s %s\n",
@@ -1293,7 +1379,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
                                if (f) {
                                        fprintf(f, "add %s %s %s\n", display,
                                            auth_proto, auth_data);
-#ifndef HAVE_CYGWIN
+#ifndef HAVE_CYGWIN /* Unix sockets are not supported */
                                        if (screen != NULL) 
                                                fprintf(f, "add %.*s/unix%s %s %s\n",
                                                    (int)(screen-display), display,
@@ -1656,6 +1742,23 @@ session_exec_req(Session *s)
        return 1;
 }
 
+int
+session_auth_agent_req(Session *s)
+{
+       static int called = 0;
+       packet_done();
+       if (no_agent_forwarding_flag) {
+               debug("session_auth_agent_req: no_agent_forwarding_flag");
+               return 0;
+       }
+       if (called) {
+               return 0;
+       } else {
+               called = 1;
+               return auth_input_request_forwarding(s->pw);
+       }
+}
+
 void
 session_input_channel_req(int id, void *arg)
 {
@@ -1692,6 +1795,8 @@ session_input_channel_req(int id, void *arg)
                        success =  session_pty_req(s);
                } else if (strcmp(rtype, "x11-req") == 0) {
                        success = session_x11_req(s);
+               } else if (strcmp(rtype, "auth-agent-req@openssh.com") == 0) {
+                       success = session_auth_agent_req(s);
                } else if (strcmp(rtype, "subsystem") == 0) {
                        success = session_subsystem_req(s);
                }
@@ -1722,7 +1827,8 @@ session_set_fds(Session *s, int fdin, int fdout, int fderr)
                fatal("no channel for session %d", s->self);
        channel_set_fds(s->chanid,
            fdout, fdin, fderr,
-           fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ);
+           fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
+           1);
 }
 
 void
@@ -1910,7 +2016,7 @@ do_authenticated2(void)
                close(startup_pipe);
                startup_pipe = -1;
        }
-#ifdef HAVE_LOGIN_CAP
+#if defined(HAVE_LOGIN_CAP) && defined(HAVE_PW_CLASS_IN_PASSWD)
        pw = auth_get_user();
        if ((lc = login_getclass(pw->pw_class)) == NULL) {
                error("unable to get login class");
This page took 0.050602 seconds and 4 git commands to generate.