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

Diff for /src/usr.bin/ssh/auth.c between version 1.11 and 1.11.2.2

version 1.11, 2000/10/11 20:27:23 version 1.11.2.2, 2001/02/19 17:18:37
Line 1 
Line 1 
 /*  /*
  * 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".  
  *  
  *  
  * Copyright (c) 2000 Markus Friedl. All rights reserved.   * Copyright (c) 2000 Markus Friedl. All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 36 
Line 26 
 RCSID("$OpenBSD$");  RCSID("$OpenBSD$");
   
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "rsa.h"  
 #include "ssh.h"  
 #include "pty.h"  
 #include "packet.h"  
 #include "buffer.h"  
 #include "mpaux.h"  
 #include "servconf.h"  
 #include "compat.h"  
 #include "channels.h"  
 #include "match.h"  #include "match.h"
   #include "groupaccess.h"
 #include "bufaux.h"  #include "log.h"
 #include "ssh2.h"  #include "servconf.h"
 #include "auth.h"  #include "auth.h"
 #include "session.h"  #include "auth-options.h"
   #include "canohost.h"
   
 /* import */  /* import */
 extern ServerOptions options;  extern ServerOptions options;
   
 /*  /*
  * Check if the user is allowed to log in via ssh. If user is listed in   * Check if the user is allowed to log in via ssh. If user is listed
  * DenyUsers or user's primary group is listed in DenyGroups, false will   * in DenyUsers or one of user's groups is listed in DenyGroups, false
  * be returned. If AllowUsers isn't empty and user isn't listed there, or   * will be returned. If AllowUsers isn't empty and user isn't listed
  * if AllowGroups isn't empty and user isn't listed there, false will be   * there, or if AllowGroups isn't empty and one of user's groups isn't
  * returned.   * listed there, false will be returned.
  * If the user's shell is not executable, false will be returned.   * If the user's shell is not executable, false will be returned.
  * Otherwise true is returned.   * Otherwise true is returned.
  */   */
