*/
#ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.4 1994/05/18 05:59:43 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.15.2.1 1995/06/01 07:01:21 paulus Exp $";
#endif
#include <stdio.h>
#include <stddef.h>
+#include <stdlib.h>
#include <syslog.h>
#include <pwd.h>
#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "ppp.h"
+#ifdef HAS_SHADOW
+#include <shadow.h>
+#include <shadow/pwauth.h>
+#ifndef PW_PPP
+#define PW_PPP PW_LOGIN
+#endif
+#endif
+
#include "pppd.h"
#include "fsm.h"
#include "lcp.h"
#include "upap.h"
#include "chap.h"
#include "ipcp.h"
+#include "ccp.h"
#include "pathnames.h"
-#ifdef sparc
+#if defined(sparc) && !defined(NeXT)
#include <alloca.h>
-#ifndef __GNUC__
-/* why alloca.h doesn't define what alloca() returns is a mystery */
-/* char *alloca __ARGS((int)); */
-#endif /*__GNUC__*/
#endif /*sparc*/
/* Used for storing a sequence of words. Usually malloced. */
#define FALSE 0
#define TRUE 1
-extern char user[];
-extern char passwd[];
-extern char devname[];
-extern char our_name[];
-extern char remote_name[];
-extern char hostname[];
-extern int uselogin;
-extern int usehostname;
-extern int auth_required;
-
/* Records which authentication operations haven't completed yet. */
-static int auth_pending[NPPP];
+static int auth_pending[NUM_PPP];
+
+/* Set if we have successfully called login() */
static int logged_in;
-static struct wordlist *addresses[NPPP];
+
+/* 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 CHAP_PEER 8
/* Prototypes */
-void check_access __ARGS((FILE *, char *));
-
-static int login __ARGS((char *, char *, char **, int *));
-static void logout __ARGS((void));
-static int null_login __ARGS((int));
-static int get_upap_passwd __ARGS((void));
-static int have_upap_secret __ARGS((void));
-static int have_chap_secret __ARGS((char *, char *));
-static int scan_authfile __ARGS((FILE *, char *, char *, char *,
+void check_access __P((FILE *, char *));
+
+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));
+static int get_upap_passwd __P((void));
+static int have_upap_secret __P((void));
+static int have_chap_secret __P((char *, char *));
+static int scan_authfile __P((FILE *, char *, char *, char *,
struct wordlist **, char *));
-static void free_wordlist __ARGS((struct wordlist *));
+static void free_wordlist __P((struct wordlist *));
-extern char *crypt __ARGS((char *, char *));
+extern char *crypt __P((char *, char *));
/*
* An Open on LCP has requested a change from Dead to Establish phase.
link_terminated(unit)
int unit;
{
+ if (phase == PHASE_DEAD)
+ return;
if (logged_in)
logout();
phase = PHASE_DEAD;
link_down(unit)
int unit;
{
+ ipcp_close(0);
+ ccp_close(0);
phase = PHASE_TERMINATE;
}
* treat it as though it authenticated with PAP using a username
* of "" and a password of "". If that's not OK, boot it out.
*/
- if (wo->neg_upap && !null_login(unit)) {
+ if (!wo->neg_upap || !null_login(unit)) {
syslog(LOG_WARNING, "peer refused to authenticate");
lcp_close(unit);
phase = PHASE_TERMINATE;
}
auth_pending[unit] = auth;
- if (!auth) {
- phase = PHASE_NETWORK;
- ipcp_open(unit);
- }
+ if (!auth)
+ network_phase(unit);
+}
+
+/*
+ * Proceed to the network phase.
+ */
+static void
+network_phase(unit)
+ int unit;
+{
+ phase = PHASE_NETWORK;
+ num_np_open = 1;
+ ipcp_open(unit);
+ ccp_open(unit);
}
/*
int bit;
switch (protocol) {
- case CHAP:
+ case PPP_CHAP:
bit = CHAP_PEER;
break;
- case UPAP:
+ case PPP_PAP:
bit = UPAP_PEER;
break;
default:
if ((auth_pending[unit] &= ~bit) == 0) {
phase = PHASE_NETWORK;
ipcp_open(unit);
+ ccp_open(unit);
}
}
int bit;
switch (protocol) {
- case CHAP:
+ case PPP_CHAP:
bit = CHAP_WITHPEER;
break;
- case UPAP:
+ case PPP_PAP:
bit = UPAP_WITHPEER;
break;
default:
syslog(LOG_WARNING, "auth_peer_success: unknown protocol %x",
protocol);
+ bit = 0;
}
/*
* If there is no more authentication still being done,
* proceed to the network phase.
*/
- if ((auth_pending[unit] &= ~bit) == 0) {
- phase = PHASE_NETWORK;
- ipcp_open(unit);
+ if ((auth_pending[unit] &= ~bit) == 0)
+ network_phase(unit);
+}
+
+
+/*
+ * 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
+np_finished(unit, proto)
+ int unit, proto;
+{
+ if (--num_np_open <= 0) {
+ /* no further use for the link: shut up shop. */
+ lcp_close(0);
+ }
+}
+
+/*
+ * 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);
+ } else {
+ TIMEOUT(check_idle, NULL, idle_time_limit - itime);
+ }
+}
/*
* check_auth_options - called to check authentication options.
} else {
check_access(f, filename);
if (scan_authfile(f, user, our_name, secret, &addrs, filename) < 0
- || (secret[0] != 0 && strcmp(passwd, secret) != 0
+ || (secret[0] != 0 && (cryptpap || strcmp(passwd, secret) != 0)
&& strcmp(crypt(passwd, secret), secret) != 0)) {
syslog(LOG_WARNING, "upap authentication failure for %s", user);
ret = UPAP_AUTHNAK;
*/
if (attempts++ >= 10) {
syslog(LOG_WARNING, "%d LOGIN FAILURES ON %s, %s",
- attempts, devname, user);
+ attempts, devnam, user);
quit();
}
if (attempts > 3)
char *epasswd;
char *tty;
+#ifdef HAS_SHADOW
+ struct spwd *spwd;
+ struct spwd *getspnam();
+#endif
+
if ((pw = getpwnam(user)) == NULL) {
return (UPAP_AUTHNAK);
}
+#ifdef HAS_SHADOW
+ if ((spwd = getspnam(user)) == NULL) {
+ pw->pw_passwd = "";
+ } else {
+ pw->pw_passwd = spwd->sp_pwdp;
+ }
+#endif
+
/*
* XXX If no passwd, let them login without one.
*/
return (UPAP_AUTHACK);
}
+#ifdef HAS_SHADOW
+ if ((pw->pw_passwd && pw->pw_passwd[0] == '@'
+ && pw_auth (pw->pw_passwd+1, pw->pw_name, PW_PPP, NULL))
+ || !valid (passwd, pw)) {
+ return (UPAP_AUTHNAK);
+ }
+#else
epasswd = crypt(passwd, pw->pw_passwd);
if (strcmp(epasswd, pw->pw_passwd)) {
return (UPAP_AUTHNAK);
}
+#endif
syslog(LOG_INFO, "user %s logged in", user);
/*
* Write a wtmp entry for this user.
*/
- tty = strrchr(devname, '/');
+ tty = strrchr(devnam, '/');
if (tty == NULL)
- tty = devname;
+ tty = devnam;
else
tty++;
logwtmp(tty, user, ""); /* Add wtmp login entry */
{
char *tty;
- tty = strrchr(devname, '/');
+ tty = strrchr(devnam, '/');
if (tty == NULL)
- tty = devname;
+ tty = devnam;
else
tty++;
logwtmp(tty, "", ""); /* Wipe out wtmp logout entry */
char *server;
char *secret;
int *secret_len;
+ int save_addrs;
{
FILE *f;
int ret, len;
int
auth_ip_addr(unit, addr)
int unit;
- u_long addr;
+ u_int32_t addr;
{
- u_long a;
+ u_int32_t a;
struct hostent *hp;
struct wordlist *addrs;
addrs->word);
continue;
} else
- a = *(u_long *)hp->h_addr;
+ a = *(u_int32_t *)hp->h_addr;
}
if (addr == a)
return 1;
*/
int
bad_ip_adrs(addr)
- u_long addr;
+ u_int32_t addr;
{
addr = ntohl(addr);
return (addr >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET
*/
if (addr_list)
free_wordlist(addr_list);
- addr_list = NULL;
+ addr_list = addr_last = NULL;
for (;;) {
if (!getword(f, word, &newline, filename) || newline)
break;
projects / ppp.git / blobdiff