mirror of
https://git.savannah.nongnu.org/git/lwip.git
synced 2026-08-08 00:23:39 +08:00
reorganised PPP sourcecode to 2.3.11 including some bugfix backports from 2.4.x.
This commit is contained in:
@@ -84,63 +84,14 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
/*************************/
|
||||
/*** LOCAL DEFINITIONS ***/
|
||||
/*************************/
|
||||
#if 0 /* UNUSED */
|
||||
/* Bits in scan_authfile return value */
|
||||
#define NONWILD_SERVER 1
|
||||
#define NONWILD_CLIENT 2
|
||||
|
||||
/* Bits in auth_pending[] */
|
||||
#define PAP_WITHPEER 1
|
||||
#define PAP_PEER 2
|
||||
#define CHAP_WITHPEER 4
|
||||
#define CHAP_PEER 8
|
||||
#define ISWILD(word) (word[0] == '*' && word[1] == 0)
|
||||
#endif /* UNUSED */
|
||||
|
||||
|
||||
/************************/
|
||||
/*** LOCAL DATA TYPES ***/
|
||||
/************************/
|
||||
/* Used for storing a sequence of words. Usually malloced. */
|
||||
struct wordlist {
|
||||
struct wordlist *next;
|
||||
char word[1];
|
||||
};
|
||||
|
||||
|
||||
/***********************************/
|
||||
/*** LOCAL FUNCTION DECLARATIONS ***/
|
||||
/***********************************/
|
||||
extern char *crypt (const char *, const char *);
|
||||
|
||||
/* Prototypes for procedures local to this file. */
|
||||
|
||||
static void network_phase (int);
|
||||
static void check_idle (void *);
|
||||
static void connect_time_expired (void *);
|
||||
#if 0
|
||||
static int login (char *, char *, char **, int *);
|
||||
#endif
|
||||
static void logout (void);
|
||||
static int null_login (int);
|
||||
static int get_pap_passwd (int, char *, char *);
|
||||
static int have_pap_secret (void);
|
||||
static int have_chap_secret (char *, char *, u32_t);
|
||||
static int ip_addr_check (u32_t, struct wordlist *);
|
||||
#if 0 /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
static void set_allowed_addrs(int unit, struct wordlist *addrs);
|
||||
static void free_wordlist (struct wordlist *);
|
||||
#endif /* 0 */ /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
#if CBCP_SUPPORT
|
||||
static void callback_phase (int);
|
||||
#endif /* CBCP_SUPPORT */
|
||||
|
||||
|
||||
/******************************/
|
||||
/*** PUBLIC DATA STRUCTURES ***/
|
||||
/******************************/
|
||||
|
||||
|
||||
/*****************************/
|
||||
/*** LOCAL DATA STRUCTURES ***/
|
||||
/*****************************/
|
||||
#if PAP_SUPPORT || CHAP_SUPPORT
|
||||
/* The name by which the peer authenticated itself to us. */
|
||||
static char peer_authname[MAXNAMELEN];
|
||||
@@ -149,15 +100,24 @@ static char peer_authname[MAXNAMELEN];
|
||||
/* Records which authentication operations haven't completed yet. */
|
||||
static int auth_pending[NUM_PPP];
|
||||
|
||||
/* Set if we have successfully called login() */
|
||||
/* 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 int did_authup; /* @todo, we don't need this in lwip*/
|
||||
|
||||
/* List of addresses which the peer may use. */
|
||||
static struct wordlist *addresses[NUM_PPP];
|
||||
|
||||
#if 0 /* UNUSED */
|
||||
/* Wordlist giving addresses which the peer may use
|
||||
without authenticating itself. */
|
||||
static struct wordlist *noauth_addrs;
|
||||
|
||||
/* Extra options to apply, from the secrets file entry for the peer. */
|
||||
static struct wordlist *extra_options;
|
||||
#endif /* UNUSED */
|
||||
|
||||
/* Number of network protocols which we have opened. */
|
||||
static int num_np_open;
|
||||
|
||||
@@ -169,10 +129,244 @@ static int num_np_up;
|
||||
static int passwd_from_file;
|
||||
#endif /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
|
||||
#if 0 /* UNUSED */
|
||||
/* Set if we require authentication only because we have a default route. */
|
||||
static bool default_auth;
|
||||
|
||||
/* Hook to enable a plugin to control the idle time limit */
|
||||
int (*idle_time_hook) __P((struct ppp_idle *)) = NULL;
|
||||
|
||||
/* Hook for a plugin to say whether we can possibly authenticate any peer */
|
||||
int (*pap_check_hook) __P((void)) = NULL;
|
||||
|
||||
/* Hook for a plugin to check the PAP user and password */
|
||||
int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
|
||||
struct wordlist **paddrs,
|
||||
struct wordlist **popts)) = NULL;
|
||||
|
||||
/* Hook for a plugin to know about the PAP user logout */
|
||||
void (*pap_logout_hook) __P((void)) = NULL;
|
||||
|
||||
/* Hook for a plugin to get the PAP password for authenticating us */
|
||||
int (*pap_passwd_hook) __P((char *user, char *passwd)) = NULL;
|
||||
|
||||
/*
|
||||
* 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.
|
||||
* lwip: some of these are present in the ppp_settings structure
|
||||
*/
|
||||
bool uselogin = 0; /* Use /etc/passwd for checking PAP */
|
||||
bool cryptpap = 0; /* Passwords in pap-secrets are encrypted */
|
||||
bool refuse_pap = 0; /* Don't wanna auth. ourselves with PAP */
|
||||
bool refuse_chap = 0; /* Don't wanna auth. ourselves with CHAP */
|
||||
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 */
|
||||
|
||||
#endif /* UNUSED */
|
||||
|
||||
/* Bits in auth_pending[] */
|
||||
#define PAP_WITHPEER 1
|
||||
#define PAP_PEER 2
|
||||
#define CHAP_WITHPEER 4
|
||||
#define CHAP_PEER 8
|
||||
|
||||
/* @todo, move this somewhere */
|
||||
/* Used for storing a sequence of words. Usually malloced. */
|
||||
struct wordlist {
|
||||
struct wordlist *next;
|
||||
char word[1];
|
||||
};
|
||||
|
||||
|
||||
extern char *crypt (const char *, const char *);
|
||||
|
||||
/* Prototypes for procedures local to this file. */
|
||||
|
||||
static void network_phase (int);
|
||||
static void check_idle (void *);
|
||||
static void connect_time_expired (void *);
|
||||
#if 0
|
||||
static int plogin (char *, char *, char **, int *);
|
||||
#endif
|
||||
static void plogout (void);
|
||||
static int null_login (int);
|
||||
static int get_pap_passwd (int, char *, char *);
|
||||
static int have_pap_secret (void);
|
||||
static int have_chap_secret (char *, char *, u32_t);
|
||||
static int ip_addr_check (u32_t, struct wordlist *);
|
||||
|
||||
#if 0 /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
static int scan_authfile (FILE *, char *, char *, char *,
|
||||
struct wordlist **, struct wordlist **,
|
||||
char *);
|
||||
static void free_wordlist (struct wordlist *);
|
||||
static void auth_script (char *);
|
||||
static void auth_script_done (void *);
|
||||
static void set_allowed_addrs (int unit, struct wordlist *addrs);
|
||||
static int some_ip_ok (struct wordlist *);
|
||||
static int setupapfile (char **);
|
||||
static int privgroup (char **);
|
||||
static int set_noauth_addr (char **);
|
||||
static void check_access (FILE *, char *);
|
||||
#endif /* 0 */ /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
|
||||
#if 0 /* UNUSED */
|
||||
/*
|
||||
* Authentication-related options.
|
||||
*/
|
||||
option_t auth_options[] = {
|
||||
{ "require-pap", o_bool, &lcp_wantoptions[0].neg_upap,
|
||||
"Require PAP authentication from peer", 1, &auth_required },
|
||||
{ "+pap", o_bool, &lcp_wantoptions[0].neg_upap,
|
||||
"Require PAP authentication from peer", 1, &auth_required },
|
||||
{ "refuse-pap", o_bool, &refuse_pap,
|
||||
"Don't agree to auth to peer with PAP", 1 },
|
||||
{ "-pap", o_bool, &refuse_pap,
|
||||
"Don't allow PAP authentication with peer", 1 },
|
||||
{ "require-chap", o_bool, &lcp_wantoptions[0].neg_chap,
|
||||
"Require CHAP authentication from peer", 1, &auth_required },
|
||||
{ "+chap", o_bool, &lcp_wantoptions[0].neg_chap,
|
||||
"Require CHAP authentication from peer", 1, &auth_required },
|
||||
{ "refuse-chap", o_bool, &refuse_chap,
|
||||
"Don't agree to auth to peer with CHAP", 1 },
|
||||
{ "-chap", o_bool, &refuse_chap,
|
||||
"Don't allow CHAP authentication with peer", 1 },
|
||||
{ "name", o_string, our_name,
|
||||
"Set local name for authentication",
|
||||
OPT_PRIV|OPT_STATIC, NULL, MAXNAMELEN },
|
||||
{ "user", o_string, user,
|
||||
"Set name for auth with peer", OPT_STATIC, NULL, MAXNAMELEN },
|
||||
{ "usehostname", o_bool, &usehostname,
|
||||
"Must use hostname for authentication", 1 },
|
||||
{ "remotename", o_string, remote_name,
|
||||
"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,
|
||||
"Don't require peer to authenticate", OPT_PRIV, &allow_any_ip },
|
||||
{ "login", o_bool, &uselogin,
|
||||
"Use system password database for PAP", 1 },
|
||||
{ "papcrypt", o_bool, &cryptpap,
|
||||
"PAP passwords are encrypted", 1 },
|
||||
{ "+ua", o_special, (void *)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, (void *)privgroup,
|
||||
"Allow group members to use privileged options", OPT_PRIV },
|
||||
{ "allow-ip", o_special, (void *)set_noauth_addr,
|
||||
"Set IP address(es) which can be used without authentication",
|
||||
OPT_PRIV },
|
||||
{ NULL }
|
||||
};
|
||||
#endif /* UNUSED */
|
||||
#if 0 /* UNUSED */
|
||||
/*
|
||||
* setupapfile - specifies UPAP info for authenticating with peer.
|
||||
*/
|
||||
static int
|
||||
setupapfile(char **argv)
|
||||
{
|
||||
FILE * ufile;
|
||||
int l;
|
||||
|
||||
lcp_allowoptions[0].neg_upap = 1;
|
||||
|
||||
/* open user info file */
|
||||
seteuid(getuid());
|
||||
ufile = fopen(*argv, "r");
|
||||
seteuid(0);
|
||||
if (ufile == NULL) {
|
||||
option_error("unable to open user login data file %s", *argv);
|
||||
return 0;
|
||||
}
|
||||
check_access(ufile, *argv);
|
||||
|
||||
/* get username */
|
||||
if (fgets(user, MAXNAMELEN - 1, ufile) == NULL
|
||||
|| fgets(passwd, MAXSECRETLEN - 1, ufile) == NULL){
|
||||
option_error("unable to read user login data file %s", *argv);
|
||||
return 0;
|
||||
}
|
||||
fclose(ufile);
|
||||
|
||||
/* get rid of newlines */
|
||||
l = strlen(user);
|
||||
if (l > 0 && user[l-1] == '\n')
|
||||
user[l-1] = 0;
|
||||
l = strlen(passwd);
|
||||
if (l > 0 && passwd[l-1] == '\n')
|
||||
passwd[l-1] = 0;
|
||||
|
||||
return (1);
|
||||
}
|
||||
#endif /* UNUSED */
|
||||
|
||||
#if 0 /* UNUSED */
|
||||
/*
|
||||
* privgroup - allow members of the group to have privileged access.
|
||||
*/
|
||||
static int
|
||||
privgroup(char **argv)
|
||||
{
|
||||
struct group *g;
|
||||
int i;
|
||||
|
||||
g = getgrnam(*argv);
|
||||
if (g == 0) {
|
||||
option_error("group %s is unknown", *argv);
|
||||
return 0;
|
||||
}
|
||||
for (i = 0; i < ngroups; ++i) {
|
||||
if (groups[i] == g->gr_gid) {
|
||||
privileged = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if 0 /* UNUSED */
|
||||
/*
|
||||
* set_noauth_addr - set address(es) that can be used without authentication.
|
||||
* Equivalent to specifying an entry like `"" * "" addr' in pap-secrets.
|
||||
*/
|
||||
static int
|
||||
set_noauth_addr(char **argv)
|
||||
{
|
||||
char *addr = *argv;
|
||||
int l = strlen(addr);
|
||||
struct wordlist *wp;
|
||||
|
||||
wp = (struct wordlist *) malloc(sizeof(struct wordlist) + l + 1);
|
||||
if (wp == NULL)
|
||||
novm("allow-ip argument");
|
||||
wp->word = (char *) (wp + 1);
|
||||
wp->next = noauth_addrs;
|
||||
BCOPY(addr, wp->word, l);
|
||||
noauth_addrs = wp;
|
||||
return 1;
|
||||
}
|
||||
#endif /* UNUSED */
|
||||
|
||||
/***********************************/
|
||||
/*** PUBLIC FUNCTION DEFINITIONS ***/
|
||||
/***********************************/
|
||||
/*
|
||||
* An Open on LCP has requested a change from Dead to Establish phase.
|
||||
* Do what's necessary to bring the physical layer up.
|
||||
@@ -197,7 +391,7 @@ link_terminated(int unit)
|
||||
return;
|
||||
}
|
||||
if (logged_in) {
|
||||
logout();
|
||||
plogout();
|
||||
}
|
||||
lcp_phase[unit] = PHASE_DEAD;
|
||||
AUTHDEBUG((LOG_NOTICE, "Connection terminated.\n"));
|
||||
@@ -212,8 +406,9 @@ link_down(int unit)
|
||||
{
|
||||
int i;
|
||||
struct protent *protp;
|
||||
|
||||
|
||||
AUTHDEBUG((LOG_INFO, "link_down: %d\n", unit));
|
||||
|
||||
if (did_authup) {
|
||||
/* XXX Do link down processing. */
|
||||
did_authup = 0;
|
||||
@@ -229,8 +424,9 @@ link_down(int unit)
|
||||
(*protp->close)(unit, "LCP down");
|
||||
}
|
||||
}
|
||||
num_np_open = 0;
|
||||
num_np_up = 0;
|
||||
num_np_open = 0; /* number of network protocols we have opened */
|
||||
num_np_up = 0; /* Number of network protocols which have come up */
|
||||
|
||||
if (lcp_phase[unit] != PHASE_DEAD) {
|
||||
lcp_phase[unit] = PHASE_TERMINATE;
|
||||
}
|
||||
@@ -253,7 +449,7 @@ link_established(int unit)
|
||||
lcp_options *ho = &lcp_hisoptions[unit];
|
||||
#endif /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
|
||||
AUTHDEBUG((LOG_INFO, "link_established: %d\n", unit));
|
||||
AUTHDEBUG((LOG_INFO, "link_established: unit %d; Lowering up all protocols...\n", unit));
|
||||
/*
|
||||
* Tell higher-level protocols that LCP is up.
|
||||
*/
|
||||
@@ -274,7 +470,7 @@ link_established(int unit)
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
lcp_phase[unit] = PHASE_AUTHENTICATE;
|
||||
auth = 0;
|
||||
#if CHAP_SUPPORT
|
||||
@@ -329,7 +525,7 @@ network_phase(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.
|
||||
*/
|
||||
@@ -364,6 +560,7 @@ network_phase(int unit)
|
||||
lcp_close(0, "No network protocols running");
|
||||
}
|
||||
}
|
||||
/* @todo: add void start_networks(void) here (pppd 2.3.11) */
|
||||
|
||||
/*
|
||||
* The peer has failed to authenticate himself using `protocol'.
|
||||
@@ -389,7 +586,7 @@ void
|
||||
auth_peer_success(int unit, u16_t protocol, char *name, int namelen)
|
||||
{
|
||||
int pbit;
|
||||
|
||||
|
||||
AUTHDEBUG((LOG_INFO, "auth_peer_success: %d proto=%X\n", unit, protocol));
|
||||
switch (protocol) {
|
||||
case PPP_CHAP:
|
||||
@@ -402,7 +599,7 @@ auth_peer_success(int unit, u16_t protocol, char *name, int namelen)
|
||||
AUTHDEBUG((LOG_WARNING, "auth_peer_success: unknown protocol %x\n", protocol));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Save the authenticated name of the peer for later.
|
||||
*/
|
||||
@@ -428,7 +625,7 @@ void
|
||||
auth_withpeer_fail(int unit, u16_t protocol)
|
||||
{
|
||||
int errCode = PPPERR_AUTHFAIL;
|
||||
|
||||
|
||||
LWIP_UNUSED_ARG(protocol);
|
||||
|
||||
AUTHDEBUG((LOG_INFO, "auth_withpeer_fail: %d proto=%X\n", unit, protocol));
|
||||
@@ -458,7 +655,7 @@ void
|
||||
auth_withpeer_success(int unit, u16_t protocol)
|
||||
{
|
||||
int pbit;
|
||||
|
||||
|
||||
AUTHDEBUG((LOG_INFO, "auth_withpeer_success: %d proto=%X\n", unit, protocol));
|
||||
switch (protocol) {
|
||||
case PPP_CHAP:
|
||||
@@ -474,7 +671,7 @@ auth_withpeer_success(int unit, u16_t protocol)
|
||||
AUTHDEBUG((LOG_WARNING, "auth_peer_success: unknown protocol %x\n", protocol));
|
||||
pbit = 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* If there is no more authentication still being done,
|
||||
* proceed to the network (or callback) phase.
|
||||
@@ -504,7 +701,7 @@ np_up(int unit, u16_t proto)
|
||||
if (ppp_settings.idle_time_limit > 0) {
|
||||
TIMEOUT(check_idle, NULL, ppp_settings.idle_time_limit);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Set a timeout to close the connection once the maximum
|
||||
* connect time has expired.
|
||||
@@ -624,7 +821,7 @@ auth_check_options(void)
|
||||
ppp_panic("No auth secret");
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif /* UNUSED */
|
||||
|
||||
/*
|
||||
* auth_reset - called when LCP is starting negotiations to recheck
|
||||
@@ -736,14 +933,149 @@ check_passwd( int unit, char *auser, int userlen, char *apasswd, int passwdlen,
|
||||
}
|
||||
#endif /* PAP_SUPPORT */
|
||||
|
||||
#if 0 /* UNUSED */
|
||||
/*
|
||||
* This function is needed for PAM.
|
||||
*/
|
||||
|
||||
#ifdef USE_PAM
|
||||
|
||||
/* lwip does not support PAM*/
|
||||
|
||||
#endif /* USE_PAM */
|
||||
|
||||
#endif /* UNUSED */
|
||||
|
||||
|
||||
#if 0 /* UNUSED */
|
||||
/*
|
||||
* plogin - Check the user name and password against the system
|
||||
* password database, and login the user if OK.
|
||||
*
|
||||
* returns:
|
||||
* UPAP_AUTHNAK: Login failed.
|
||||
* UPAP_AUTHACK: Login succeeded.
|
||||
* In either case, msg points to an appropriate message.
|
||||
*/
|
||||
static int
|
||||
plogin(char *user, char *passwd, char **msg, int *msglen)
|
||||
{
|
||||
|
||||
LWIP_UNUSED_ARG(user);
|
||||
LWIP_UNUSED_ARG(passwd);
|
||||
LWIP_UNUSED_ARG(msg);
|
||||
LWIP_UNUSED_ARG(msglen);
|
||||
|
||||
|
||||
/* The new lines are here align the file when
|
||||
* compared against the pppd 2.3.11 code */
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* XXX Fail until we decide that we want to support logins. */
|
||||
return (UPAP_AUTHNAK);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* plogout - Logout the user.
|
||||
*/
|
||||
static void
|
||||
plogout(void)
|
||||
{
|
||||
logged_in = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* 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(int unit)
|
||||
{
|
||||
LWIP_UNUSED_ARG(unit);
|
||||
/* XXX Fail until we decide that we want to support logins. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* get_pap_passwd - get a password for authenticating ourselves with
|
||||
* our peer using PAP. Returns 1 on success, 0 if no suitable password
|
||||
* could be found.
|
||||
*/
|
||||
static int
|
||||
get_pap_passwd(int unit, char *user, char *passwd)
|
||||
{
|
||||
LWIP_UNUSED_ARG(unit);
|
||||
/* normally we would reject PAP if no password is provided,
|
||||
but this causes problems with some providers (like CHT in Taiwan)
|
||||
who incorrectly request PAP and expect a bogus/empty password, so
|
||||
always provide a default user/passwd of "none"/"none"
|
||||
|
||||
@todo: This should be configured by the user, instead of being hardcoded here!
|
||||
*/
|
||||
if(user) {
|
||||
strcpy(user, "none");
|
||||
}
|
||||
if(passwd) {
|
||||
strcpy(passwd, "none");
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* have_pap_secret - check whether we have a PAP file with any
|
||||
* secrets that we could possibly use for authenticating the peer.
|
||||
*/
|
||||
static int
|
||||
have_pap_secret(void)
|
||||
{
|
||||
/* XXX Fail until we set up our passwords. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* have_chap_secret - check whether we have a CHAP file with a
|
||||
* secret that we could possibly use for authenticating `client'
|
||||
* on `server'. Either can be the null string, meaning we don't
|
||||
* know the identity yet.
|
||||
*/
|
||||
static int
|
||||
have_chap_secret(char *client, char *server, u32_t remote)
|
||||
{
|
||||
LWIP_UNUSED_ARG(client);
|
||||
LWIP_UNUSED_ARG(server);
|
||||
LWIP_UNUSED_ARG(remote);
|
||||
|
||||
/* XXX Fail until we set up our passwords. */
|
||||
return 0;
|
||||
}
|
||||
#if CHAP_SUPPORT
|
||||
|
||||
/*
|
||||
* get_secret - open the CHAP secret file and return the secret
|
||||
* for authenticating the given client on the given server.
|
||||
* (We could be either client or server).
|
||||
*/
|
||||
int get_secret( int unit, char *client, char *server, char *secret, int *secret_len, int save_addrs)
|
||||
int
|
||||
get_secret(int unit, char *client, char *server, char *secret, int *secret_len, int save_addrs)
|
||||
{
|
||||
#if 1
|
||||
int len;
|
||||
@@ -801,97 +1133,6 @@ int get_secret( int unit, char *client, char *server, char *secret, int *secret_
|
||||
}
|
||||
#endif /* CHAP_SUPPORT */
|
||||
|
||||
#if 0
|
||||
/*
|
||||
* login - Check the user name and password against the system
|
||||
* password database, and login the user if OK.
|
||||
*
|
||||
* returns:
|
||||
* UPAP_AUTHNAK: Login failed.
|
||||
* UPAP_AUTHACK: Login succeeded.
|
||||
* In either case, msg points to an appropriate message.
|
||||
*/
|
||||
static int
|
||||
login(char *user, char *passwd, char **msg, int *msglen)
|
||||
{
|
||||
/* XXX Fail until we decide that we want to support logins. */
|
||||
return (UPAP_AUTHNAK);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* logout - Logout the user.
|
||||
*/
|
||||
static void
|
||||
logout(void)
|
||||
{
|
||||
logged_in = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* 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(int unit)
|
||||
{
|
||||
LWIP_UNUSED_ARG(unit);
|
||||
/* XXX Fail until we decide that we want to support logins. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* get_pap_passwd - get a password for authenticating ourselves with
|
||||
* our peer using PAP. Returns 1 on success, 0 if no suitable password
|
||||
* could be found.
|
||||
*/
|
||||
static int
|
||||
get_pap_passwd(int unit, char *user, char *passwd)
|
||||
{
|
||||
LWIP_UNUSED_ARG(unit);
|
||||
/* normally we would reject PAP if no password is provided,
|
||||
but this causes problems with some providers (like CHT in Taiwan)
|
||||
who incorrectly request PAP and expect a bogus/empty password, so
|
||||
always provide a default user/passwd of "none"/"none"
|
||||
|
||||
@todo: This should be configured by the user, instead of being hardcoded here!
|
||||
*/
|
||||
if(user) {
|
||||
strcpy(user, "none");
|
||||
}
|
||||
if(passwd) {
|
||||
strcpy(passwd, "none");
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* have_pap_secret - check whether we have a PAP file with any
|
||||
* secrets that we could possibly use for authenticating the peer.
|
||||
*/
|
||||
static int
|
||||
have_pap_secret(void)
|
||||
{
|
||||
/* XXX Fail until we set up our passwords. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* have_chap_secret - check whether we have a CHAP file with a
|
||||
* secret that we could possibly use for authenticating `client'
|
||||
* on `server'. Either can be the null string, meaning we don't
|
||||
* know the identity yet.
|
||||
*/
|
||||
static int
|
||||
have_chap_secret(char *client, char *server, u32_t remote)
|
||||
{
|
||||
LWIP_UNUSED_ARG(client);
|
||||
LWIP_UNUSED_ARG(server);
|
||||
LWIP_UNUSED_ARG(remote);
|
||||
/* XXX Fail until we set up our passwords. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if 0 /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
/*
|
||||
@@ -942,7 +1183,7 @@ auth_ip_addr(int unit, u32_t addr)
|
||||
return ip_addr_check(addr, addresses[unit]);
|
||||
}
|
||||
|
||||
static int
|
||||
static int /* @todo: integrate this funtion into auth_ip_addr()*/
|
||||
ip_addr_check(u32_t addr, struct wordlist *addrs)
|
||||
{
|
||||
/* don't allow loopback or multicast address */
|
||||
@@ -971,7 +1212,58 @@ bad_ip_adrs(u32_t addr)
|
||||
|| IN_MULTICAST(addr) || IN_BADCLASS(addr);
|
||||
}
|
||||
|
||||
#if 0 /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
#if 0 /* UNUSED */ /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
/*
|
||||
* some_ip_ok - check a wordlist to see if it authorizes any
|
||||
* IP address(es).
|
||||
*/
|
||||
static int
|
||||
some_ip_ok(struct wordlist *addrs)
|
||||
{
|
||||
for (; addrs != 0; addrs = addrs->next) {
|
||||
if (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.
|
||||
*/
|
||||
static void
|
||||
check_access(FILE *f, char *filename)
|
||||
{
|
||||
struct stat sbuf;
|
||||
|
||||
if (fstat(fileno(f), &sbuf) < 0) {
|
||||
warn("cannot stat secret file %s: %m", filename);
|
||||
} else if ((sbuf.st_mode & (S_IRWXG | S_IRWXO)) != 0) {
|
||||
warn("Warning - secret file %s has world and/or group access",
|
||||
filename);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* scan_authfile - Scan an authorization file for a secret suitable
|
||||
* for authenticating `client' on `server'. The return value is -1
|
||||
* if no secret is found, otherwise >= 0. The return value has
|
||||
* NONWILD_CLIENT set if the secret didn't have "*" for the client, and
|
||||
* NONWILD_SERVER set if the secret didn't have "*" for the server.
|
||||
* Any following words on the line up to a "--" (i.e. address authorization
|
||||
* info) are placed in a wordlist and returned in *addrs. Any
|
||||
* following words (extra options) are placed in a wordlist and
|
||||
* returned in *opts.
|
||||
* We assume secret is NULL or points to MAXWORDLEN bytes of space.
|
||||
*/
|
||||
static int
|
||||
scan_authfile(FILE *f, char *client, char *server, char *secret, struct wordlist **addrs, struct wordlist **opts, char *filename)
|
||||
{
|
||||
/* We do not (currently) need this in lwip */
|
||||
return 0; /* dummy */
|
||||
}
|
||||
/*
|
||||
* free_wordlist - release memory allocated for a wordlist.
|
||||
*/
|
||||
@@ -979,13 +1271,68 @@ static void
|
||||
free_wordlist(struct wordlist *wp)
|
||||
{
|
||||
struct wordlist *next;
|
||||
|
||||
|
||||
while (wp != NULL) {
|
||||
next = wp->next;
|
||||
free(wp);
|
||||
wp = next;
|
||||
}
|
||||
}
|
||||
#endif /* 0 */ /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
|
||||
/*
|
||||
* auth_script_done - called when the auth-up or auth-down script
|
||||
* has finished.
|
||||
*/
|
||||
static void
|
||||
auth_script_done(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
|
||||
*/
|
||||
static void
|
||||
auth_script(char *script)
|
||||
{
|
||||
char strspeed[32];
|
||||
struct passwd *pw;
|
||||
char struid[32];
|
||||
char *user_name;
|
||||
char *argv[8];
|
||||
|
||||
if ((pw = getpwuid(getuid())) != NULL && pw->pw_name != NULL)
|
||||
user_name = pw->pw_name;
|
||||
else {
|
||||
slprintf(struid, sizeof(struid), "%d", getuid());
|
||||
user_name = struid;
|
||||
}
|
||||
slprintf(strspeed, sizeof(strspeed), "%d", baud_rate);
|
||||
|
||||
argv[0] = script;
|
||||
argv[1] = ifname;
|
||||
argv[2] = peer_authname;
|
||||
argv[3] = user_name;
|
||||
argv[4] = devnam;
|
||||
argv[5] = strspeed;
|
||||
argv[6] = NULL;
|
||||
|
||||
auth_script_pid = run_program(script, argv, 0, auth_script_done, NULL);
|
||||
}
|
||||
#endif /* 0 */ /* PAP_SUPPORT || CHAP_SUPPORT */
|
||||
#endif /* PPP_SUPPORT */
|
||||
|
||||
Reference in New Issue
Block a user