mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-04 09:09:56 +00:00
455aabc3f8
o The FSM layering is now more sane. o Move a lot of the NCP stuff into our ipcpstate rather than having it in the bundle, including control of the configured IP addresses. We don't need hacks like the global `linkup' variable any more as the FSM decides when our ppp.link* files get run. This is going to eventually be configurable based on FSM events anyway. o Fix a few inconsistencies when both sides require authentication. o We now have "Ppp..." and "PPp" prompts, reflecting authentication and network phase. We don't print loads of spurious prompts as we change phases any more. o Our phase is part of the bundle now. o Fix a bug where the FSM wasn't calling LayerFinish. o Close the FSM down correctly with a signal rather than slamming it down as if the line was dropped (the undocumented ``down'' command is still available though). o Remove the forgotten `tunno' variable and fix references to it.
233 lines
6.3 KiB
C
233 lines
6.3 KiB
C
/*
|
|
* PPP PAP Module
|
|
*
|
|
* Written by Toshiharu OHNO (tony-o@iij.ad.jp)
|
|
*
|
|
* Copyright (C) 1993-94, Internet Initiative Japan, Inc.
|
|
* All rights reserverd.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* advertising materials, and other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the Internet Initiative Japan, Inc. The name of the
|
|
* IIJ may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*
|
|
* $Id: pap.c,v 1.20.2.6 1998/02/02 19:33:39 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
|
|
#include <pwd.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <time.h>
|
|
#include <termios.h>
|
|
#include <unistd.h>
|
|
#ifdef __OpenBSD__
|
|
#include <util.h>
|
|
#else
|
|
#include <libutil.h>
|
|
#endif
|
|
#include <utmp.h>
|
|
|
|
#include "command.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "defs.h"
|
|
#include "timer.h"
|
|
#include "fsm.h"
|
|
#include "lcp.h"
|
|
#include "pap.h"
|
|
#include "loadalias.h"
|
|
#include "vars.h"
|
|
#include "hdlc.h"
|
|
#include "lcpproto.h"
|
|
#include "auth.h"
|
|
#include "async.h"
|
|
#include "throughput.h"
|
|
#include "link.h"
|
|
#include "physical.h"
|
|
#include "bundle.h"
|
|
|
|
static const char *papcodes[] = { "???", "REQUEST", "ACK", "NAK" };
|
|
|
|
static void
|
|
SendPapChallenge(int papid, struct physical *physical)
|
|
{
|
|
struct fsmheader lh;
|
|
struct mbuf *bp;
|
|
u_char *cp;
|
|
int namelen, keylen, plen;
|
|
|
|
namelen = strlen(VarAuthName);
|
|
keylen = strlen(VarAuthKey);
|
|
plen = namelen + keylen + 2;
|
|
LogPrintf(LogDEBUG, "SendPapChallenge: namelen = %d, keylen = %d\n",
|
|
namelen, keylen);
|
|
if (LogIsKept(LogDEBUG))
|
|
LogPrintf(LogPHASE, "PAP: %s (%s)\n", VarAuthName, VarAuthKey);
|
|
else
|
|
LogPrintf(LogPHASE, "PAP: %s\n", VarAuthName);
|
|
lh.code = PAP_REQUEST;
|
|
lh.id = papid;
|
|
lh.length = htons(plen + sizeof(struct fsmheader));
|
|
bp = mballoc(plen + sizeof(struct fsmheader), MB_FSM);
|
|
memcpy(MBUF_CTOP(bp), &lh, sizeof(struct fsmheader));
|
|
cp = MBUF_CTOP(bp) + sizeof(struct fsmheader);
|
|
*cp++ = namelen;
|
|
memcpy(cp, VarAuthName, namelen);
|
|
cp += namelen;
|
|
*cp++ = keylen;
|
|
memcpy(cp, VarAuthKey, keylen);
|
|
|
|
HdlcOutput(physical2link(physical), PRI_LINK, PROTO_PAP, bp);
|
|
}
|
|
|
|
struct authinfo AuthPapInfo = {
|
|
SendPapChallenge,
|
|
};
|
|
|
|
static void
|
|
SendPapCode(int id, int code, const char *message, struct physical *physical)
|
|
{
|
|
struct fsmheader lh;
|
|
struct mbuf *bp;
|
|
u_char *cp;
|
|
int plen, mlen;
|
|
|
|
lh.code = code;
|
|
lh.id = id;
|
|
mlen = strlen(message);
|
|
plen = mlen + 1;
|
|
lh.length = htons(plen + sizeof(struct fsmheader));
|
|
bp = mballoc(plen + sizeof(struct fsmheader), MB_FSM);
|
|
memcpy(MBUF_CTOP(bp), &lh, sizeof(struct fsmheader));
|
|
cp = MBUF_CTOP(bp) + sizeof(struct fsmheader);
|
|
*cp++ = mlen;
|
|
memcpy(cp, message, mlen);
|
|
LogPrintf(LogPHASE, "PapOutput: %s\n", papcodes[code]);
|
|
HdlcOutput(physical2link(physical), PRI_LINK, PROTO_PAP, bp);
|
|
}
|
|
|
|
/*
|
|
* Validate given username and passwrd against with secret table
|
|
*/
|
|
static int
|
|
PapValidate(struct bundle *bundle, u_char *name, u_char *key,
|
|
struct physical *physical)
|
|
{
|
|
int nlen, klen;
|
|
|
|
nlen = *name++;
|
|
klen = *key;
|
|
*key++ = 0;
|
|
key[klen] = 0;
|
|
LogPrintf(LogDEBUG, "PapValidate: name %s (%d), key %s (%d)\n",
|
|
name, nlen, key, klen);
|
|
|
|
#ifndef NOPASSWDAUTH
|
|
if (Enabled(ConfPasswdAuth)) {
|
|
struct passwd *pwd;
|
|
int result;
|
|
|
|
LogPrintf(LogLCP, "Using PasswdAuth\n");
|
|
result = (pwd = getpwnam(name)) &&
|
|
!strcmp(crypt(key, pwd->pw_passwd), pwd->pw_passwd);
|
|
endpwent();
|
|
return result;
|
|
}
|
|
#endif
|
|
|
|
return AuthValidate(bundle, SECRETFILE, name, key, physical);
|
|
}
|
|
|
|
void
|
|
PapInput(struct bundle *bundle, struct mbuf *bp, struct physical *physical)
|
|
{
|
|
int len = plength(bp);
|
|
struct fsmheader *php;
|
|
u_char *cp;
|
|
|
|
if (len >= sizeof(struct fsmheader)) {
|
|
php = (struct fsmheader *) MBUF_CTOP(bp);
|
|
if (len >= ntohs(php->length)) {
|
|
if (php->code < PAP_REQUEST || php->code > PAP_NAK)
|
|
php->code = 0;
|
|
LogPrintf(LogPHASE, "PapInput: %s\n", papcodes[php->code]);
|
|
|
|
switch (php->code) {
|
|
case PAP_REQUEST:
|
|
cp = (u_char *) (php + 1);
|
|
if (PapValidate(bundle, cp, cp + *cp + 1, physical)) {
|
|
SendPapCode(php->id, PAP_ACK, "Greetings!!", physical);
|
|
LcpInfo.auth_ineed = 0;
|
|
if ((mode & MODE_DIRECT) && Physical_IsATTY(physical) &&
|
|
Enabled(ConfUtmp))
|
|
if (Utmp)
|
|
LogPrintf(LogERROR, "Oops, already logged in on %s\n",
|
|
VarBaseDevice);
|
|
else {
|
|
struct utmp ut;
|
|
memset(&ut, 0, sizeof ut);
|
|
time(&ut.ut_time);
|
|
strncpy(ut.ut_name, cp+1, sizeof ut.ut_name - 1);
|
|
strncpy(ut.ut_line, VarBaseDevice, sizeof ut.ut_line - 1);
|
|
if (logout(ut.ut_line))
|
|
logwtmp(ut.ut_line, "", "");
|
|
login(&ut);
|
|
Utmp = 1;
|
|
}
|
|
|
|
if (LcpInfo.auth_iwait == 0)
|
|
/*
|
|
* Either I didn't need to authenticate, or I've already been
|
|
* told that I got the answer right.
|
|
*/
|
|
bundle_NewPhase(bundle, physical, PHASE_NETWORK);
|
|
|
|
} else {
|
|
SendPapCode(php->id, PAP_NAK, "Login incorrect", physical);
|
|
reconnect(RECON_FALSE);
|
|
bundle_Close(bundle, &LcpInfo.fsm);
|
|
}
|
|
break;
|
|
case PAP_ACK:
|
|
StopAuthTimer(&AuthPapInfo);
|
|
cp = (u_char *) (php + 1);
|
|
len = *cp++;
|
|
cp[len] = 0;
|
|
LogPrintf(LogPHASE, "Received PAP_ACK (%s)\n", cp);
|
|
if (LcpInfo.auth_iwait == PROTO_PAP) {
|
|
LcpInfo.auth_iwait = 0;
|
|
if (LcpInfo.auth_ineed == 0)
|
|
/*
|
|
* We've succeeded in our ``login''
|
|
* If we're not expecting the peer to authenticate (or he already
|
|
* has), proceed to network phase.
|
|
*/
|
|
bundle_NewPhase(bundle, physical, PHASE_NETWORK);
|
|
}
|
|
break;
|
|
case PAP_NAK:
|
|
StopAuthTimer(&AuthPapInfo);
|
|
cp = (u_char *) (php + 1);
|
|
len = *cp++;
|
|
cp[len] = 0;
|
|
LogPrintf(LogPHASE, "Received PAP_NAK (%s)\n", cp);
|
|
reconnect(RECON_FALSE);
|
|
bundle_Close(bundle, &LcpInfo.fsm);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
pfree(bp);
|
|
}
|