[BACK]Return to session.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/session.c between version 1.154.2.1 and 1.154.2.2

version 1.154.2.1, 2003/09/16 20:50:43 version 1.154.2.2, 2004/03/04 18:18:16
Line 58 
Line 58 
 #include "session.h"  #include "session.h"
 #include "monitor_wrap.h"  #include "monitor_wrap.h"
   
   #ifdef KRB5
   #include <kafs.h>
   #endif
   
 #ifdef GSSAPI  #ifdef GSSAPI
 #include "ssh-gss.h"  #include "ssh-gss.h"
 #endif  #endif
Line 66 
Line 70 
   
 Session *session_new(void);  Session *session_new(void);
 void    session_set_fds(Session *, int, int, int);  void    session_set_fds(Session *, int, int, int);
 void    session_pty_cleanup(void *);  void    session_pty_cleanup(Session *);
 void    session_proctitle(Session *);  void    session_proctitle(Session *);
 int     session_setup_x11fwd(Session *);  int     session_setup_x11fwd(Session *);
 void    do_exec_pty(Session *, const char *);  void    do_exec_pty(Session *, const char *);
Line 102 
Line 106 
 login_cap_t *lc;  login_cap_t *lc;
 #endif  #endif
   
   static int is_child = 0;
   
 /* Name and directory of socket for authentication agent forwarding. */  /* Name and directory of socket for authentication agent forwarding. */
 static char *auth_sock_name = NULL;  static char *auth_sock_name = NULL;
 static char *auth_sock_dir = NULL;  static char *auth_sock_dir = NULL;
