30949fd4b5
structures (well, they're treated as opaque). It's now possible to manage IPv6 interface addresses and routing table entries and to filter IPV6 traffic whether encapsulated or not. IPV6CP support is crude for now, and hasn't been tested against any other implementations. RADIUS and IPv6 are independent of eachother for now. ppp.linkup/ppp.linkdown aren't currently used by IPV6CP o Understand all protocols(5) in filter rules rather than only a select few. o Allow a mask specification for the ``delete'' command. It's now possible to specifically delete one of two conflicting routes. o When creating and deleting proxy arp entries, do it for all IPv4 interface addresses rather than doing it just for the ``current'' peer address. o When iface-alias isn't in effect, don't blow away manually (via ``iface add'') added interface addresses. o When listening on a tcp server (diagnostic) socket, bind so that a tcp46 socket is created -- allowing both IPv4 and IPv6 connections. o When displaying ICMP traffic, don't display the icmp type twice. When display traffic, display at least some information about unrecognised traffic. o Bump version Inspired after filtering work by: Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
393 lines
9.9 KiB
C
393 lines
9.9 KiB
C
/*-
|
|
* Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
|
|
* based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
|
|
* Internet Initiative Japan, Inc (IIJ)
|
|
* 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 AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
#include <netinet/in_systm.h>
|
|
#include <netinet/ip.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
|
|
#include <pwd.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <termios.h>
|
|
#include <unistd.h>
|
|
|
|
#include "layer.h"
|
|
#include "mbuf.h"
|
|
#include "defs.h"
|
|
#include "log.h"
|
|
#include "timer.h"
|
|
#include "fsm.h"
|
|
#include "iplist.h"
|
|
#include "throughput.h"
|
|
#include "slcompress.h"
|
|
#include "lqr.h"
|
|
#include "hdlc.h"
|
|
#include "ncpaddr.h"
|
|
#include "ip.h"
|
|
#include "ipcp.h"
|
|
#include "auth.h"
|
|
#include "systems.h"
|
|
#include "lcp.h"
|
|
#include "ccp.h"
|
|
#include "link.h"
|
|
#include "descriptor.h"
|
|
#include "chat.h"
|
|
#include "proto.h"
|
|
#include "filter.h"
|
|
#include "mp.h"
|
|
#ifndef NORADIUS
|
|
#include "radius.h"
|
|
#endif
|
|
#include "cbcp.h"
|
|
#include "chap.h"
|
|
#include "async.h"
|
|
#include "physical.h"
|
|
#include "datalink.h"
|
|
#include "ipv6cp.h"
|
|
#include "ncp.h"
|
|
#include "bundle.h"
|
|
|
|
const char *
|
|
Auth2Nam(u_short auth, u_char type)
|
|
{
|
|
static char chap[10];
|
|
|
|
switch (auth) {
|
|
case PROTO_PAP:
|
|
return "PAP";
|
|
case PROTO_CHAP:
|
|
snprintf(chap, sizeof chap, "CHAP 0x%02x", type);
|
|
return chap;
|
|
case 0:
|
|
return "none";
|
|
}
|
|
return "unknown";
|
|
}
|
|
|
|
static int
|
|
auth_CheckPasswd(const char *name, const char *data, const char *key)
|
|
{
|
|
if (!strcmp(data, "*")) {
|
|
/* Then look up the real password database */
|
|
struct passwd *pw;
|
|
int result;
|
|
|
|
result = (pw = getpwnam(name)) &&
|
|
!strcmp(crypt(key, pw->pw_passwd), pw->pw_passwd);
|
|
endpwent();
|
|
return result;
|
|
}
|
|
|
|
return !strcmp(data, key);
|
|
}
|
|
|
|
int
|
|
auth_SetPhoneList(const char *name, char *phone, int phonelen)
|
|
{
|
|
FILE *fp;
|
|
int n, lineno;
|
|
char *vector[6];
|
|
char buff[LINE_LEN];
|
|
|
|
fp = OpenSecret(SECRETFILE);
|
|
lineno = 0;
|
|
if (fp != NULL) {
|
|
while (fgets(buff, sizeof buff, fp)) {
|
|
lineno++;
|
|
if (buff[0] == '#')
|
|
continue;
|
|
buff[strlen(buff) - 1] = '\0';
|
|
memset(vector, '\0', sizeof vector);
|
|
if ((n = MakeArgs(buff, vector, VECSIZE(vector), PARSE_REDUCE)) < 0)
|
|
log_Printf(LogWARN, "%s: %d: Invalid line\n", SECRETFILE, lineno);
|
|
if (n < 5)
|
|
continue;
|
|
if (strcmp(vector[0], name) == 0) {
|
|
CloseSecret(fp);
|
|
if (*vector[4] == '\0')
|
|
return 0;
|
|
strncpy(phone, vector[4], phonelen - 1);
|
|
phone[phonelen - 1] = '\0';
|
|
return 1; /* Valid */
|
|
}
|
|
}
|
|
CloseSecret(fp);
|
|
}
|
|
*phone = '\0';
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
auth_Select(struct bundle *bundle, const char *name)
|
|
{
|
|
FILE *fp;
|
|
int n, lineno;
|
|
char *vector[5];
|
|
char buff[LINE_LEN];
|
|
|
|
if (*name == '\0') {
|
|
ipcp_Setup(&bundle->ncp.ipcp, INADDR_NONE);
|
|
return 1;
|
|
}
|
|
|
|
#ifndef NORADIUS
|
|
if (bundle->radius.valid && bundle->radius.ip.s_addr != INADDR_NONE) {
|
|
/* We've got a radius IP - it overrides everything */
|
|
if (!ipcp_UseHisIPaddr(bundle, bundle->radius.ip))
|
|
return 0;
|
|
ipcp_Setup(&bundle->ncp.ipcp, bundle->radius.mask.s_addr);
|
|
/* Continue with ppp.secret in case we've got a new label */
|
|
}
|
|
#endif
|
|
|
|
fp = OpenSecret(SECRETFILE);
|
|
lineno = 0;
|
|
if (fp != NULL) {
|
|
while (fgets(buff, sizeof buff, fp)) {
|
|
lineno++;
|
|
if (buff[0] == '#')
|
|
continue;
|
|
buff[strlen(buff) - 1] = '\0';
|
|
memset(vector, '\0', sizeof vector);
|
|
if ((n = MakeArgs(buff, vector, VECSIZE(vector), PARSE_REDUCE)) < 0)
|
|
log_Printf(LogWARN, "%s: %d: Invalid line\n", SECRETFILE, lineno);
|
|
if (n < 2)
|
|
continue;
|
|
if (strcmp(vector[0], name) == 0) {
|
|
CloseSecret(fp);
|
|
#ifndef NORADIUS
|
|
if (!bundle->radius.valid || bundle->radius.ip.s_addr == INADDR_NONE) {
|
|
#endif
|
|
if (n > 2 && *vector[2] && strcmp(vector[2], "*") &&
|
|
!ipcp_UseHisaddr(bundle, vector[2], 1))
|
|
return 0;
|
|
ipcp_Setup(&bundle->ncp.ipcp, INADDR_NONE);
|
|
#ifndef NORADIUS
|
|
}
|
|
#endif
|
|
if (n > 3 && *vector[3] && strcmp(vector[3], "*"))
|
|
bundle_SetLabel(bundle, vector[3]);
|
|
return 1; /* Valid */
|
|
}
|
|
}
|
|
CloseSecret(fp);
|
|
}
|
|
|
|
#ifndef NOPASSWDAUTH
|
|
/* Let 'em in anyway - they must have been in the passwd file */
|
|
ipcp_Setup(&bundle->ncp.ipcp, INADDR_NONE);
|
|
return 1;
|
|
#else
|
|
#ifndef NORADIUS
|
|
if (bundle->radius.valid)
|
|
return 1;
|
|
#endif
|
|
|
|
/* Disappeared from ppp.secret ??? */
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
int
|
|
auth_Validate(struct bundle *bundle, const char *name,
|
|
const char *key, struct physical *physical)
|
|
{
|
|
/* Used by PAP routines */
|
|
|
|
FILE *fp;
|
|
int n, lineno;
|
|
char *vector[5];
|
|
char buff[LINE_LEN];
|
|
|
|
fp = OpenSecret(SECRETFILE);
|
|
lineno = 0;
|
|
if (fp != NULL) {
|
|
while (fgets(buff, sizeof buff, fp)) {
|
|
lineno++;
|
|
if (buff[0] == '#')
|
|
continue;
|
|
buff[strlen(buff) - 1] = 0;
|
|
memset(vector, '\0', sizeof vector);
|
|
if ((n = MakeArgs(buff, vector, VECSIZE(vector), PARSE_REDUCE)) < 0)
|
|
log_Printf(LogWARN, "%s: %d: Invalid line\n", SECRETFILE, lineno);
|
|
if (n < 2)
|
|
continue;
|
|
if (strcmp(vector[0], name) == 0) {
|
|
CloseSecret(fp);
|
|
return auth_CheckPasswd(name, vector[1], key);
|
|
}
|
|
}
|
|
CloseSecret(fp);
|
|
}
|
|
|
|
#ifndef NOPASSWDAUTH
|
|
if (Enabled(bundle, OPT_PASSWDAUTH))
|
|
return auth_CheckPasswd(name, "*", key);
|
|
#endif
|
|
|
|
return 0; /* Invalid */
|
|
}
|
|
|
|
char *
|
|
auth_GetSecret(struct bundle *bundle, const char *name, int len,
|
|
struct physical *physical)
|
|
{
|
|
/* Used by CHAP routines */
|
|
|
|
FILE *fp;
|
|
int n, lineno;
|
|
char *vector[5];
|
|
static char buff[LINE_LEN]; /* vector[] will point here when returned */
|
|
|
|
fp = OpenSecret(SECRETFILE);
|
|
if (fp == NULL)
|
|
return (NULL);
|
|
|
|
lineno = 0;
|
|
while (fgets(buff, sizeof buff, fp)) {
|
|
lineno++;
|
|
if (buff[0] == '#')
|
|
continue;
|
|
n = strlen(buff) - 1;
|
|
if (buff[n] == '\n')
|
|
buff[n] = '\0'; /* Trim the '\n' */
|
|
memset(vector, '\0', sizeof vector);
|
|
if ((n = MakeArgs(buff, vector, VECSIZE(vector), PARSE_REDUCE)) < 0)
|
|
log_Printf(LogWARN, "%s: %d: Invalid line\n", SECRETFILE, lineno);
|
|
if (n < 2)
|
|
continue;
|
|
if (strlen(vector[0]) == len && strncmp(vector[0], name, len) == 0) {
|
|
CloseSecret(fp);
|
|
return vector[1];
|
|
}
|
|
}
|
|
CloseSecret(fp);
|
|
return (NULL); /* Invalid */
|
|
}
|
|
|
|
static void
|
|
AuthTimeout(void *vauthp)
|
|
{
|
|
struct authinfo *authp = (struct authinfo *)vauthp;
|
|
|
|
timer_Stop(&authp->authtimer);
|
|
if (--authp->retry > 0) {
|
|
authp->id++;
|
|
(*authp->fn.req)(authp);
|
|
timer_Start(&authp->authtimer);
|
|
} else {
|
|
log_Printf(LogPHASE, "Auth: No response from server\n");
|
|
datalink_AuthNotOk(authp->physical->dl);
|
|
}
|
|
}
|
|
|
|
void
|
|
auth_Init(struct authinfo *authp, struct physical *p, auth_func req,
|
|
auth_func success, auth_func failure)
|
|
{
|
|
memset(authp, '\0', sizeof(struct authinfo));
|
|
authp->cfg.fsm.timeout = DEF_FSMRETRY;
|
|
authp->cfg.fsm.maxreq = DEF_FSMAUTHTRIES;
|
|
authp->cfg.fsm.maxtrm = 0; /* not used */
|
|
authp->fn.req = req;
|
|
authp->fn.success = success;
|
|
authp->fn.failure = failure;
|
|
authp->physical = p;
|
|
}
|
|
|
|
void
|
|
auth_StartReq(struct authinfo *authp)
|
|
{
|
|
timer_Stop(&authp->authtimer);
|
|
authp->authtimer.func = AuthTimeout;
|
|
authp->authtimer.name = "auth";
|
|
authp->authtimer.load = authp->cfg.fsm.timeout * SECTICKS;
|
|
authp->authtimer.arg = (void *)authp;
|
|
authp->retry = authp->cfg.fsm.maxreq;
|
|
authp->id = 1;
|
|
(*authp->fn.req)(authp);
|
|
timer_Start(&authp->authtimer);
|
|
}
|
|
|
|
void
|
|
auth_StopTimer(struct authinfo *authp)
|
|
{
|
|
timer_Stop(&authp->authtimer);
|
|
}
|
|
|
|
struct mbuf *
|
|
auth_ReadHeader(struct authinfo *authp, struct mbuf *bp)
|
|
{
|
|
int len;
|
|
|
|
len = m_length(bp);
|
|
if (len >= sizeof authp->in.hdr) {
|
|
bp = mbuf_Read(bp, (u_char *)&authp->in.hdr, sizeof authp->in.hdr);
|
|
if (len >= ntohs(authp->in.hdr.length))
|
|
return bp;
|
|
authp->in.hdr.length = htons(0);
|
|
log_Printf(LogWARN, "auth_ReadHeader: Short packet (%d > %d) !\n",
|
|
ntohs(authp->in.hdr.length), len);
|
|
} else {
|
|
authp->in.hdr.length = htons(0);
|
|
log_Printf(LogWARN, "auth_ReadHeader: Short packet header (%d > %d) !\n",
|
|
(int)(sizeof authp->in.hdr), len);
|
|
}
|
|
|
|
m_freem(bp);
|
|
return NULL;
|
|
}
|
|
|
|
struct mbuf *
|
|
auth_ReadName(struct authinfo *authp, struct mbuf *bp, int len)
|
|
{
|
|
if (len > sizeof authp->in.name - 1)
|
|
log_Printf(LogWARN, "auth_ReadName: Name too long (%d) !\n", len);
|
|
else {
|
|
int mlen = m_length(bp);
|
|
|
|
if (len > mlen)
|
|
log_Printf(LogWARN, "auth_ReadName: Short packet (%d > %d) !\n",
|
|
len, mlen);
|
|
else {
|
|
bp = mbuf_Read(bp, (u_char *)authp->in.name, len);
|
|
authp->in.name[len] = '\0';
|
|
return bp;
|
|
}
|
|
}
|
|
|
|
*authp->in.name = '\0';
|
|
m_freem(bp);
|
|
return NULL;
|
|
}
|