Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pppd: Add pap-secrets and chap-secrets options #513

Merged
merged 1 commit into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions pppd/auth.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
#include <grp.h>
#include <string.h>
#include <strings.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
Expand Down Expand Up @@ -253,6 +254,8 @@ bool explicit_remote = 0; /* User specified explicit remote name */
bool explicit_user = 0; /* Set if "user" option supplied */
bool explicit_passwd = 0; /* Set if "password" option supplied */
char remote_name[MAXNAMELEN]; /* Peer's name for authentication */
char path_upapfile[MAXPATHLEN]; /* Pathname of pap-secrets file */
char path_chapfile[MAXPATHLEN]; /* Pathname of chap-secrets file */

#if defined(PPP_WITH_EAPTLS) || defined(PPP_WITH_PEAP)
char *cacert_file = NULL; /* CA certificate file (pem format) */
Expand Down Expand Up @@ -417,6 +420,14 @@ struct option auth_options[] = {
"Set remote name for authentication", OPT_PRIO | OPT_STATIC,
&explicit_remote, MAXNAMELEN },

{ "pap-secrets", o_string, path_upapfile,
"Set pathname of pap-secrets", OPT_PRIO | OPT_PRIV | OPT_STATIC,
NULL, MAXPATHLEN },

{ "chap-secrets", o_string, path_chapfile,
"Set pathname of chap-secrets", OPT_PRIO | OPT_PRIV | OPT_STATIC,
NULL, MAXPATHLEN },

{ "login", o_bool, &uselogin,
"Use system password database for PAP", OPT_A2COPY | 1 ,
&session_mgmt },
Expand Down Expand Up @@ -1538,7 +1549,7 @@ check_passwd(int unit,
* Open the file of pap secrets and scan for a suitable secret
* for authenticating this user.
*/
filename = PPP_PATH_UPAPFILE;
filename = path_upapfile;
addrs = opts = NULL;
ret = UPAP_AUTHNAK;
f = fopen(filename, "r");
Expand Down Expand Up @@ -1639,7 +1650,7 @@ null_login(int unit)
* Open the file of pap secrets and scan for a suitable secret.
*/
if (ret <= 0) {
filename = PPP_PATH_UPAPFILE;
filename = path_upapfile;
addrs = NULL;
f = fopen(filename, "r");
if (f == NULL)
Expand Down Expand Up @@ -1686,7 +1697,7 @@ get_pap_passwd(char *passwd)
return ret;
}

filename = PPP_PATH_UPAPFILE;
filename = path_upapfile;
f = fopen(filename, "r");
if (f == NULL)
return 0;
Expand Down Expand Up @@ -1723,7 +1734,7 @@ have_pap_secret(int *lacks_ipp)
return ret;
}

filename = PPP_PATH_UPAPFILE;
filename = path_upapfile;
f = fopen(filename, "r");
if (f == NULL)
return 0;
Expand Down Expand Up @@ -1765,7 +1776,7 @@ have_chap_secret(char *client, char *server,
}
}

filename = PPP_PATH_CHAPFILE;
filename = path_chapfile;
f = fopen(filename, "r");
if (f == NULL)
return 0;
Expand Down Expand Up @@ -1851,7 +1862,7 @@ get_secret(int unit, char *client, char *server,
return 0;
}
} else {
filename = PPP_PATH_CHAPFILE;
filename = path_chapfile;
addrs = NULL;
secbuf[0] = 0;

Expand Down
3 changes: 3 additions & 0 deletions pppd/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,9 @@ main(int argc, char *argv[])
struct protent *protp;
char numbuf[16];

strlcpy(path_upapfile, PPP_PATH_UPAPFILE, MAXPATHLEN);
strlcpy(path_chapfile, PPP_PATH_CHAPFILE, MAXPATHLEN);

strlcpy(path_ipup, PPP_PATH_IPUP, MAXPATHLEN);
strlcpy(path_ipdown, PPP_PATH_IPDOWN, MAXPATHLEN);

Expand Down
2 changes: 2 additions & 0 deletions pppd/pppd-private.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ extern bool uselogin; /* Use /etc/passwd for checking PAP */
extern bool session_mgmt; /* Do session management (login records) */
extern char our_name[MAXNAMELEN];/* Our name for authentication purposes */
extern char remote_name[MAXNAMELEN]; /* Peer's name for authentication */
extern char path_upapfile[];/* Pathname of pap-secrets file */
extern char path_chapfile[];/* Pathname of chap-secrets file */
extern bool explicit_remote;/* remote_name specified with remotename opt */
extern bool demand; /* Do dial-on-demand */
extern char *ipparam; /* Extra parameter for ip up/down scripts */
Expand Down