mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-14 14:14:36 +00:00
226cfa0378
Linux and works. So that is at least a good sign. =) 20010122 - (bal) OpenBSD Resync - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus [servconf.c ssh.h sshd.c] only auth-chall.c needs #ifdef SKEY - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c packet.c pathname.h readconf.c scp.c servconf.c serverloop.c session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h ssh1.h sshconnect1.c sshd.c ttymodes.c] move ssh1 definitions to ssh1.h, pathnames to pathnames.h - markus@cvs.openbsd.org 2001/01/19 16:48:14 [sshd.8] fix typo; from stevesk@ - markus@cvs.openbsd.org 2001/01/19 16:50:58 [ssh-dss.c] clear and free digest, make consistent with other code (use dlen); from stevesk@ - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus [auth-options.c auth-options.h auth-rsa.c auth2.c] pass the filename to auth_parse_options() - markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001 [readconf.c] fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com - stevesk@cvs.openbsd.org 2001/01/20 18:20:29 [sshconnect2.c] dh_new_group() does not return NULL. ok markus@ - markus@cvs.openbsd.org 2001/01/20 21:33:42 [ssh-add.c] do not loop forever if askpass does not exist; from andrew@pimlott.ne.mediaone.net - djm@cvs.openbsd.org 2001/01/20 23:00:56 [servconf.c] Check for NULL return from strdelim; ok markus - djm@cvs.openbsd.org 2001/01/20 23:02:07 [readconf.c] KNF; ok markus - jakob@cvs.openbsd.org 2001/01/21 9:00:33 [ssh-keygen.1] remove -R flag; ok markus@ - markus@cvs.openbsd.org 2001/01/21 19:05:40 [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c cipher.c cli.c clientloop.c clientloop.h compat.c compress.c deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c key.c key.h log-client.c log-server.c log.c log.h login.c login.h match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h ttysmodes.c uidswap.c xmalloc.c] split ssh.h and try to cleanup the #include mess. remove unnecessary #includes. rename util.[ch] -> misc.[ch] - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve conflict when compiling for non-kerb install - (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes on 1/19.
140 lines
3.5 KiB
C
140 lines
3.5 KiB
C
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
* All rights reserved
|
|
* Simple pattern matching, with '*' and '?' as wildcards.
|
|
*
|
|
* 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".
|
|
*/
|
|
|
|
#include "includes.h"
|
|
RCSID("$OpenBSD: match.c,v 1.11 2001/01/21 19:05:52 markus Exp $");
|
|
|
|
#include "match.h"
|
|
|
|
/*
|
|
* Returns true if the given string matches the pattern (which may contain ?
|
|
* and * as wildcards), and zero if it does not match.
|
|
*/
|
|
|
|
int
|
|
match_pattern(const char *s, const char *pattern)
|
|
{
|
|
for (;;) {
|
|
/* If at end of pattern, accept if also at end of string. */
|
|
if (!*pattern)
|
|
return !*s;
|
|
|
|
if (*pattern == '*') {
|
|
/* Skip the asterisk. */
|
|
pattern++;
|
|
|
|
/* If at end of pattern, accept immediately. */
|
|
if (!*pattern)
|
|
return 1;
|
|
|
|
/* If next character in pattern is known, optimize. */
|
|
if (*pattern != '?' && *pattern != '*') {
|
|
/*
|
|
* Look instances of the next character in
|
|
* pattern, and try to match starting from
|
|
* those.
|
|
*/
|
|
for (; *s; s++)
|
|
if (*s == *pattern &&
|
|
match_pattern(s + 1, pattern + 1))
|
|
return 1;
|
|
/* Failed. */
|
|
return 0;
|
|
}
|
|
/*
|
|
* Move ahead one character at a time and try to
|
|
* match at each position.
|
|
*/
|
|
for (; *s; s++)
|
|
if (match_pattern(s, pattern))
|
|
return 1;
|
|
/* Failed. */
|
|
return 0;
|
|
}
|
|
/*
|
|
* There must be at least one more character in the string.
|
|
* If we are at the end, fail.
|
|
*/
|
|
if (!*s)
|
|
return 0;
|
|
|
|
/* Check if the next character of the string is acceptable. */
|
|
if (*pattern != '?' && *pattern != *s)
|
|
return 0;
|
|
|
|
/* Move to the next character, both in string and in pattern. */
|
|
s++;
|
|
pattern++;
|
|
}
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
/*
|
|
* 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)
|
|
{
|
|
char sub[1024];
|
|
int negated;
|
|
int got_positive;
|
|
u_int i, subi;
|
|
|
|
got_positive = 0;
|
|
for (i = 0; i < len;) {
|
|
/* Check if the subpattern is negated. */
|
|
if (pattern[i] == '!') {
|
|
negated = 1;
|
|
i++;
|
|
} else
|
|
negated = 0;
|
|
|
|
/*
|
|
* Extract the subpattern up to a comma or end. Convert the
|
|
* subpattern to lowercase.
|
|
*/
|
|
for (subi = 0;
|
|
i < len && subi < sizeof(sub) - 1 && pattern[i] != ',';
|
|
subi++, i++)
|
|
sub[subi] = isupper(pattern[i]) ? tolower(pattern[i]) : pattern[i];
|
|
/* If subpattern too long, return failure (no match). */
|
|
if (subi >= sizeof(sub) - 1)
|
|
return 0;
|
|
|
|
/* If the subpattern was terminated by a comma, skip the comma. */
|
|
if (i < len && pattern[i] == ',')
|
|
i++;
|
|
|
|
/* Null-terminate the subpattern. */
|
|
sub[subi] = '\0';
|
|
|
|
/* Try to match the subpattern against the host name. */
|
|
if (match_pattern(host, sub)) {
|
|
if (negated)
|
|
return -1; /* Negative */
|
|
else
|
|
got_positive = 1; /* Positive */
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Return success if got a positive match. If there was a negative
|
|
* match, we have already returned -1 and never get here.
|
|
*/
|
|
return got_positive;
|
|
}
|