X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fauth.c;h=01a60d473f9f40c6ae67c43852661696fd33c8db;hp=f08fb312abe2b64f90bb4dc5a04a93faa0002664;hb=a68e918d9424506965b56d3d9395ba3eee34706d;hpb=064450d2b3ecf22d603cf13cb704c6e96b6c1a17 diff --git a/pppd/auth.c b/pppd/auth.c index f08fb31..01a60d4 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: auth.c,v 1.15 1995/05/19 03:16:12 paulus Exp $"; +static char rcsid[] = "$Id: auth.c,v 1.21 1996/01/01 22:53:04 paulus Exp $"; #endif #include @@ -44,6 +44,7 @@ static char rcsid[] = "$Id: auth.c,v 1.15 1995/05/19 03:16:12 paulus Exp $"; #include #include #include +#include #include #include @@ -61,12 +62,9 @@ static char rcsid[] = "$Id: auth.c,v 1.15 1995/05/19 03:16:12 paulus Exp $"; #include "fsm.h" #include "lcp.h" #include "upap.h" -#include "chap.h" -#include "ipcp.h" -#include "ccp.h" #include "pathnames.h" -#if defined(sparc) && !defined(NeXT) +#if defined(sun) && defined(sparc) #include #endif /*sparc*/ @@ -87,19 +85,29 @@ struct wordlist { /* Records which authentication operations haven't completed yet. */ static int auth_pending[NUM_PPP]; + +/* Set if we have successfully called login() */ static int logged_in; + +/* List of addresses which the peer may use. */ static struct wordlist *addresses[NUM_PPP]; +/* Number of network protocols which we have opened. */ +static int num_np_open; + +/* Number of network protocols which have come up. */ +static int num_np_up; + /* Bits in auth_pending[] */ #define UPAP_WITHPEER 1 #define UPAP_PEER 2 #define CHAP_WITHPEER 4 #define CHAP_PEER 8 -/* Prototypes */ -void check_access __P((FILE *, char *)); +/* Prototypes for procedures local to this file. */ static void network_phase __P((int)); +static void check_idle __P((caddr_t)); static int login __P((char *, char *, char **, int *)); static void logout __P((void)); static int null_login __P((int)); @@ -145,8 +153,19 @@ void link_down(unit) int unit; { - ipcp_close(0); - ccp_close(0); + int i; + struct protent *protp; + + for (i = 0; (protp = protocols[i]) != NULL; ++i) { + if (!protp->enabled_flag) + continue; + if (protp->protocol != PPP_LCP && protp->lowerdown != NULL) + (*protp->lowerdown)(unit); + if (protp->protocol < 0xC000 && protp->close != NULL) + (*protp->close)(unit); + } + num_np_open = 0; + num_np_up = 0; phase = PHASE_TERMINATE; } @@ -162,6 +181,16 @@ link_established(unit) lcp_options *wo = &lcp_wantoptions[unit]; lcp_options *go = &lcp_gotoptions[unit]; lcp_options *ho = &lcp_hisoptions[unit]; + int i; + struct protent *protp; + + /* + * Tell higher-level protocols that LCP is up. + */ + for (i = 0; (protp = protocols[i]) != NULL; ++i) + if (protp->protocol != PPP_LCP && protp->enabled_flag + && protp->lowerup != NULL) + (*protp->lowerup)(unit); if (auth_required && !(go->neg_chap || go->neg_upap)) { /* @@ -171,7 +200,7 @@ link_established(unit) */ if (!wo->neg_upap || !null_login(unit)) { syslog(LOG_WARNING, "peer refused to authenticate"); - lcp_close(unit); + lcp_close(unit, "peer refused to authenticate"); phase = PHASE_TERMINATE; return; } @@ -206,9 +235,17 @@ static void network_phase(unit) int unit; { + int i; + struct protent *protp; + phase = PHASE_NETWORK; - ipcp_open(unit); - ccp_open(unit); + for (i = 0; (protp = protocols[i]) != NULL; ++i) + if (protp->protocol < 0xC000 && protp->enabled_flag + && protp->open != NULL) { + (*protp->open)(unit); + if (protp->protocol != PPP_CCP) + ++num_np_open; + } } /* @@ -221,7 +258,7 @@ auth_peer_fail(unit, protocol) /* * Authentication failure: take the link down */ - lcp_close(unit); + lcp_close(unit, "Authentication failed"); phase = PHASE_TERMINATE; } @@ -251,11 +288,8 @@ auth_peer_success(unit, protocol) * If there is no more authentication still to be done, * proceed to the network phase. */ - if ((auth_pending[unit] &= ~bit) == 0) { - phase = PHASE_NETWORK; - ipcp_open(unit); - ccp_open(unit); - } + if ((auth_pending[unit] &= ~bit) == 0) + network_phase(unit); } /* @@ -304,10 +338,71 @@ auth_withpeer_success(unit, protocol) /* - * check_auth_options - called to check authentication options. + * np_up - a network protocol has come up. + */ +void +np_up(unit, proto) + int unit, proto; +{ + if (num_np_up == 0 && idle_time_limit > 0) { + TIMEOUT(check_idle, NULL, idle_time_limit); + } + ++num_np_up; +} + +/* + * np_down - a network protocol has gone down. + */ +void +np_down(unit, proto) + int unit, proto; +{ + if (--num_np_up == 0 && idle_time_limit > 0) { + UNTIMEOUT(check_idle, NULL); + } +} + +/* + * np_finished - a network protocol has finished using the link. */ void -check_auth_options() +np_finished(unit, proto) + int unit, proto; +{ + if (--num_np_open <= 0) { + /* no further use for the link: shut up shop. */ + lcp_close(0, "No network protocols running"); + } +} + +/* + * check_idle - check whether the link has been idle for long + * enough that we can shut it down. + */ +static void +check_idle(arg) + caddr_t arg; +{ + struct ppp_idle idle; + time_t itime; + + if (!get_idle_time(0, &idle)) + return; + itime = MIN(idle.xmit_idle, idle.recv_idle); + if (itime >= idle_time_limit) { + /* link is idle: shut it down. */ + syslog(LOG_INFO, "Terminating connection due to lack of activity."); + lcp_close(0, "Link inactive"); + } else { + TIMEOUT(check_idle, NULL, idle_time_limit - itime); + } +} + +/* + * auth_check_options - called to check authentication options. + */ +void +auth_check_options() { lcp_options *wo = &lcp_wantoptions[0]; lcp_options *ao = &lcp_allowoptions[0]; @@ -392,7 +487,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen) f = fopen(filename, "r"); if (f == NULL) { if (!uselogin) { - syslog(LOG_ERR, "Can't open upap password file %s: %m", filename); + syslog(LOG_ERR, "Can't open PAP password file %s: %m", filename); ret = UPAP_AUTHNAK; } @@ -401,7 +496,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen) if (scan_authfile(f, user, our_name, secret, &addrs, filename) < 0 || (secret[0] != 0 && (cryptpap || strcmp(passwd, secret) != 0) && strcmp(crypt(passwd, secret), secret) != 0)) { - syslog(LOG_WARNING, "upap authentication failure for %s", user); + syslog(LOG_WARNING, "PAP authentication failure for %s", user); ret = UPAP_AUTHNAK; } fclose(f); @@ -410,7 +505,7 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen) if (uselogin && ret == UPAP_AUTHACK) { ret = login(user, passwd, msg, msglen); if (ret == UPAP_AUTHNAK) { - syslog(LOG_WARNING, "upap login failure for %s", user); + syslog(LOG_WARNING, "PAP login failure for %s", user); } } @@ -507,11 +602,9 @@ login(user, passwd, msg, msglen) /* * Write a wtmp entry for this user. */ - tty = strrchr(devnam, '/'); - if (tty == NULL) - tty = devnam; - else - tty++; + tty = devnam; + if (strncmp(tty, "/dev/", 5) == 0) + tty += 5; logwtmp(tty, user, ""); /* Add wtmp login entry */ logged_in = TRUE; @@ -526,11 +619,9 @@ logout() { char *tty; - tty = strrchr(devnam, '/'); - if (tty == NULL) - tty = devnam; - else - tty++; + tty = devnam; + if (strncmp(tty, "/dev/", 5) == 0) + tty += 5; logwtmp(tty, "", ""); /* Wipe out wtmp logout entry */ logged_in = FALSE; } @@ -724,8 +815,11 @@ auth_ip_addr(unit, addr) int unit; u_int32_t addr; { - u_int32_t a; + u_int32_t a, mask; + int accept; + char *ptr_word, *ptr_mask; struct hostent *hp; + struct netent *np; struct wordlist *addrs; /* don't allow loopback or multicast address */ @@ -737,18 +831,54 @@ auth_ip_addr(unit, addr) for (; addrs != NULL; addrs = addrs->next) { /* "-" means no addresses authorized */ - if (strcmp(addrs->word, "-") == 0) + ptr_word = addrs->word; + if (strcmp(ptr_word, "-") == 0) break; - if ((a = inet_addr(addrs->word)) == -1) { - if ((hp = gethostbyname(addrs->word)) == NULL) { - syslog(LOG_WARNING, "unknown host %s in auth. address list", - addrs->word); + + accept = 1; + if (*ptr_word == '!') { + accept = 0; + ++ptr_word; + } + + mask = ~ (u_int32_t) 0; + ptr_mask = strchr (ptr_word, '/'); + if (ptr_mask != NULL) { + int bit_count; + + bit_count = (int) strtol (ptr_mask+1, (char **) 0, 10); + if (bit_count <= 0 || bit_count > 32) { + syslog (LOG_WARNING, + "invalid address length %s in auth. address list", + ptr_mask); continue; - } else - a = *(u_int32_t *)hp->h_addr; + } + *ptr_mask = '\0'; + mask <<= 32 - bit_count; + } + + hp = gethostbyname(ptr_word); + if (hp != NULL && hp->h_addrtype == AF_INET) { + a = *(u_int32_t *)hp->h_addr; + mask = ~ (u_int32_t) 0; /* are we sure we want this? */ + } else { + np = getnetbyname (ptr_word); + if (np != NULL && np->n_addrtype == AF_INET) + a = htonl (*(u_int32_t *)np->n_net); + else + a = inet_addr (ptr_word); } - if (addr == a) - return 1; + + if (ptr_mask != NULL) + *ptr_mask = '/'; + + if (a == -1L) + syslog (LOG_WARNING, + "unknown host %s in auth. address list", + addrs->word); + else + if (((addr ^ a) & mask) == 0) + return accept; } return 0; /* not in list => can't have it */ }