Line 109 
Line 115 
 /* removes the agent forwarding socket */  /* removes the agent forwarding socket */
   
 static void  static void
 auth_sock_cleanup_proc(void *_pw)  auth_sock_cleanup_proc(struct passwd *pw)
 {  {
         struct passwd *pw = _pw;  
   
         if (auth_sock_name != NULL) {          if (auth_sock_name != NULL) {
                 temporarily_use_uid(pw);                  temporarily_use_uid(pw);
                 unlink(auth_sock_name);                  unlink(auth_sock_name);
Line 140 
Line 144 
         /* Allocate a buffer for the socket name, and format the name. */          /* Allocate a buffer for the socket name, and format the name. */
         auth_sock_name = xmalloc(MAXPATHLEN);          auth_sock_name = xmalloc(MAXPATHLEN);
         auth_sock_dir = xmalloc(MAXPATHLEN);          auth_sock_dir = xmalloc(MAXPATHLEN);
         strlcpy(auth_sock_dir, "/tmp/ssh-XXXXXXXX", MAXPATHLEN);          strlcpy(auth_sock_dir, "/tmp/ssh-XXXXXXXXXX", MAXPATHLEN);
   
         /* Create private directory for socket */          /* Create private directory for socket */
         if (mkdtemp(auth_sock_dir) == NULL) {          if (mkdtemp(auth_sock_dir) == NULL) {
Line 156 
Line 160 
         snprintf(auth_sock_name, MAXPATHLEN, "%s/agent.%ld",          snprintf(auth_sock_name, MAXPATHLEN, "%s/agent.%ld",
                  auth_sock_dir, (long) getpid());                   auth_sock_dir, (long) getpid());
   
         /* delete agent socket on fatal() */  
         fatal_add_cleanup(auth_sock_cleanup_proc, pw);  
   
         /* Create the socket. */          /* Create the socket. */
         sock = socket(AF_UNIX, SOCK_STREAM, 0);          sock = socket(AF_UNIX, SOCK_STREAM, 0);
         if (sock < 0)          if (sock < 0)
Line 176 
Line 177 
         restore_uid();          restore_uid();
   
         /* Start listening on the socket. */          /* Start listening on the socket. */
         if (listen(sock, 5) < 0)          if (listen(sock, SSH_LISTEN_BACKLOG) < 0)
                 packet_disconnect("listen: %.100s", strerror(errno));                  packet_disconnect("listen: %.100s", strerror(errno));
   
         /* Allocate a channel for the authentication agent socket. */          /* Allocate a channel for the authentication agent socket. */
Line 212 
Line 213 
         else          else
                 do_authenticated1(authctxt);                  do_authenticated1(authctxt);
   
         /* remove agent socket */          do_cleanup(authctxt);
         if (auth_sock_name != NULL)  
                 auth_sock_cleanup_proc(authctxt->pw);  
 #ifdef KRB5  
         if (options.kerberos_ticket_cleanup)  
                 krb5_cleanup_proc(authctxt);  
 #endif  
 }  }
   
 /*  /*
Line 391 
Line 386 
   
         /* Fork the child. */          /* Fork the child. */
         if ((pid = fork()) == 0) {          if ((pid = fork()) == 0) {
                 fatal_remove_all_cleanups();                  is_child = 1;
   
                 /* Child.  Reinitialize the log since the pid has changed. */                  /* Child.  Reinitialize the log since the pid has changed. */
                 log_init(__progname, options.log_level, options.log_facility, log_stderr);                  log_init(__progname, options.log_level, options.log_facility, log_stderr);
Line 499 
Line 494 
   
         /* Fork the child. */          /* Fork the child. */
         if ((pid = fork()) == 0) {          if ((pid = fork()) == 0) {
                 fatal_remove_all_cleanups();                  is_child = 1;
   
                 /* Child.  Reinitialize the log because the pid has changed. */                  /* Child.  Reinitialize the log because the pid has changed. */
                 log_init(__progname, options.log_level, options.log_facility, log_stderr);                  log_init(__progname, options.log_level, options.log_facility, log_stderr);
Line 610 
Line 605 
                 if (getpeername(packet_get_connection_in(),                  if (getpeername(packet_get_connection_in(),
                     (struct sockaddr *) & from, &fromlen) < 0) {                      (struct sockaddr *) & from, &fromlen) < 0) {
                         debug("getpeername: %.100s", strerror(errno));                          debug("getpeername: %.100s", strerror(errno));
                         fatal_cleanup();                          cleanup_exit(255);
                 }                  }
         }          }
   
Line 695 
Line 690 
 child_set_env(char ***envp, u_int *envsizep, const char *name,  child_set_env(char ***envp, u_int *envsizep, const char *name,
         const char *value)          const char *value)
 {  {
         u_int i, namelen;  
         char **env;          char **env;
           u_int envsize;
           u_int i, namelen;
   
         /*          /*
          * Find the slot where the value should be stored.  If the variable           * Find the slot where the value should be stored.  If the variable
Line 713 
Line 709 
                 xfree(env[i]);                  xfree(env[i]);
         } else {          } else {
                 /* New variable.  Expand if necessary. */                  /* New variable.  Expand if necessary. */
                 if (i >= (*envsizep) - 1) {                  envsize = *envsizep;
                         if (*envsizep >= 1000)                  if (i >= envsize - 1) {
                                 fatal("child_set_env: too many env vars,"                          if (envsize >= 1000)
                                     " skipping: %.100s", name);                                  fatal("child_set_env: too many env vars");
                         (*envsizep) += 50;                          envsize += 50;
                         env = (*envp) = xrealloc(env, (*envsizep) * sizeof(char *));                          env = (*envp) = xrealloc(env, envsize * sizeof(char *));
                           *envsizep = envsize;
                 }                  }
                 /* Need to set the NULL pointer at end of array beyond the new slot. */                  /* Need to set the NULL pointer at end of array beyond the new slot. */
                 env[i + 1] = NULL;                  env[i + 1] = NULL;
Line 788 
Line 785 
         env[0] = NULL;          env[0] = NULL;
   
 #ifdef GSSAPI  #ifdef GSSAPI
         /* Allow any GSSAPI methods that we've used to alter          /* Allow any GSSAPI methods that we've used to alter
          * the childs environment as they see fit           * the childs environment as they see fit
          */           */
         ssh_gssapi_do_child(&env, &envsize);          ssh_gssapi_do_child(&env, &envsize);
Line 928 
Line 925 
                 if (debug_flag) {                  if (debug_flag) {
                         fprintf(stderr,                          fprintf(stderr,
                             "Running %.500s remove %.100s\n",                              "Running %.500s remove %.100s\n",
                             options.xauth_location, s->auth_display);                              options.xauth_location, s->auth_display);
                         fprintf(stderr,                          fprintf(stderr,
                             "%.500s add %.100s %.100s %.100s\n",                              "%.500s add %.100s %.100s %.100s\n",
                             options.xauth_location, s->auth_display,                              options.xauth_location, s->auth_display,
Line 1010 
Line 1007 
 }  }
   
 static void  static void
   do_pwchange(Session *s)
   {
           fprintf(stderr, "WARNING: Your password has expired.\n");
           if (s->ttyfd != -1) {
                   fprintf(stderr,
                       "You must change your password now and login again!\n");
                   execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL);
                   perror("passwd");
           } else {
                   fprintf(stderr,
                       "Password change required but no TTY available.\n");
           }
           exit(1);
   }
   
   static void
 launch_login(struct passwd *pw, const char *hostname)  launch_login(struct passwd *pw, const char *hostname)
 {  {
         /* Launch login(1). */          /* Launch login(1). */
Line 1023 
Line 1036 
         exit(1);          exit(1);
 }  }
   
   static void
   child_close_fds(void)
   {
           int i;
   
           if (packet_get_connection_in() == packet_get_connection_out())
                   close(packet_get_connection_in());
           else {
                   close(packet_get_connection_in());
                   close(packet_get_connection_out());
           }
           /*
            * Close all descriptors related to channels.  They will still remain
            * open in the parent.
            */
           /* XXX better use close-on-exec? -markus */
           channel_close_all();
   
           /*
            * Close any extra file descriptors.  Note that there may still be
            * descriptors left by system functions.  They will be closed later.
            */
           endpwent();
   
           /*
            * Close any extra open file descriptors so that we don\'t have them
            * hanging around in clients.  Note that we want to do this after
            * initgroups, because at least on Solaris 2.3 it leaves file
            * descriptors open.
            */
           for (i = 3; i < 64; i++)
                   close(i);
   }
   
 /*  /*
  * Performs common processing for the child, such as setting up the   * Performs common processing for the child, such as setting up the
  * environment, closing extra file descriptors, setting the user and group   * environment, closing extra file descriptors, setting the user and group
Line 1036 
Line 1083 
         char *argv[10];          char *argv[10];
         const char *shell, *shell0, *hostname = NULL;          const char *shell, *shell0, *hostname = NULL;
         struct passwd *pw = s->pw;          struct passwd *pw = s->pw;
         u_int i;  
   
         /* remove hostkey from the child's memory */          /* remove hostkey from the child's memory */
         destroy_sensitive_data();          destroy_sensitive_data();
   
           /* Force a password change */
           if (s->authctxt->force_pwchange) {
                   do_setusercontext(pw);
                   child_close_fds();
                   do_pwchange(s);
                   exit(1);
           }
   
         /* login(1) is only called if we execute the login shell */          /* login(1) is only called if we execute the login shell */
         if (options.use_login && command != NULL)          if (options.use_login && command != NULL)
                 options.use_login = 0;                  options.use_login = 0;
Line 1081 
Line 1135 
          * closed before building the environment, as we call           * closed before building the environment, as we call
          * get_remote_ipaddr there.           * get_remote_ipaddr there.
          */           */
         if (packet_get_connection_in() == packet_get_connection_out())          child_close_fds();
                 close(packet_get_connection_in());  
         else {  
                 close(packet_get_connection_in());  
                 close(packet_get_connection_out());  
         }  
         /*  
          * Close all descriptors related to channels.  They will still remain  
          * open in the parent.  
          */  
         /* XXX better use close-on-exec? -markus */  
         channel_close_all();  
   
         /*          /*
          * Close any extra file descriptors.  Note that there may still be           * Must take new environment into use so that .ssh/rc,
          * descriptors left by system functions.  They will be closed later.           * /etc/ssh/sshrc and xauth are run in the proper environment.
          */           */
         endpwent();          environ = env;
   
   #ifdef KRB5
         /*          /*
          * Close any extra open file descriptors so that we don\'t have them           * At this point, we check to see if AFS is active and if we have
          * hanging around in clients.  Note that we want to do this after           * a valid Kerberos 5 TGT. If so, it seems like a good idea to see
          * initgroups, because at least on Solaris 2.3 it leaves file           * if we can (and need to) extend the ticket into an AFS token. If
          * descriptors open.           * we don't do this, we run into potential problems if the user's
            * home directory is in AFS and it's not world-readable.
          */           */
         for (i = 3; i < 64; i++)  
                 close(i);  
   
         /*          if (options.kerberos_get_afs_token && k_hasafs() &&
          * Must take new environment into use so that .ssh/rc,               (s->authctxt->krb5_ctx != NULL)) {
          * /etc/ssh/sshrc and xauth are run in the proper environment.                  char cell[64];
          */  
         environ = env;  
   
                   debug("Getting AFS token");
   
                   k_setpag();
   
                   if (k_afs_cell_of_file(pw->pw_dir, cell, sizeof(cell)) == 0)
                           krb5_afslog(s->authctxt->krb5_ctx,
                               s->authctxt->krb5_fwd_ccache, cell, NULL);
   
                   krb5_afslog_home(s->authctxt->krb5_ctx,
                       s->authctxt->krb5_fwd_ccache, NULL, NULL, pw->pw_dir);
           }
   #endif
   
         /* Change current directory to the user\'s home directory. */          /* Change current directory to the user\'s home directory. */
         if (chdir(pw->pw_dir) < 0) {          if (chdir(pw->pw_dir) < 0) {
                 fprintf(stderr, "Could not chdir to home directory %s: %s\n",                  fprintf(stderr, "Could not chdir to home directory %s: %s\n",
Line 1236 
Line 1290 
         }          }
         s->authctxt = authctxt;          s->authctxt = authctxt;
         s->pw = authctxt->pw;          s->pw = authctxt->pw;
         if (s->pw == NULL)          if (s->pw == NULL || !authctxt->valid)
                 fatal("no user for session %d", s->self);                  fatal("no user for session %d", s->self);
         debug("session_open: session %d: link with channel %d", s->self, chanid);          debug("session_open: session %d: link with channel %d", s->self, chanid);
         s->chanid = chanid;          s->chanid = chanid;
Line 1358 
Line 1412 
                 n_bytes = packet_remaining();                  n_bytes = packet_remaining();
         tty_parse_modes(s->ttyfd, &n_bytes);          tty_parse_modes(s->ttyfd, &n_bytes);
   
         /*  
          * Add a cleanup function to clear the utmp entry and record logout  
          * time in case we call fatal() (e.g., the connection gets closed).  
          */  
         fatal_add_cleanup(session_pty_cleanup, (void *)s);  
         if (!use_privsep)          if (!use_privsep)
                 pty_setowner(s->pw, s->tty);                  pty_setowner(s->pw, s->tty);
   
Line 1544 
Line 1593 
  * (e.g., due to a dropped connection).   * (e.g., due to a dropped connection).
  */   */
 void  void
 session_pty_cleanup2(void *session)  session_pty_cleanup2(Session *s)
 {  {
         Session *s = session;  
   
         if (s == NULL) {          if (s == NULL) {
                 error("session_pty_cleanup: no session");                  error("session_pty_cleanup: no session");
                 return;                  return;
Line 1578 
Line 1625 
 }  }
   
 void  void
 session_pty_cleanup(void *session)  session_pty_cleanup(Session *s)
 {  {
         PRIVSEP(session_pty_cleanup2(session));          PRIVSEP(session_pty_cleanup2(s));
 }  }
   
 static char *  static char *
Line 1649 
Line 1696 
 session_close(Session *s)  session_close(Session *s)
 {  {
         debug("session_close: session %d pid %ld", s->self, (long)s->pid);          debug("session_close: session %d pid %ld", s->self, (long)s->pid);
         if (s->ttyfd != -1) {          if (s->ttyfd != -1)
                 fatal_remove_cleanup(session_pty_cleanup, (void *)s);  
                 session_pty_cleanup(s);                  session_pty_cleanup(s);
         }  
         if (s->term)          if (s->term)
                 xfree(s->term);                  xfree(s->term);
         if (s->display)          if (s->display)
Line 1701 
Line 1746 
                  * delay detach of session, but release pty, since                   * delay detach of session, but release pty, since
                  * the fd's to the child are already closed                   * the fd's to the child are already closed
                  */                   */
                 if (s->ttyfd != -1) {                  if (s->ttyfd != -1)
                         fatal_remove_cleanup(session_pty_cleanup, (void *)s);  
                         session_pty_cleanup(s);                          session_pty_cleanup(s);
                 }  
                 return;                  return;
         }          }
         /* detach by removing callback */          /* detach by removing callback */
Line 1821 
Line 1864 
 do_authenticated2(Authctxt *authctxt)  do_authenticated2(Authctxt *authctxt)
 {  {
         server_loop2(authctxt);          server_loop2(authctxt);
 #if defined(GSSAPI)  }
         if (options.gss_cleanup_creds)  
                 ssh_gssapi_cleanup_creds(NULL);  void
   do_cleanup(Authctxt *authctxt)
   {
           static int called = 0;
   
           debug("do_cleanup");
   
           /* no cleanup if we're in the child for login shell */
           if (is_child)
                   return;
   
           /* avoid double cleanup */
           if (called)
                   return;
           called = 1;
   
           if (authctxt == NULL)
                   return;
   #ifdef KRB5
           if (options.kerberos_ticket_cleanup &&
               authctxt->krb5_ctx)
                   krb5_cleanup_proc(authctxt);
 #endif  #endif
   
   #ifdef GSSAPI
           if (compat20 && options.gss_cleanup_creds)
                   ssh_gssapi_cleanup_creds();
   #endif
   
           /* remove agent socket */
           auth_sock_cleanup_proc(authctxt->pw);
   
           /*
            * Cleanup ptys/utmp only if privsep is disabled,
            * or if running in monitor.
            */
           if (!use_privsep || mm_is_monitor())
                   session_destroy_all(session_pty_cleanup2);
 }  }
Legend:
Removed from v.1.154.2.1  
changed lines
  Added in v.1.154.2.2