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

Diff for /src/usr.bin/ssh/match.c between version 1.9.2.6 and 1.10

version 1.9.2.6, 2002/03/08 17:04:42 version 1.10, 2000/12/19 23:17:57
Line 10 
Line 10 
  * incompatible with the protocol description in the RFC file, it must be   * incompatible with the protocol description in the RFC file, it must be
  * called by a name other than "ssh" or "Secure Shell".   * called by a name other than "ssh" or "Secure Shell".
  */   */
 /*  
  * 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"  #include "includes.h"
 RCSID("$OpenBSD$");  RCSID("$OpenBSD$");
   
 #include "match.h"  #include "ssh.h"
 #include "xmalloc.h"  
   
 /*  /*
  * Returns true if the given string matches the pattern (which may contain ?   * Returns true if the given string matches the pattern (which may contain ?
Line 104 
Line 80 
 }  }
   
 /*  /*
  * Tries to match the string against the   * Tries to match the host name (which must be in all lowercase) against the
  * comma-separated sequence of subpatterns (each possibly preceded by ! to   * comma-separated sequence of subpatterns (each possibly preceded by ! to
  * indicate negation).  Returns -1 if negation matches, 1 if there is   * indicate negation).  Returns -1 if negation matches, 1 if there is
  * a positive match, 0 if there is no match at all.   * a positive match, 0 if there is no match at all.
  */   */
   
 int  int
 match_pattern_list(const char *string, const char *pattern, u_int len,  match_hostname(const char *host, const char *pattern, u_int len)
     int dolower)  
 {  {
         char sub[1024];          char sub[1024];
         int negated;          int negated;
Line 133 
Line 108 
                  * subpattern to lowercase.                   * subpattern to lowercase.
                  */                   */
                 for (subi = 0;                  for (subi = 0;
                     i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';                       i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
                     subi++, i++)                       subi++, i++)
                         sub[subi] = dolower && isupper(pattern[i]) ?                          sub[subi] = isupper(pattern[i]) ? tolower(pattern[i]) : pattern[i];
                             tolower(pattern[i]) : pattern[i];  
                 /* If subpattern too long, return failure (no match). */                  /* If subpattern too long, return failure (no match). */
                 if (subi >= sizeof(sub) - 1)                  if (subi >= sizeof(sub) - 1)
                         return 0;                          return 0;
Line 148 
Line 122 
                 /* Null-terminate the subpattern. */                  /* Null-terminate the subpattern. */
                 sub[subi] = '\0';                  sub[subi] = '\0';
   
                 /* Try to match the subpattern against the string. */                  /* Try to match the subpattern against the host name. */
                 if (match_pattern(string, sub)) {                  if (match_pattern(host, sub)) {
                         if (negated)                          if (negated)
                                 return -1;              /* Negative */                                  return -1;              /* Negative */
                         else                          else
Line 162 
Line 136 
          * match, we have already returned -1 and never get here.           * match, we have already returned -1 and never get here.
          */           */
         return got_positive;          return got_positive;
 }  
   
 /*  
  * Tries to match the host name (which must be in all lowercase) against the  
  * comma-separated sequence of subpatterns (each possibly preceded by ! to  
  * indicate negation).  Returns -1 if negation matches, 1 if there is  
  * a positive match, 0 if there is no match at all.  
  */  
 int  
 match_hostname(const char *host, const char *pattern, u_int len)  
 {  
         return match_pattern_list(host, pattern, len, 1);  
 }  
   
 /*  
  * returns 0 if we get a negative match for the hostname or the ip  
  * or if we get no match at all.  returns 1 otherwise.  
  */  
 int  
 match_host_and_ip(const char *host, const char *ipaddr,  
     const char *patterns)  
 {  
         int mhost, mip;  
   
         /* negative ipaddr match */  
         if ((mip = match_hostname(ipaddr, patterns, strlen(patterns))) == -1)  
                 return 0;  
         /* negative hostname match */  
         if ((mhost = match_hostname(host, patterns, strlen(patterns))) == -1)  
                 return 0;  
         /* no match at all */  
         if (mhost == 0 && mip == 0)  
                 return 0;  
         return 1;  
 }  
   
 /*  
  * match user, user@host_or_ip, user@host_or_ip_list against pattern  
  */  
 int  
 match_user(const char *user, const char *host, const char *ipaddr,  
     const char *pattern)  
 {  
         char *p, *pat;  
         int ret;  
   
         if ((p = strchr(pattern,'@')) == NULL)  
                 return match_pattern(user, pattern);  
   
         pat = xstrdup(pattern);  
         p = strchr(pat, '@');  
         *p++ = '\0';  
   
         if ((ret = match_pattern(user, pat)) == 1)  
                 ret = match_host_and_ip(host, ipaddr, p);  
         xfree(pat);  
   
         return ret;  
 }  
   
 /*  
  * Returns first item from client-list that is also supported by server-list,  
  * caller must xfree() returned string.  
  */  
 #define MAX_PROP        40  
 #define SEP     ","  
 char *  
 match_list(const char *client, const char *server, u_int *next)  
 {  
         char *sproposals[MAX_PROP];  
         char *c, *s, *p, *ret, *cp, *sp;  
         int i, j, nproposals;  
   
         c = cp = xstrdup(client);  
         s = sp = xstrdup(server);  
   
         for ((p = strsep(&sp, SEP)), i=0; p && *p != '\0';  
             (p = strsep(&sp, SEP)), i++) {  
                 if (i < MAX_PROP)  
                         sproposals[i] = p;  
                 else  
                         break;  
         }  
         nproposals = i;  
   
         for ((p = strsep(&cp, SEP)), i=0; p && *p != '\0';  
             (p = strsep(&cp, SEP)), i++) {  
                 for (j = 0; j < nproposals; j++) {  
                         if (strcmp(p, sproposals[j]) == 0) {  
                                 ret = xstrdup(p);  
                                 if (next != NULL)  
                                         *next = (cp == NULL) ?  
                                             strlen(c) : cp - c;  
                                 xfree(c);  
                                 xfree(s);  
                                 return ret;  
                         }  
                 }  
         }  
         if (next != NULL)  
                 *next = strlen(c);  
         xfree(c);  
         xfree(s);  
         return NULL;  
 }  }
Legend:
Removed from v.1.9.2.6  
changed lines
  Added in v.1.10