Line 68 
Line 50 
 allowed_user(struct passwd * pw)  allowed_user(struct passwd * pw)
 {  {
         struct stat st;          struct stat st;
         struct group *grp;  
         char *shell;          char *shell;
         int i;          int i;
   
         /* Shouldn't be called if pw is NULL, but better safe than sorry... */          /* Shouldn't be called if pw is NULL, but better safe than sorry... */
         if (!pw)          if (!pw || !pw->pw_name)
                 return 0;                  return 0;
   
         /*          /*
Line 90 
Line 71 
   
         /* Return false if user is listed in DenyUsers */          /* Return false if user is listed in DenyUsers */
         if (options.num_deny_users > 0) {          if (options.num_deny_users > 0) {
                 if (!pw->pw_name)  
                         return 0;  
                 for (i = 0; i < options.num_deny_users; i++)                  for (i = 0; i < options.num_deny_users; i++)
                         if (match_pattern(pw->pw_name, options.deny_users[i]))                          if (match_pattern(pw->pw_name, options.deny_users[i]))
                                 return 0;                                  return 0;
         }          }
         /* Return false if AllowUsers isn't empty and user isn't listed there */          /* Return false if AllowUsers isn't empty and user isn't listed there */
         if (options.num_allow_users > 0) {          if (options.num_allow_users > 0) {
                 if (!pw->pw_name)  
                         return 0;  
                 for (i = 0; i < options.num_allow_users; i++)                  for (i = 0; i < options.num_allow_users; i++)
                         if (match_pattern(pw->pw_name, options.allow_users[i]))                          if (match_pattern(pw->pw_name, options.allow_users[i]))
                                 break;                                  break;
Line 107 
Line 84 
                 if (i >= options.num_allow_users)                  if (i >= options.num_allow_users)
                         return 0;                          return 0;
         }          }
         /* Get the primary group name if we need it. Return false if it fails */  
         if (options.num_deny_groups > 0 || options.num_allow_groups > 0) {          if (options.num_deny_groups > 0 || options.num_allow_groups > 0) {
                 grp = getgrgid(pw->pw_gid);                  /* Get the user's group access list (primary and supplementary) */
                 if (!grp)                  if (ga_init(pw->pw_name, pw->pw_gid) == 0)
                         return 0;                          return 0;
   
                 /* Return false if user's group is listed in DenyGroups */                  /* Return false if one of user's groups is listed in DenyGroups */
                 if (options.num_deny_groups > 0) {                  if (options.num_deny_groups > 0)
                         if (!grp->gr_name)                          if (ga_match(options.deny_groups,
                               options.num_deny_groups)) {
                                   ga_free();
                                 return 0;                                  return 0;
                         for (i = 0; i < options.num_deny_groups; i++)                          }
                                 if (match_pattern(grp->gr_name, options.deny_groups[i]))  
                                         return 0;  
                 }  
                 /*                  /*
                  * Return false if AllowGroups isn't empty and user's group                   * Return false if AllowGroups isn't empty and one of user's groups
                  * isn't listed there                   * isn't listed there
                  */                   */
                 if (options.num_allow_groups > 0) {                  if (options.num_allow_groups > 0)
                         if (!grp->gr_name)                          if (!ga_match(options.allow_groups,
                               options.num_allow_groups)) {
                                   ga_free();
                                 return 0;                                  return 0;
                         for (i = 0; i < options.num_allow_groups; i++)                          }
                                 if (match_pattern(grp->gr_name, options.allow_groups[i]))                  ga_free();
                                         break;  
                         /* i < options.num_allow_groups iff we break for  
                            loop */  
                         if (i >= options.num_allow_groups)  
                                 return 0;  
                 }  
         }          }
         /* We found no reason not to let this user try to log on... */          /* We found no reason not to let this user try to log on... */
         return 1;          return 1;
   }
   
   Authctxt *
   authctxt_new(void)
   {
           Authctxt *authctxt = xmalloc(sizeof(*authctxt));
           memset(authctxt, 0, sizeof(*authctxt));
           return authctxt;
   }
   
   struct passwd *
   pwcopy(struct passwd *pw)
   {
           struct passwd *copy = xmalloc(sizeof(*copy));
           memset(copy, 0, sizeof(*copy));
           copy->pw_name = xstrdup(pw->pw_name);
           copy->pw_passwd = xstrdup(pw->pw_passwd);
           copy->pw_uid = pw->pw_uid;
           copy->pw_gid = pw->pw_gid;
           copy->pw_class = xstrdup(pw->pw_class);
           copy->pw_dir = xstrdup(pw->pw_dir);
           copy->pw_shell = xstrdup(pw->pw_shell);
           return copy;
   }
   
   void
   auth_log(Authctxt *authctxt, int authenticated, char *method, char *info)
   {
           void (*authlog) (const char *fmt,...) = verbose;
           char *authmsg;
   
           /* Raise logging level */
           if (authenticated == 1 ||
               !authctxt->valid ||
               authctxt->failures >= AUTH_FAIL_LOG ||
               strcmp(method, "password") == 0)
                   authlog = log;
   
           if (authctxt->postponed)
                   authmsg = "Postponed";
           else
                   authmsg = authenticated ? "Accepted" : "Failed";
   
           authlog("%s %s for %s%.100s from %.200s port %d%s",
               authmsg,
               method,
               authctxt->valid ? "" : "illegal user ",
               authctxt->valid && authctxt->pw->pw_uid == 0 ? "ROOT" : authctxt->user,
               get_remote_ipaddr(),
               get_remote_port(),
               info);
   }
   
   /*
    * Check whether root logins are disallowed.
    */
   int
   auth_root_allowed(char *method)
   {
           switch (options.permit_root_login) {
           case PERMIT_YES:
                   return 1;
                   break;
           case PERMIT_NO_PASSWD:
                   if (strcmp(method, "password") != 0)
                           return 1;
                   break;
           case PERMIT_FORCED_ONLY:
                   if (forced_command) {
                           log("Root login accepted for forced command.");
                           return 1;
                   }
                   break;
           }
           log("ROOT LOGIN REFUSED FROM %.200s", get_remote_ipaddr());
           return 0;
 }  }
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.11.2.2