[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.6.2.5 and 1.7

version 1.6.2.5, 2001/03/21 18:52:34 version 1.7, 2000/05/17 21:37:24
Line 1 
Line 1 
 /*  /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *   *                    All rights reserved
  * Redistribution and use in source and binary forms, with or without   * Copyright (c) 2000 Markus Friedl. All rights reserved.
  * 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"  #include "includes.h"
 RCSID("$OpenBSD$");  RCSID("$OpenBSD$");
   
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "match.h"  #include "rsa.h"
 #include "groupaccess.h"  #include "ssh.h"
 #include "log.h"  #include "pty.h"
   #include "packet.h"
   #include "buffer.h"
   #include "cipher.h"
   #include "mpaux.h"
 #include "servconf.h"  #include "servconf.h"
   #include "compat.h"
   #include "channels.h"
   #include "match.h"
   
   #include "bufaux.h"
   #include "ssh2.h"
 #include "auth.h"  #include "auth.h"
 #include "auth-options.h"  #include "session.h"
 #include "canohost.h"  #include "dispatch.h"
   
   
 /* import */  /* import */
 extern ServerOptions options;  extern ServerOptions options;
   extern char *forced_command;
   
 /*  /*
  * Check if the user is allowed to log in via ssh. If user is listed   * Check if the user is allowed to log in via ssh. If user is listed in
  * in DenyUsers or one of user's groups is listed in DenyGroups, false   * DenyUsers or user's primary group is listed in DenyGroups, false will
  * will be returned. If AllowUsers isn't empty and user isn't listed   * be returned. If AllowUsers isn't empty and user isn't listed there, or
  * there, or if AllowGroups isn't empty and one of user's groups isn't   * if AllowGroups isn't empty and user isn't listed there, false will be
  * listed there, false will be returned.   * 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 50 
Line 44 
 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 || !pw->pw_name)          if (!pw)
                 return 0;                  return 0;
   
         /*          /*
Line 71 
Line 66 
   
         /* 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 84 
Line 83 
                 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) {
                 /* Get the user's group access list (primary and supplementary) */                  grp = getgrgid(pw->pw_gid);
                 if (ga_init(pw->pw_name, pw->pw_gid) == 0)                  if (!grp)
                         return 0;                          return 0;
   
                 /* Return false if one of user's groups is listed in DenyGroups */                  /* Return false if user's group is listed in DenyGroups */
                 if (options.num_deny_groups > 0)                  if (options.num_deny_groups > 0) {
                         if (ga_match(options.deny_groups,                          if (!grp->gr_name)
                             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 one of user's groups                   * Return false if AllowGroups isn't empty and user's group
                  * isn't listed there                   * isn't listed there
                  */                   */
                 if (options.num_allow_groups > 0)                  if (options.num_allow_groups > 0) {
                         if (!ga_match(options.allow_groups,                          if (!grp->gr_name)
                             options.num_allow_groups)) {  
                                 ga_free();  
                                 return 0;                                  return 0;
                         }                          for (i = 0; i < options.num_allow_groups; i++)
                 ga_free();                                  if (match_pattern(grp->gr_name, options.allow_groups[i]))
                                           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;  
 }  
   
 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.6.2.5  
changed lines
  Added in v.1.7