*/
#ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.2 1993/12/14 05:40:50 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.15 1995/05/19 03:16:12 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];
static int logged_in;
-static struct wordlist *addresses[NPPP];
+static struct wordlist *addresses[NUM_PPP];
/* 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 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 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();
- if (lcp_wantoptions[unit].restart) {
- lcp_lowerdown(unit);
- lcp_lowerup(unit);
- } else
- EXIT(unit);
+ phase = PHASE_DEAD;
+ syslog(LOG_NOTICE, "Connection terminated.");
+}
+
+/*
+ * LCP has gone down; it will either die or try to re-establish.
+ */
+void
+link_down(unit)
+ int unit;
+{
+ ipcp_close(0);
+ ccp_close(0);
+ phase = PHASE_TERMINATE;
}
/*
if (auth_required && !(go->neg_chap || go->neg_upap)) {
/*
- * We wanted the peer to authenticate himself, and he refused:
- * tell him to go away.
+ * We wanted the peer to authenticate itself, and it refused:
+ * treat it as though it authenticated with PAP using a username
+ * of "" and a password of "". If that's not OK, boot it out.
*/
- syslog(LOG_WARNING, "peer refused to authenticate");
- lcp_close(unit);
- return;
+ if (!wo->neg_upap || !null_login(unit)) {
+ syslog(LOG_WARNING, "peer refused to authenticate");
+ lcp_close(unit);
+ phase = PHASE_TERMINATE;
+ return;
+ }
}
+ phase = PHASE_AUTHENTICATE;
auth = 0;
if (go->neg_chap) {
ChapAuthPeer(unit, our_name, go->chap_mdtype);
auth_pending[unit] = auth;
if (!auth)
- ipcp_open(unit);
+ network_phase(unit);
+}
+
+/*
+ * Proceed to the network phase.
+ */
+static void
+network_phase(unit)
+ int unit;
+{
+ phase = PHASE_NETWORK;
+ ipcp_open(unit);
+ ccp_open(unit);
}
/*
* Authentication failure: take the link down
*/
lcp_close(unit);
+ phase = PHASE_TERMINATE;
}
/*
int bit;
switch (protocol) {
- case CHAP:
+ case PPP_CHAP:
bit = CHAP_PEER;
break;
- case UPAP:
+ case PPP_PAP:
bit = UPAP_PEER;
break;
default:
* If there is no more authentication still to be done,
* proceed to the network phase.
*/
- if ((auth_pending[unit] &= ~bit) == 0)
+ 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;
}
/*
* proceed to the network phase.
*/
if ((auth_pending[unit] &= ~bit) == 0)
- ipcp_open(unit);
+ network_phase(unit);
}
} 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 */
}
+/*
+ * null_login - Check if a username of "" and a password of "" are
+ * acceptable, and iff so, set the list of acceptable IP addresses
+ * and return 1.
+ */
+static int
+null_login(unit)
+ int unit;
+{
+ char *filename;
+ FILE *f;
+ int i, ret;
+ struct wordlist *addrs;
+ char secret[MAXWORDLEN];
+
+ /*
+ * Open the file of upap secrets and scan for a suitable secret.
+ * We don't accept a wildcard client.
+ */
+ filename = _PATH_UPAPFILE;
+ addrs = NULL;
+ f = fopen(filename, "r");
+ if (f == NULL)
+ return 0;
+ check_access(f, filename);
+
+ i = scan_authfile(f, "", our_name, secret, &addrs, filename);
+ ret = i >= 0 && (i & NONWILD_CLIENT) != 0 && secret[0] == 0;
+
+ if (ret) {
+ if (addresses[unit] != NULL)
+ free_wordlist(addresses[unit]);
+ addresses[unit] = addrs;
+ }
+
+ fclose(f);
+ return ret;
+}
+
+
/*
* get_upap_passwd - get a password for authenticating ourselves with
* our peer using PAP. Returns 1 on success, 0 if no suitable password
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;
+ /* don't allow loopback or multicast address */
+ if (bad_ip_adrs(addr))
+ return 0;
+
if ((addrs = addresses[unit]) == NULL)
return 1; /* no restriction */
addrs->word);
continue;
} else
- a = *(u_long *)hp->h_addr;
+ a = *(u_int32_t *)hp->h_addr;
}
if (addr == a)
return 1;
return 0; /* not in list => can't have it */
}
+/*
+ * bad_ip_adrs - return 1 if the IP address is one we don't want
+ * to use, such as an address in the loopback net or a multicast address.
+ * addr is in network byte order.
+ */
+int
+bad_ip_adrs(addr)
+ u_int32_t addr;
+{
+ addr = ntohl(addr);
+ return (addr >> IN_CLASSA_NSHIFT) == IN_LOOPBACKNET
+ || IN_MULTICAST(addr) || IN_BADCLASS(addr);
+}
+
/*
* check_access - complain if a secret file has too-liberal permissions.
*/
*/
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