* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static char rcsid[] = "$Id: auth.c,v 1.46 1999/03/16 03:15:12 paulus Exp $";
-#endif
+#define RCSID "$Id: auth.c,v 1.57 1999/08/13 06:46:10 paulus Exp $"
#include <stdio.h>
#include <stddef.h>
#endif
#include "pathnames.h"
-/* Used for storing a sequence of words. Usually malloced. */
-struct wordlist {
- struct wordlist *next;
- char *word;
-};
+static const char rcsid[] = RCSID;
/* Bits in scan_authfile return value */
#define NONWILD_SERVER 1
#define ISWILD(word) (word[0] == '*' && word[1] == 0)
-#define FALSE 0
-#define TRUE 1
-
/* The name by which the peer authenticated itself to us. */
char peer_authname[MAXNAMELEN];
/* Set if we have successfully called plogin() */
static int logged_in;
-/* Set if we have run the /etc/ppp/auth-up script. */
-static int did_authup;
-static pid_t authup_pid; /* process ID of auth-up/down script */
-
/* List of addresses which the peer may use. */
-static struct wordlist *addresses[NUM_PPP];
+static struct permitted_ip *addresses[NUM_PPP];
+
+/* Extra options to apply, from the secrets file entry for the peer. */
+static struct wordlist *extra_options;
/* Number of network protocols which we have opened. */
static int num_np_open;
/* Set if we got the contents of passwd[] from the pap-secrets file. */
static int passwd_from_file;
+/*
+ * This is used to ensure that we don't start an auth-up/down
+ * script while one is already running.
+ */
+enum script_state {
+ s_down,
+ s_up
+};
+
+static enum script_state auth_state = s_down;
+static enum script_state auth_script_state = s_down;
+static pid_t auth_script_pid = 0;
+
/*
* Option variables.
*/
bool usehostname = 0; /* Use hostname for our_name */
bool auth_required = 0; /* Always require authentication from peer */
bool allow_any_ip = 0; /* Allow peer to use any IP address */
+bool explicit_remote = 0; /* User specified explicit remote name */
+char remote_name[MAXNAMELEN]; /* Peer's name for authentication */
/* Bits in auth_pending[] */
#define PAP_WITHPEER 1
static void plogout __P((void));
static int null_login __P((int));
static int get_pap_passwd __P((char *));
-static int have_pap_secret __P((void));
-static int have_chap_secret __P((char *, char *, u_int32_t));
-static int ip_addr_check __P((u_int32_t, struct wordlist *));
-static int scan_authfile __P((FILE *, char *, char *, u_int32_t, char *,
+static int have_pap_secret __P((int *));
+static int have_chap_secret __P((char *, char *, int, int *));
+static int ip_addr_check __P((u_int32_t, struct permitted_ip *));
+static int scan_authfile __P((FILE *, char *, char *, char *,
struct wordlist **, char *));
static void free_wordlist __P((struct wordlist *));
static void auth_script __P((char *));
+static void auth_script_done __P((void *));
static void set_allowed_addrs __P((int, struct wordlist *));
+static int some_ip_ok __P((struct wordlist *));
static int setupapfile __P((char **));
static int privgroup __P((char **));
+static void check_access __P((FILE *, char *));
/*
* Authentication-related options.
{ "usehostname", o_bool, &usehostname,
"Must use hostname for authentication", 1 },
{ "remotename", o_string, remote_name,
- "Set remote name for authentication", OPT_STATIC, NULL, MAXNAMELEN },
+ "Set remote name for authentication", OPT_STATIC,
+ &explicit_remote, MAXNAMELEN },
{ "auth", o_bool, &auth_required,
"Require authentication from peer", 1 },
{ "noauth", o_bool, &auth_required,
"PAP passwords are encrypted", 1 },
{ "+ua", o_special, setupapfile,
"Get PAP user and password from file" },
+ { "password", o_string, passwd,
+ "Password for authenticating us to the peer", OPT_STATIC,
+ NULL, MAXSECRETLEN },
{ "privgroup", o_special, privgroup,
"Allow group members to use privileged options", OPT_PRIV },
{ NULL }
option_error("unable to open user login data file %s", *argv);
return 0;
}
-#if 0 /* check done by setting effective UID above */
- if (!readable(fileno(ufile))) {
- option_error("%s: access denied", *argv);
- return 0;
- }
-#endif
check_access(ufile, *argv);
/* get username */
int i;
struct protent *protp;
- if (did_authup) {
+ auth_state = s_down;
+ if (auth_script_state == s_up && auth_script_pid == 0) {
+ auth_script_state = s_down;
auth_script(_PATH_AUTHDOWN);
- did_authup = 0;
}
for (i = 0; (protp = protocols[i]) != NULL; ++i) {
if (!protp->enabled_flag)
if (!wo->neg_upap || !null_login(unit)) {
warn("peer refused to authenticate: terminating link");
lcp_close(unit, "peer refused to authenticate");
+ status = EXIT_PEER_AUTH_FAILED;
return;
}
}
network_phase(unit)
int unit;
{
- int i;
- struct protent *protp;
lcp_options *go = &lcp_gotoptions[unit];
/*
* If the peer had to authenticate, run the auth-up script now.
*/
- if ((go->neg_chap || go->neg_upap) && !did_authup) {
- auth_script(_PATH_AUTHUP);
- did_authup = 1;
+ if (go->neg_chap || go->neg_upap) {
+ auth_state = s_up;
+ if (auth_script_state == s_down && auth_script_pid == 0) {
+ auth_script_state = s_up;
+ auth_script(_PATH_AUTHUP);
+ }
}
#ifdef CBCP_SUPPORT
}
#endif
+ /*
+ * Process extra options from the secrets file
+ */
+ if (extra_options) {
+ options_from_list(extra_options, 1);
+ free_wordlist(extra_options);
+ extra_options = 0;
+ }
+ start_networks();
+}
+
+void
+start_networks()
+{
+ int i;
+ struct protent *protp;
+
phase = PHASE_NETWORK;
#if 0
if (!demand)
for (i = 0; (protp = protocols[i]) != NULL; ++i)
if (protp->protocol < 0xC000 && protp->enabled_flag
&& protp->open != NULL) {
- (*protp->open)(unit);
+ (*protp->open)(0);
if (protp->protocol != PPP_CCP)
++num_np_open;
}
* Authentication failure: take the link down
*/
lcp_close(unit, "Authentication failed");
+ status = EXIT_PEER_AUTH_FAILED;
}
/*
BZERO(passwd, MAXSECRETLEN);
/*
* We've failed to authenticate ourselves to our peer.
- * He'll probably take the link down, and there's not much
- * we can do except wait for that.
+ * Some servers keep sending CHAP challenges, but there
+ * is no point in persisting without any way to get updated
+ * authentication secrets.
*/
+ lcp_close(unit, "Failed to authenticate ourselves to peer");
+ status = EXIT_AUTH_TOPEER_FAILED;
}
/*
/*
* At this point we consider that the link has come up successfully.
*/
- need_holdoff = 0;
+ status = EXIT_OK;
+ unsuccess = 0;
if (idle_time_limit > 0)
TIMEOUT(check_idle, NULL, idle_time_limit);
itime = MIN(idle.xmit_idle, idle.recv_idle);
if (itime >= idle_time_limit) {
/* link is idle: shut it down. */
- info("Terminating connection due to lack of activity.");
+ notice("Terminating connection due to lack of activity.");
lcp_close(0, "Link inactive");
+ need_holdoff = 0;
+ status = EXIT_IDLE_TIMEOUT;
} else {
TIMEOUT(check_idle, NULL, idle_time_limit - itime);
}
{
info("Connect time expired");
lcp_close(0, "Connect time expired"); /* Close connection */
+ status = EXIT_CONNECT_TIME;
}
/*
{
lcp_options *wo = &lcp_wantoptions[0];
int can_auth;
- ipcp_options *ipwo = &ipcp_wantoptions[0];
- u_int32_t remote;
+ int lacks_ip;
/* Default our_name to hostname, and user to our_name */
if (our_name[0] == 0 || usehostname)
- strlcpy(our_name, sizeof(our_name), hostname);
+ strlcpy(our_name, hostname, sizeof(our_name));
if (user[0] == 0)
- strlcpy(user, sizeof(user), our_name);
+ strlcpy(user, our_name, sizeof(user));
+
+ /*
+ * If we have a default route, require the peer to authenticate
+ * unless the noauth option was given.
+ */
+ if (!auth_required && !allow_any_ip && have_route_to(0))
+ auth_required = 1;
/* If authentication is required, ask peer for CHAP or PAP. */
if (auth_required) {
wo->neg_upap = 0;
}
- /*
- * If we have a default route, require the peer to authenticate
- * unless the noauth option was given.
- */
- if (!auth_required && !allow_any_ip && have_route_to(0))
- auth_required = 1;
-
/*
* Check whether we have appropriate secrets to use
* to authenticate the peer.
*/
- can_auth = wo->neg_upap && (uselogin || have_pap_secret());
+ lacks_ip = 0;
+ can_auth = wo->neg_upap && (uselogin || have_pap_secret(&lacks_ip));
if (!can_auth && wo->neg_chap) {
- remote = ipwo->accept_remote? 0: ipwo->hisaddr;
- can_auth = have_chap_secret(remote_name, our_name, remote);
+ can_auth = have_chap_secret((explicit_remote? remote_name: NULL),
+ our_name, 1, &lacks_ip);
}
if (auth_required && !can_auth) {
- option_error("peer authentication required but no suitable secret(s) found\n");
- if (remote_name[0] == 0)
- option_error("for authenticating any peer to us (%s)\n", our_name);
+ if (explicit_remote)
+ option_error(
+"The remote system (%s) is required to authenticate itself but I",
+ remote_name);
+ else
+ option_error(
+"The remote system is required to authenticate itself but I");
+
+ if (!lacks_ip)
+ option_error(
+"couldn't find any suitable secret (password) for it to use to do so.");
else
- option_error("for authenticating peer %s to us (%s)\n",
- remote_name, our_name);
+ option_error(
+"couldn't find any secret (password) which would let it use an IP address.");
+
exit(1);
}
}
{
lcp_options *go = &lcp_gotoptions[unit];
lcp_options *ao = &lcp_allowoptions[0];
- ipcp_options *ipwo = &ipcp_wantoptions[0];
- u_int32_t remote;
ao->neg_upap = !refuse_pap && (passwd[0] != 0 || get_pap_passwd(NULL));
ao->neg_chap = !refuse_chap
- && have_chap_secret(user, remote_name, (u_int32_t)0);
+ && (passwd[0] != 0
+ || have_chap_secret(user, (explicit_remote? remote_name: NULL),
+ 0, NULL));
- if (go->neg_upap && !uselogin && !have_pap_secret())
+ if (go->neg_upap && !uselogin && !have_pap_secret(NULL))
go->neg_upap = 0;
if (go->neg_chap) {
- remote = ipwo->accept_remote? 0: ipwo->hisaddr;
- if (!have_chap_secret(remote_name, our_name, remote))
+ if (!have_chap_secret((explicit_remote? remote_name: NULL),
+ our_name, 1, NULL))
go->neg_chap = 0;
}
}
char *filename;
FILE *f;
struct wordlist *addrs;
- u_int32_t remote;
- ipcp_options *ipwo = &ipcp_wantoptions[unit];
char passwd[256], user[256];
char secret[MAXWORDLEN];
static int attempts = 0;
*/
filename = _PATH_UPAPFILE;
addrs = NULL;
- ret = UPAP_AUTHACK;
+ ret = UPAP_AUTHNAK;
f = fopen(filename, "r");
if (f == NULL) {
error("Can't open PAP password file %s: %m", filename);
- ret = UPAP_AUTHNAK;
} else {
check_access(f, filename);
- remote = ipwo->accept_remote? 0: ipwo->hisaddr;
- if (scan_authfile(f, user, our_name, remote,
- secret, &addrs, filename) < 0
- || (secret[0] != 0 && (cryptpap || strcmp(passwd, secret) != 0)
- && strcmp(crypt(passwd, secret), secret) != 0)) {
- warn("PAP authentication failure for %s", user);
- ret = UPAP_AUTHNAK;
+ if (scan_authfile(f, user, our_name, secret, &addrs, filename) < 0) {
+ warn("no PAP secret found for %s", user);
+ } else if (secret[0] != 0) {
+ /* password given in pap-secrets - must match */
+ if ((!cryptpap && strcmp(passwd, secret) == 0)
+ || strcmp(crypt(passwd, secret), secret) == 0)
+ ret = UPAP_AUTHACK;
+ else
+ warn("PAP authentication failure for %s", user);
+ } else if (uselogin) {
+ /* empty password in pap-secrets and login option */
+ ret = plogin(user, passwd, msg, msglen);
+ if (ret == UPAP_AUTHNAK)
+ warn("PAP login failure for %s", user);
+ } else {
+ /* empty password in pap-secrets and login option not used */
+ ret = UPAP_AUTHACK;
}
fclose(f);
}
- if (uselogin && ret == UPAP_AUTHACK) {
- ret = plogin(user, passwd, msg, msglen);
- if (ret == UPAP_AUTHNAK) {
- warn("PAP login failure for %s", user);
- }
- }
-
if (ret == UPAP_AUTHNAK) {
if (*msg == (char *) 0)
*msg = "Login incorrect";
*msglen = strlen(*msg);
/*
+ * XXX can we ever get here more than once??
* Frustrate passwd stealer programs.
* Allow 10 tries, but start backing off after 3 (stolen from login).
* On 10'th, drop the connection.
*/
if (attempts++ >= 10) {
warn("%d LOGIN FAILURES ON %s, %s", attempts, devnam, user);
- quit();
+ lcp_close(unit, "login failed");
}
if (attempts > 3)
sleep((u_int) (attempts - 3) * 5);
*/
#ifdef USE_PAM
-static char *PAM_username = "";
-static char *PAM_password = "";
-
-#ifdef PAM_ESTABLISH_CRED /* new PAM defines :(^ */
-#define MY_PAM_STRERROR(err_code) (char *) pam_strerror(pamh,err_code)
-#else
-#define MY_PAM_STRERROR(err_code) (char *) pam_strerror(err_code)
-#endif
+/* Static variables used to communicate between the conversation function
+ * and the server_login function
+ */
+static char *PAM_username;
+static char *PAM_password;
+static int PAM_error = 0;
+static pam_handle_t *pamh = NULL;
+
+/* PAM conversation function
+ * Here we assume (for now, at least) that echo on means login name, and
+ * echo off means password.
+ */
-static int pam_conv (int num_msg,
- const struct pam_message **msg,
- struct pam_response **resp,
- void *appdata_ptr)
+static int PAM_conv (int num_msg, const struct pam_message **msg,
+ struct pam_response **resp, void *appdata_ptr)
{
- int count = 0, replies = 0;
+ int replies = 0;
struct pam_response *reply = NULL;
- int size = 0;
-
- for (count = 0; count < num_msg; count++)
- {
- size += sizeof (struct pam_response);
- reply = realloc (reply, size); /* ANSI: is malloc() if reply==NULL */
- if (!reply)
- return PAM_CONV_ERR;
-
- switch (msg[count]->msg_style)
- {
- case PAM_PROMPT_ECHO_ON:
- reply[replies].resp_retcode = PAM_SUCCESS;
- reply[replies++].resp = strdup(PAM_username); /* never NULL */
- break;
-
- case PAM_PROMPT_ECHO_OFF:
- reply[replies].resp_retcode = PAM_SUCCESS;
- reply[replies++].resp = strdup(PAM_password); /* never NULL */
- break;
-
- case PAM_TEXT_INFO:
- reply[replies].resp_retcode = PAM_SUCCESS;
- reply[replies++].resp = NULL;
- break;
-
- case PAM_ERROR_MSG:
- default:
- free (reply);
- return PAM_CONV_ERR;
- }
- }
-
- if (resp)
- *resp = reply;
- else
- free (reply);
+#define COPY_STRING(s) (s) ? strdup(s) : NULL
+
+ reply = malloc(sizeof(struct pam_response) * num_msg);
+ if (!reply) return PAM_CONV_ERR;
+
+ for (replies = 0; replies < num_msg; replies++) {
+ switch (msg[replies]->msg_style) {
+ case PAM_PROMPT_ECHO_ON:
+ reply[replies].resp_retcode = PAM_SUCCESS;
+ reply[replies].resp = COPY_STRING(PAM_username);
+ /* PAM frees resp */
+ break;
+ case PAM_PROMPT_ECHO_OFF:
+ reply[replies].resp_retcode = PAM_SUCCESS;
+ reply[replies].resp = COPY_STRING(PAM_password);
+ /* PAM frees resp */
+ break;
+ case PAM_TEXT_INFO:
+ /* fall through */
+ case PAM_ERROR_MSG:
+ /* ignore it, but pam still wants a NULL response... */
+ reply[replies].resp_retcode = PAM_SUCCESS;
+ reply[replies].resp = NULL;
+ break;
+ default:
+ /* Must be an error of some sort... */
+ free (reply);
+ PAM_error = 1;
+ return PAM_CONV_ERR;
+ }
+ }
+ *resp = reply;
return PAM_SUCCESS;
}
-#endif
+
+static struct pam_conv PAM_conversation = {
+ &PAM_conv,
+ NULL
+};
+#endif /* USE_PAM */
/*
* plogin - Check the user name and password against the system
char **msg;
int *msglen;
{
+ char *tty;
#ifdef USE_PAM
-
- struct pam_conv pam_conversation;
- pam_handle_t *pamh;
int pam_error;
-/*
- * Fill the pam_conversion structure
- */
- memset (&pam_conversation, '\0', sizeof (struct pam_conv));
- pam_conversation.conv = &pam_conv;
-
- pam_error = pam_start ("ppp", user, &pam_conversation, &pamh);
+ pam_error = pam_start ("ppp", user, &PAM_conversation, &pamh);
if (pam_error != PAM_SUCCESS) {
- *msg = MY_PAM_STRERROR (pam_error);
+ *msg = (char *) pam_strerror (pamh, pam_error);
+ reopen_log();
return UPAP_AUTHNAK;
}
-/*
- * Define the fields for the credintial validation
- */
- (void) pam_set_item (pamh, PAM_TTY, devnam);
+ /*
+ * Define the fields for the credential validation
+ */
+
PAM_username = user;
PAM_password = passwd;
-/*
- * Validate the user
- */
+ PAM_error = 0;
+ pam_set_item (pamh, PAM_TTY, devnam); /* this might be useful to some modules */
+
+ /*
+ * Validate the user
+ */
pam_error = pam_authenticate (pamh, PAM_SILENT);
- if (pam_error == PAM_SUCCESS) {
+ if (pam_error == PAM_SUCCESS && !PAM_error) {
pam_error = pam_acct_mgmt (pamh, PAM_SILENT);
-
- /* start a session for this user. Session closed when link ends. */
- if (pam_error == PAM_SUCCESS)
- (void) pam_open_session (pamh, PAM_SILENT);
+ if (pam_error == PAM_SUCCESS)
+ pam_open_session (pamh, PAM_SILENT);
}
- *msg = MY_PAM_STRERROR (pam_error);
-
- PAM_username =
- PAM_password = "";
-/*
- * Clean up the mess
- */
- (void) pam_end (pamh, pam_error);
+ *msg = (char *) pam_strerror (pamh, pam_error);
+ /*
+ * Clean up the mess
+ */
+ reopen_log(); /* apparently the PAM stuff does closelog() */
+ PAM_username = NULL;
+ PAM_password = NULL;
if (pam_error != PAM_SUCCESS)
return UPAP_AUTHNAK;
+#else /* #ifdef USE_PAM */
+
/*
* Use the non-PAM methods directly
*/
-#else /* #ifdef USE_PAM */
-
- struct passwd *pw;
- char *tty;
#ifdef HAS_SHADOW
struct spwd *spwd;
struct spwd *getspnam();
#endif
+ struct passwd *pw = getpwnam(user);
- pw = getpwnam(user);
endpwent();
- if (pw == NULL) {
+ if (pw == NULL)
return (UPAP_AUTHNAK);
- }
#ifdef HAS_SHADOW
spwd = getspnam(user);
/*
* If no passwd, don't let them login.
*/
- if (pw->pw_passwd == NULL || *pw->pw_passwd == '\0'
+ if (pw->pw_passwd == NULL || strlen(pw->pw_passwd) < 2
|| strcmp(crypt(passwd, pw->pw_passwd), pw->pw_passwd) != 0)
return (UPAP_AUTHNAK);
- /* These functions are not enabled for PAM. The reason for this is that */
- /* there is not necessarily a "passwd" entry for this user. That is */
- /* real purpose of 'PAM' -- to virtualize the account data from the */
- /* application. If you want to do the same thing, write the entry in */
- /* the 'session' hook. */
+#endif /* #ifdef USE_PAM */
/*
* Write a wtmp entry for this user.
tty += 5;
logwtmp(tty, user, remote_name); /* Add wtmp login entry */
-#if defined(_PATH_LASTLOG)
- {
+#if defined(_PATH_LASTLOG) && !defined(USE_PAM)
+ if (pw != (struct passwd *)NULL) {
struct lastlog ll;
int fd;
(void)lseek(fd, (off_t)(pw->pw_uid * sizeof(ll)), SEEK_SET);
memset((void *)&ll, 0, sizeof(ll));
(void)time(&ll.ll_time);
- (void)strlcpy(ll.ll_line, sizeof(ll.ll_line), tty);
+ (void)strncpy(ll.ll_line, tty, sizeof(ll.ll_line));
(void)write(fd, (char *)&ll, sizeof(ll));
(void)close(fd);
}
}
-#endif
-
-#endif /* #ifdef USE_PAM */
+#endif /* _PATH_LASTLOG and not USE_PAM */
info("user %s logged in", user);
- logged_in = TRUE;
+ logged_in = 1;
return (UPAP_AUTHACK);
}
plogout()
{
#ifdef USE_PAM
- struct pam_conv pam_conversation;
- pam_handle_t *pamh;
int pam_error;
-/*
- * Fill the pam_conversion structure. The PAM specification states that the
- * session must be able to be closed by a totally different handle from which
- * it was created. Hold the PAM group to their own specification!
- */
- memset (&pam_conversation, '\0', sizeof (struct pam_conv));
- pam_conversation.conv = &pam_conv;
-
- pam_error = pam_start ("ppp", user, &pam_conversation, &pamh);
- if (pam_error == PAM_SUCCESS) {
- (void) pam_set_item (pamh, PAM_TTY, devnam);
- (void) pam_close_session (pamh, PAM_SILENT);
- (void) pam_end (pamh, PAM_SUCCESS);
- }
-#else
+ if (pamh != NULL) {
+ pam_error = pam_close_session (pamh, PAM_SILENT);
+ pam_end (pamh, pam_error);
+ pamh = NULL;
+ }
+ /* Apparently the pam stuff does closelog(). */
+ reopen_log();
+#else /* ! USE_PAM */
char *tty;
tty = devnam;
if (strncmp(tty, "/dev/", 5) == 0)
tty += 5;
logwtmp(tty, "", ""); /* Wipe out utmp logout entry */
-#endif
-
- logged_in = FALSE;
+#endif /* ! USE_PAM */
+ logged_in = 0;
}
return 0;
check_access(f, filename);
- i = scan_authfile(f, "", our_name, (u_int32_t)0, secret, &addrs, filename);
+ i = scan_authfile(f, "", our_name, secret, &addrs, filename);
ret = i >= 0 && (i & NONWILD_CLIENT) != 0 && secret[0] == 0;
BZERO(secret, sizeof(secret));
return 0;
check_access(f, filename);
ret = scan_authfile(f, user,
- remote_name[0]? remote_name: NULL,
- (u_int32_t)0, secret, NULL, filename);
+ (remote_name[0]? remote_name: NULL),
+ secret, NULL, filename);
fclose(f);
if (ret < 0)
return 0;
if (passwd != NULL)
- strlcpy(passwd, MAXSECRETLEN, secret);
+ strlcpy(passwd, secret, MAXSECRETLEN);
BZERO(secret, sizeof(secret));
return 1;
}
* secrets that we could possibly use for authenticating the peer.
*/
static int
-have_pap_secret()
+have_pap_secret(lacks_ipp)
+ int *lacks_ipp;
{
FILE *f;
int ret;
char *filename;
- ipcp_options *ipwo = &ipcp_wantoptions[0];
- u_int32_t remote;
+ struct wordlist *addrs;
filename = _PATH_UPAPFILE;
f = fopen(filename, "r");
if (f == NULL)
return 0;
- remote = ipwo->accept_remote? 0: ipwo->hisaddr;
- ret = scan_authfile(f, NULL, our_name, remote, NULL, NULL, filename);
+ ret = scan_authfile(f, (explicit_remote? remote_name: NULL), our_name,
+ NULL, &addrs, filename);
fclose(f);
- if (ret < 0)
- return 0;
+ if (ret >= 0 && !some_ip_ok(addrs)) {
+ if (lacks_ipp != 0)
+ *lacks_ipp = 1;
+ ret = -1;
+ }
+ if (addrs != 0)
+ free_wordlist(addrs);
- return 1;
+ return ret >= 0;
}
* know the identity yet.
*/
static int
-have_chap_secret(client, server, remote)
+have_chap_secret(client, server, need_ip, lacks_ipp)
char *client;
char *server;
- u_int32_t remote;
+ int need_ip;
+ int *lacks_ipp;
{
FILE *f;
int ret;
char *filename;
+ struct wordlist *addrs;
filename = _PATH_CHAPFILE;
f = fopen(filename, "r");
if (f == NULL)
return 0;
- if (client[0] == 0)
+ if (client != NULL && client[0] == 0)
client = NULL;
- else if (server[0] == 0)
+ else if (server != NULL && server[0] == 0)
server = NULL;
- ret = scan_authfile(f, client, server, remote, NULL, NULL, filename);
+ ret = scan_authfile(f, client, server, NULL, &addrs, filename);
fclose(f);
- if (ret < 0)
- return 0;
+ if (ret >= 0 && need_ip && !some_ip_ok(addrs)) {
+ if (lacks_ipp != 0)
+ *lacks_ipp = 1;
+ ret = -1;
+ }
+ if (addrs != 0)
+ free_wordlist(addrs);
- return 1;
+ return ret >= 0;
}
* (We could be either client or server).
*/
int
-get_secret(unit, client, server, secret, secret_len, save_addrs)
+get_secret(unit, client, server, secret, secret_len, am_server)
int unit;
char *client;
char *server;
char *secret;
int *secret_len;
- int save_addrs;
+ int am_server;
{
FILE *f;
int ret, len;
struct wordlist *addrs;
char secbuf[MAXWORDLEN];
- filename = _PATH_CHAPFILE;
- addrs = NULL;
- secbuf[0] = 0;
-
- f = fopen(filename, "r");
- if (f == NULL) {
- error("Can't open chap secret file %s: %m", filename);
- return 0;
- }
- check_access(f, filename);
+ if (!am_server && passwd[0] != 0) {
+ strlcpy(secbuf, passwd, sizeof(secbuf));
+ } else {
+ filename = _PATH_CHAPFILE;
+ addrs = NULL;
+ secbuf[0] = 0;
+
+ f = fopen(filename, "r");
+ if (f == NULL) {
+ error("Can't open chap secret file %s: %m", filename);
+ return 0;
+ }
+ check_access(f, filename);
- ret = scan_authfile(f, client, server, (u_int32_t)0,
- secbuf, &addrs, filename);
- fclose(f);
- if (ret < 0)
- return 0;
+ ret = scan_authfile(f, client, server, secbuf, &addrs, filename);
+ fclose(f);
+ if (ret < 0)
+ return 0;
- if (save_addrs)
- set_allowed_addrs(unit, addrs);
+ if (am_server)
+ set_allowed_addrs(unit, addrs);
+ }
len = strlen(secbuf);
if (len > MAXSECRETLEN) {
/*
* set_allowed_addrs() - set the list of allowed addresses.
+ * Also looks for `--' indicating options to apply for this peer
+ * and leaves the following words in extra_options.
*/
static void
set_allowed_addrs(unit, addrs)
int unit;
struct wordlist *addrs;
{
+ int n;
+ struct wordlist *ap, **pap;
+ struct permitted_ip *ip;
+ char *ptr_word, *ptr_mask;
+ struct hostent *hp;
+ struct netent *np;
+ u_int32_t a, mask, ah, offset;
+ struct ipcp_options *wo = &ipcp_wantoptions[unit];
+ u_int32_t suggested_ip = 0;
+
if (addresses[unit] != NULL)
- free_wordlist(addresses[unit]);
- addresses[unit] = addrs;
+ free(addresses[unit]);
+ addresses[unit] = NULL;
+ if (extra_options != NULL)
+ free_wordlist(extra_options);
+ extra_options = NULL;
/*
- * If there's only one authorized address we might as well
- * ask our peer for that one right away
+ * Count the number of IP addresses given, and chop off
+ * any extra options for this peer.
*/
- if (addrs != NULL && addrs->next == NULL) {
- char *p = addrs->word;
- struct ipcp_options *wo = &ipcp_wantoptions[unit];
- u_int32_t a;
- struct hostent *hp;
-
- if (*p != '!' && *p != '-' && *p != '*' && strchr(p, '/') == NULL) {
- hp = gethostbyname(p);
- if (hp != NULL && hp->h_addrtype == AF_INET)
- a = *(u_int32_t *)hp->h_addr;
- else
- a = inet_addr(p);
- if (a != (u_int32_t) -1)
- wo->hisaddr = a;
+ for (n = 0, pap = &addrs; (ap = *pap) != NULL; pap = &ap->next, ++n) {
+ if (strcmp(ap->word, "--") == 0) {
+ /* rest are options */
+ *pap = 0;
+ extra_options = ap->next;
+ free(ap);
+ break;
}
}
-}
-
-/*
- * auth_ip_addr - check whether the peer is authorized to use
- * a given IP address. Returns 1 if authorized, 0 otherwise.
- */
-int
-auth_ip_addr(unit, addr)
- int unit;
- u_int32_t addr;
-{
-
- if (addresses[unit] == NULL) {
- if (auth_required)
- return 0; /* no addresses authorized */
- return allow_any_ip || !have_route_to(addr);
- }
- return ip_addr_check(addr, addresses[unit]);
-}
-
-static int
-ip_addr_check(addr, addrs)
- u_int32_t addr;
- struct wordlist *addrs;
-{
- u_int32_t a, mask, ah;
- int accept;
- char *ptr_word, *ptr_mask;
- struct hostent *hp;
- struct netent *np;
-
- /* don't allow loopback or multicast address */
- if (bad_ip_adrs(addr))
- return 0;
-
- if (addrs == NULL)
- return 0; /* no addresses authorized */
+ if (n == 0)
+ return;
+ ip = (struct permitted_ip *) malloc((n + 1) * sizeof(struct permitted_ip));
+ if (ip == 0)
+ return;
- for (; addrs != NULL; addrs = addrs->next) {
+ n = 0;
+ for (ap = addrs; ap != NULL; ap = ap->next) {
/* "-" means no addresses authorized, "*" means any address allowed */
- ptr_word = addrs->word;
+ ptr_word = ap->word;
if (strcmp(ptr_word, "-") == 0)
break;
- if (strcmp(ptr_word, "*") == 0)
- return 1;
+ if (strcmp(ptr_word, "*") == 0) {
+ ip[n].permit = 1;
+ ip[n].base = ip[n].mask = 0;
+ ++n;
+ break;
+ }
- accept = 1;
+ ip[n].permit = 1;
if (*ptr_word == '!') {
- accept = 0;
+ ip[n].permit = 0;
++ptr_word;
}
mask = ~ (u_int32_t) 0;
+ offset = 0;
ptr_mask = strchr (ptr_word, '/');
if (ptr_mask != NULL) {
int bit_count;
+ char *endp;
- bit_count = (int) strtol (ptr_mask+1, (char **) 0, 10);
+ bit_count = (int) strtol (ptr_mask+1, &endp, 10);
if (bit_count <= 0 || bit_count > 32) {
warn("invalid address length %v in auth. address list",
- ptr_mask);
+ ptr_mask+1);
+ continue;
+ }
+ bit_count = 32 - bit_count; /* # bits in host part */
+ if (*endp == '+') {
+ offset = ifunit + 1;
+ ++endp;
+ }
+ if (*endp != 0) {
+ warn("invalid address length syntax: %v", ptr_mask+1);
continue;
}
*ptr_mask = '\0';
- mask <<= 32 - bit_count;
+ mask <<= bit_count;
}
hp = gethostbyname(ptr_word);
if (ptr_mask != NULL)
*ptr_mask = '/';
- if (a == (u_int32_t)-1L)
- warn("unknown host %s in auth. address list", addrs->word);
- else
- /* Here a and addr are in network byte order,
- and mask is in host order. */
- if (((addr ^ a) & htonl(mask)) == 0)
- return accept;
+ if (a == (u_int32_t)-1L) {
+ warn("unknown host %s in auth. address list", ap->word);
+ continue;
+ }
+ if (offset != 0) {
+ if (offset >= ~mask) {
+ warn("interface unit %d too large for subnet %v",
+ ifunit, ptr_word);
+ continue;
+ }
+ a = htonl((ntohl(a) & mask) + offset);
+ mask = ~(u_int32_t)0;
+ }
+ ip[n].mask = htonl(mask);
+ ip[n].base = a & ip[n].mask;
+ ++n;
+ if (~mask == 0 && suggested_ip == 0)
+ suggested_ip = a;
+ }
+
+ ip[n].permit = 0; /* make the last entry forbid all addresses */
+ ip[n].base = 0; /* to terminate the list */
+ ip[n].mask = 0;
+
+ addresses[unit] = ip;
+
+ /*
+ * If the address given for the peer isn't authorized, or if
+ * the user hasn't given one, AND there is an authorized address
+ * which is a single host, then use that if we find one.
+ */
+ if (suggested_ip != 0
+ && (wo->hisaddr == 0 || !auth_ip_addr(unit, wo->hisaddr)))
+ wo->hisaddr = suggested_ip;
+}
+
+/*
+ * auth_ip_addr - check whether the peer is authorized to use
+ * a given IP address. Returns 1 if authorized, 0 otherwise.
+ */
+int
+auth_ip_addr(unit, addr)
+ int unit;
+ u_int32_t addr;
+{
+ if (addresses[unit] == NULL) {
+ if (auth_required)
+ return 0; /* no addresses authorized */
+ return allow_any_ip || !have_route_to(addr);
}
- return 0; /* not in list => can't have it */
+ return ip_addr_check(addr, addresses[unit]);
+}
+
+static int
+ip_addr_check(addr, addrs)
+ u_int32_t addr;
+ struct permitted_ip *addrs;
+{
+ /* don't allow loopback or multicast address */
+ if (bad_ip_adrs(addr))
+ return 0;
+
+ for (; ; ++addrs)
+ if ((addr & addrs->mask) == addrs->base)
+ return addrs->permit;
}
/*
|| IN_MULTICAST(addr) || IN_BADCLASS(addr);
}
+/*
+ * some_ip_ok - check a wordlist to see if it authorizes any
+ * IP address(es).
+ */
+static int
+some_ip_ok(addrs)
+ struct wordlist *addrs;
+{
+ for (; addrs != 0; addrs = addrs->next) {
+ if (strcmp(addrs->word, "-") == 0)
+ break;
+ if (addrs->word[0] != '!')
+ return 1; /* some IP address is allowed */
+ }
+ return 0;
+}
+
/*
* check_access - complain if a secret file has too-liberal permissions.
*/
-void
+static void
check_access(f, filename)
FILE *f;
char *filename;
* We assume secret is NULL or points to MAXWORDLEN bytes of space.
*/
static int
-scan_authfile(f, client, server, ipaddr, secret, addrs, filename)
+scan_authfile(f, client, server, secret, addrs, filename)
FILE *f;
char *client;
char *server;
- u_int32_t ipaddr;
char *secret;
struct wordlist **addrs;
char *filename;
break;
if (newline)
continue;
- if (server != NULL && strcmp(word, server) != 0 && !ISWILD(word))
- continue;
- if (!ISWILD(word))
+ if (!ISWILD(word)) {
+ if (server != NULL && strcmp(word, server) != 0)
+ continue;
got_flag |= NONWILD_SERVER;
+ }
/*
* Got some sort of a match - see if it's better than what
* Special syntax: @filename means read secret from file.
*/
if (word[0] == '@') {
- strlcpy(atfile, sizeof(atfile), word+1);
+ strlcpy(atfile, word+1, sizeof(atfile));
if ((sf = fopen(atfile, "r")) == NULL) {
warn("can't open indirect secret file %s", atfile);
continue;
fclose(sf);
}
if (secret != NULL)
- strlcpy(lsecret, sizeof(lsecret), word);
+ strlcpy(lsecret, word, sizeof(lsecret));
/*
* Now read address authorization info and make a wordlist.
alast = ap;
}
- /*
- * Check if the given IP address is allowed by the wordlist.
- * XXX accepts this entry even if it has no allowed IP addresses
- * if they didn't specify a remote IP address. XXX
- */
- if (ipaddr != 0 && !ip_addr_check(ipaddr, alist)) {
- free_wordlist(alist);
- continue;
- }
-
/*
* This is the best so far; remember it.
*/
free_wordlist(addr_list);
addr_list = alist;
if (secret != NULL)
- strlcpy(secret, MAXWORDLEN, lsecret);
+ strlcpy(secret, lsecret, MAXWORDLEN);
if (!newline)
break;
}
}
+/*
+ * auth_script_done - called when the auth-up or auth-down script
+ * has finished.
+ */
+static void
+auth_script_done(arg)
+ void *arg;
+{
+ auth_script_pid = 0;
+ switch (auth_script_state) {
+ case s_up:
+ if (auth_state == s_down) {
+ auth_script_state = s_down;
+ auth_script(_PATH_AUTHDOWN);
+ }
+ break;
+ case s_down:
+ if (auth_state == s_up) {
+ auth_script_state = s_up;
+ auth_script(_PATH_AUTHUP);
+ }
+ break;
+ }
+}
+
/*
* auth_script - execute a script with arguments
* interface-name peer-name real-user tty speed
argv[5] = strspeed;
argv[6] = NULL;
- authup_pid = run_program(script, argv, 0, NULL, NULL);
+ auth_script_pid = run_program(script, argv, 0, auth_script_done, NULL);
}
projects / ppp.git / blobdiff