moved protos here from ipcp.h; print reason on terminate-request;

[ppp.git] / pppd / auth.c

diff --git a/pppd/auth.c b/pppd/auth.c
index 2faaf2d190afb27f45503c13a0f42c9f69a10809..c87f4003a244b2328c3aebfdce0602bf4057e67f 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -33,7 +33,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: auth.c,v 1.23 1996/05/28 00:47:01 paulus Exp $";
+static char rcsid[] = "$Id: auth.c,v 1.25 1996/07/01 01:10:24 paulus Exp $";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -59,6 +59,11 @@ extern char *crypt();
 #endif
 #endif
 
 #endif
 #endif
 

+#ifdef USE_PAM
+#include <security/pam_appl.h>
+#include <security/pam_modules.h>
+#endif
+

 #ifdef HAS_SHADOW
 #include <shadow.h>
 #include <shadow/pwauth.h>
 #ifdef HAS_SHADOW
 #include <shadow.h>
 #include <shadow/pwauth.h>


@@ -94,12 +99,18 @@ struct wordlist {
 #define FALSE  0
 #define TRUE   1
 
 #define FALSE  0
 #define TRUE   1
 

+/* The name by which the peer authenticated itself to us. */
+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() */
 static int logged_in;
 
 /* Records which authentication operations haven't completed yet. */
 static int auth_pending[NUM_PPP];
 
 /* Set if we have successfully called login() */
 static int logged_in;
 

+/* Set if we have run the /etc/ppp/auth-up script. */
+static int did_authup;
+

 /* List of addresses which the peer may use. */
 static struct wordlist *addresses[NUM_PPP];
 
 /* List of addresses which the peer may use. */
 static struct wordlist *addresses[NUM_PPP];
 


@@ -109,9 +120,12 @@ static int num_np_open;
 /* Number of network protocols which have come up. */
 static int num_np_up;
 
 /* Number of network protocols which have come up. */
 static int num_np_up;
 

+/* Set if we got the contents of passwd[] from the pap-secrets file. */
+static int passwd_from_file;
+

 /* Bits in auth_pending[] */
 /* Bits in auth_pending[] */

-#define UPAP_WITHPEER  1
-#define UPAP_PEER      2
+#define PAP_WITHPEER   1
+#define PAP_PEER       2

 #define CHAP_WITHPEER  4
 #define CHAP_PEER      8
 
 #define CHAP_WITHPEER  4
 #define CHAP_PEER      8
 


@@ -122,13 +136,14 @@ 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  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  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 *,
                               struct wordlist **, char *));
 static void free_wordlist __P((struct wordlist *));
 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 *,
                               struct wordlist **, char *));
 static void free_wordlist __P((struct wordlist *));

+static void auth_script __P((char *));

 
 /*
  * An Open on LCP has requested a change from Dead to Establish phase.
 
 /*
  * An Open on LCP has requested a change from Dead to Establish phase.


@@ -166,6 +181,10 @@ link_down(unit)
     int i;
     struct protent *protp;
 
     int i;
     struct protent *protp;
 

+    if (did_authup) {
+       auth_script(_PATH_AUTHDOWN);
+       did_authup = 0;
+    }

     for (i = 0; (protp = protocols[i]) != NULL; ++i) {
        if (!protp->enabled_flag)
            continue;
     for (i = 0; (protp = protocols[i]) != NULL; ++i) {
        if (!protp->enabled_flag)
            continue;


@@ -211,7 +230,6 @@ link_established(unit)
        if (!wo->neg_upap || !null_login(unit)) {
            syslog(LOG_WARNING, "peer refused to authenticate");
            lcp_close(unit, "peer refused to authenticate");
        if (!wo->neg_upap || !null_login(unit)) {
            syslog(LOG_WARNING, "peer refused to authenticate");
            lcp_close(unit, "peer refused to authenticate");

-           phase = PHASE_TERMINATE;

            return;
        }
     }
            return;
        }
     }


@@ -223,14 +241,19 @@ link_established(unit)
        auth |= CHAP_PEER;
     } else if (go->neg_upap) {
        upap_authpeer(unit);
        auth |= CHAP_PEER;
     } else if (go->neg_upap) {
        upap_authpeer(unit);

-       auth |= UPAP_PEER;
+       auth |= PAP_PEER;

     }
     if (ho->neg_chap) {
        ChapAuthWithPeer(unit, our_name, ho->chap_mdtype);
        auth |= CHAP_WITHPEER;
     } else if (ho->neg_upap) {
     }
     if (ho->neg_chap) {
        ChapAuthWithPeer(unit, our_name, ho->chap_mdtype);
        auth |= CHAP_WITHPEER;
     } else if (ho->neg_upap) {

+       if (passwd[0] == 0) {
+           passwd_from_file = 1;
+           if (!get_pap_passwd(passwd))
+               syslog(LOG_ERR, "No secret found for PAP login");
+       }

        upap_authwithpeer(unit, user, passwd);
        upap_authwithpeer(unit, user, passwd);

-       auth |= UPAP_WITHPEER;
+       auth |= PAP_WITHPEER;

     }
     auth_pending[unit] = auth;
 
     }
     auth_pending[unit] = auth;
 


@@ -247,6 +270,15 @@ network_phase(unit)
 {
     int i;
     struct protent *protp;
 {
     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;
+    }

 
     phase = PHASE_NETWORK;
 #if 0
 
     phase = PHASE_NETWORK;
 #if 0


@@ -273,15 +305,16 @@ auth_peer_fail(unit, protocol)
      * Authentication failure: take the link down
      */
     lcp_close(unit, "Authentication failed");
      * Authentication failure: take the link down
      */
     lcp_close(unit, "Authentication failed");

-    phase = PHASE_TERMINATE;

 }
 
 /*
  * The peer has been successfully authenticated using `protocol'.
  */
 void
 }
 
 /*
  * The peer has been successfully authenticated using `protocol'.
  */
 void

-auth_peer_success(unit, protocol)
+auth_peer_success(unit, protocol, name, namelen)

     int unit, protocol;
     int unit, protocol;

+    char *name;
+    int namelen;

 {
     int bit;
 
 {
     int bit;
 


@@ -290,7 +323,7 @@ auth_peer_success(unit, protocol)
        bit = CHAP_PEER;
        break;
     case PPP_PAP:
        bit = CHAP_PEER;
        break;
     case PPP_PAP:

-       bit = UPAP_PEER;
+       bit = PAP_PEER;

        break;
     default:
        syslog(LOG_WARNING, "auth_peer_success: unknown protocol %x",
        break;
     default:
        syslog(LOG_WARNING, "auth_peer_success: unknown protocol %x",


@@ -298,6 +331,14 @@ auth_peer_success(unit, protocol)
        return;
     }
 
        return;
     }
 

+    /*
+     * Save the authenticated name of the peer for later.
+     */
+    if (namelen > sizeof(peer_authname) - 1)
+       namelen = sizeof(peer_authname) - 1;
+    BCOPY(name, peer_authname, namelen);
+    peer_authname[namelen] = 0;
+

     /*
      * If there is no more authentication still to be done,
      * proceed to the network phase.
     /*
      * If there is no more authentication still to be done,
      * proceed to the network phase.


@@ -313,6 +354,8 @@ void
 auth_withpeer_fail(unit, protocol)
     int unit, protocol;
 {
 auth_withpeer_fail(unit, protocol)
     int unit, protocol;
 {

+    if (passwd_from_file)
+       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've failed to authenticate ourselves to our peer.
      * He'll probably take the link down, and there's not much


@@ -334,7 +377,9 @@ auth_withpeer_success(unit, protocol)
        bit = CHAP_WITHPEER;
        break;
     case PPP_PAP:
        bit = CHAP_WITHPEER;
        break;
     case PPP_PAP:

-       bit = UPAP_WITHPEER;
+       if (passwd_from_file)
+           BZERO(passwd, MAXSECRETLEN);
+       bit = PAP_WITHPEER;

        break;
     default:
        syslog(LOG_WARNING, "auth_peer_success: unknown protocol %x",
        break;
     default:
        syslog(LOG_WARNING, "auth_peer_success: unknown protocol %x",


@@ -419,7 +464,7 @@ void
 auth_check_options()
 {
     lcp_options *wo = &lcp_wantoptions[0];
 auth_check_options()
 {
     lcp_options *wo = &lcp_wantoptions[0];

-    lcp_options *ao = &lcp_allowoptions[0];
+    int can_auth;

     ipcp_options *ipwo = &ipcp_wantoptions[0];
     u_int32_t remote;
 
     ipcp_options *ipwo = &ipcp_wantoptions[0];
     u_int32_t remote;
 


@@ -437,21 +482,15 @@ auth_check_options()
 
     /*
      * Check whether we have appropriate secrets to use
 
     /*
      * Check whether we have appropriate secrets to use

-     * to authenticate ourselves and/or the peer.
+     * to authenticate the peer.

      */
      */

-    if (ao->neg_upap && passwd[0] == 0 && !get_upap_passwd())
-       ao->neg_upap = 0;
-    if (wo->neg_upap && !uselogin && !have_upap_secret())
-       wo->neg_upap = 0;
-    if (ao->neg_chap && !have_chap_secret(our_name, remote_name, (u_int32_t)0))
-       ao->neg_chap = 0;
-    if (wo->neg_chap) {
+    can_auth = wo->neg_upap && (uselogin || have_pap_secret());
+    if (!can_auth && wo->neg_chap) {

        remote = ipwo->accept_remote? 0: ipwo->hisaddr;
        remote = ipwo->accept_remote? 0: ipwo->hisaddr;

-       if (!have_chap_secret(remote_name, our_name, remote))
-           wo->neg_chap = 0;
+       can_auth = have_chap_secret(remote_name, our_name, remote);

     }
 
     }
 

-    if (auth_required && !wo->neg_chap && !wo->neg_upap) {
+    if (auth_required && !can_auth) {

        fprintf(stderr, "\
 pppd: peer authentication required but no suitable secret(s) found\n");
        exit(1);
        fprintf(stderr, "\
 pppd: peer authentication required but no suitable secret(s) found\n");
        exit(1);


@@ -459,6 +498,34 @@ pppd: peer authentication required but no suitable secret(s) found\n");
 
 }
 
 
 }
 

+/*
+ * auth_reset - called when LCP is starting negotiations to recheck
+ * authentication options, i.e. whether we have appropriate secrets
+ * to use for authenticating ourselves and/or the peer.
+ */
+void
+auth_reset(unit)
+    int unit;
+{
+    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(our_name, remote_name, (u_int32_t)0);
+
+    if (go->neg_upap && !uselogin && !have_pap_secret())
+       go->neg_upap = 0;
+    if (go->neg_chap) {
+       remote = ipwo->accept_remote? 0: ipwo->hisaddr;
+       if (!have_chap_secret(remote_name, our_name, remote))
+           go->neg_chap = 0;
+    }
+
+}
+

 
 /*
  * check_passwd - Check the user name and passwd against the PAP secrets
 
 /*
  * check_passwd - Check the user name and passwd against the PAP secrets


@@ -497,9 +564,10 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
     passwd[passwdlen] = '\0';
     BCOPY(auser, user, userlen);
     user[userlen] = '\0';
     passwd[passwdlen] = '\0';
     BCOPY(auser, user, userlen);
     user[userlen] = '\0';

+    *msg = (char *) 0;

 
     /*
 
     /*

-     * Open the file of upap secrets and scan for a suitable secret
+     * Open the file of pap secrets and scan for a suitable secret

      * for authenticating this user.
      */
     filename = _PATH_UPAPFILE;
      * for authenticating this user.
      */
     filename = _PATH_UPAPFILE;


@@ -533,7 +601,8 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
     }
 
     if (ret == UPAP_AUTHNAK) {
     }
 
     if (ret == UPAP_AUTHNAK) {

-       *msg = "Login incorrect";
+        if (*msg == (char *) 0)
+           *msg = "Login incorrect";

        *msglen = strlen(*msg);
        /*
         * Frustrate passwd stealer programs.
        *msglen = strlen(*msg);
        /*
         * Frustrate passwd stealer programs.


@@ -552,13 +621,17 @@ check_passwd(unit, auser, userlen, apasswd, passwdlen, msg, msglen)
 
     } else {
        attempts = 0;                   /* Reset count */
 
     } else {
        attempts = 0;                   /* Reset count */

-       *msg = "Login ok";
+       if (*msg == (char *) 0)
+           *msg = "Login ok";

        *msglen = strlen(*msg);
        if (addresses[unit] != NULL)
            free_wordlist(addresses[unit]);
        addresses[unit] = addrs;
     }
 
        *msglen = strlen(*msg);
        if (addresses[unit] != NULL)
            free_wordlist(addresses[unit]);
        addresses[unit] = addrs;
     }
 

+    BZERO(passwd, sizeof(passwd));
+    BZERO(secret, sizeof(secret));
+

     return ret;
 }
 
     return ret;
 }
 


@@ -623,6 +696,20 @@ struct     spwd    *sp;
 }
 #endif
 
 }
 #endif
 

+
+/*
+ * This function is needed for PAM. However, it should not be called.
+ * If it is, return the error code.
+ */
+
+#ifdef USE_PAM
+static int pam_conv(int num_msg, const struct pam_message **msg,
+                   struct pam_response **resp, void *appdata_ptr)
+{
+    return PAM_CONV_ERR;
+}
+#endif
+

 /*
  * login - Check the user name and password against the system
  * password database, and login the user if OK.
 /*
  * login - Check the user name and password against the system
  * password database, and login the user if OK.


@@ -632,6 +719,7 @@ struct      spwd    *sp;
  *     UPAP_AUTHACK: Login succeeded.
  * In either case, msg points to an appropriate message.
  */
  *     UPAP_AUTHACK: Login succeeded.
  * In either case, msg points to an appropriate message.
  */

+

 static int
 login(user, passwd, msg, msglen)
     char *user;
 static int
 login(user, passwd, msg, msglen)
     char *user;


@@ -639,9 +727,52 @@ login(user, passwd, msg, msglen)
     char **msg;
     int *msglen;
 {
     char **msg;
     int *msglen;
 {

+    char *tty;
+
+#ifdef USE_PAM
+    struct pam_conv pam_conversation;
+    pam_handle_t *pamh;
+    int pam_error;
+    char *pass;
+    char *dev;
+/*
+ * 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);
+    if (pam_error != PAM_SUCCESS) {
+        *msg = (char *) pam_strerror (pam_error);
+       return UPAP_AUTHNAK;
+    }
+/*
+ * Define the fields for the credintial validation
+ */
+    (void) pam_set_item (pamh, PAM_AUTHTOK, passwd);
+    (void) pam_set_item (pamh, PAM_TTY, devnam);
+/*
+ * Validate the user
+ */
+    pam_error = pam_authenticate (pamh, PAM_SILENT);
+    if (pam_error == PAM_SUCCESS)
+        pam_error = pam_acct_mgmt (pamh, PAM_SILENT);
+
+    *msg = (char *) pam_strerror (pam_error);
+/*
+ * Clean up the mess
+ */
+    (void) pam_end (pamh, pam_error);
+
+    if (pam_error != PAM_SUCCESS)
+        return UPAP_AUTHNAK;
+/*
+ * Use the non-PAM methods directly
+ */
+#else /* #ifdef USE_PAM */
+

     struct passwd *pw;
     char *epasswd;
     struct passwd *pw;
     char *epasswd;

-    char *tty;

 
 #ifdef HAS_SHADOW
     struct spwd *spwd;
 
 #ifdef HAS_SHADOW
     struct spwd *spwd;


@@ -690,6 +821,7 @@ login(user, passwd, msg, msglen)
        return (UPAP_AUTHNAK);
     }
 #endif
        return (UPAP_AUTHNAK);
     }
 #endif

+#endif /* #ifdef USE_PAM */

 
     syslog(LOG_INFO, "user %s logged in", user);
 
 
     syslog(LOG_INFO, "user %s logged in", user);
 


@@ -737,7 +869,7 @@ null_login(unit)
     char secret[MAXWORDLEN];
 
     /*
     char secret[MAXWORDLEN];
 
     /*

-     * Open the file of upap secrets and scan for a suitable secret.
+     * Open the file of pap secrets and scan for a suitable secret.

      * We don't accept a wildcard client.
      */
     filename = _PATH_UPAPFILE;
      * We don't accept a wildcard client.
      */
     filename = _PATH_UPAPFILE;


@@ -749,6 +881,7 @@ null_login(unit)
 
     i = scan_authfile(f, "", our_name, (u_int32_t)0, secret, &addrs, filename);
     ret = i >= 0 && (i & NONWILD_CLIENT) != 0 && secret[0] == 0;
 
     i = scan_authfile(f, "", our_name, (u_int32_t)0, secret, &addrs, filename);
     ret = i >= 0 && (i & NONWILD_CLIENT) != 0 && secret[0] == 0;

+    BZERO(secret, sizeof(secret));

 
     if (ret) {
        if (addresses[unit] != NULL)
 
     if (ret) {
        if (addresses[unit] != NULL)


@@ -762,12 +895,12 @@ null_login(unit)
 
 
 /*
 
 
 /*

- * get_upap_passwd - get a password for authenticating ourselves with
+ * 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
  * our peer using PAP.  Returns 1 on success, 0 if no suitable password
  * could be found.
  */
 static int

-get_upap_passwd()
+get_pap_passwd(char *passwd)

 {
     char *filename;
     FILE *f;
 {
     char *filename;
     FILE *f;


@@ -780,21 +913,25 @@ get_upap_passwd()
     if (f == NULL)
        return 0;
     check_access(f, filename);
     if (f == NULL)
        return 0;
     check_access(f, filename);

-    if (scan_authfile(f, user, remote_name, (u_int32_t)0,
-                     secret, NULL, filename) < 0)
+    if (scan_authfile(f, user,
+                     remote_name[0]? remote_name: NULL,
+                     (u_int32_t)0, secret, NULL, filename) < 0)

        return 0;
        return 0;

-    strncpy(passwd, secret, MAXSECRETLEN);
-    passwd[MAXSECRETLEN-1] = 0;
+    if (passwd != NULL) {
+       strncpy(passwd, secret, MAXSECRETLEN);
+       passwd[MAXSECRETLEN-1] = 0;
+    }
+    BZERO(secret, sizeof(secret));

     return 1;
 }
 
 
 /*
     return 1;
 }
 
 
 /*

- * have_upap_secret - check whether we have a PAP file with any
+ * have_pap_secret - check whether we have a PAP file with any

  * secrets that we could possibly use for authenticating the peer.
  */
 static int
  * secrets that we could possibly use for authenticating the peer.
  */
 static int

-have_upap_secret()
+have_pap_secret()

 {
     FILE *f;
     int ret;
 {
     FILE *f;
     int ret;


@@ -901,6 +1038,7 @@ get_secret(unit, client, server, secret, secret_len, save_addrs)
        len = MAXSECRETLEN;
     }
     BCOPY(secbuf, secret, len);
        len = MAXSECRETLEN;
     }
     BCOPY(secbuf, secret, len);

+    BZERO(secbuf, sizeof(secbuf));

     *secret_len = len;
 
     return 1;
     *secret_len = len;
 
     return 1;


@@ -1200,3 +1338,36 @@ free_wordlist(wp)
        wp = next;
     }
 }
        wp = next;
     }
 }

+
+/*
+ * auth_script - execute a script with arguments
+ * interface-name peer-name real-user tty speed
+ */
+static void
+auth_script(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 {
+       sprintf(struid, "%d", getuid());
+       user_name = struid;
+    }
+    sprintf(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;
+
+    run_program(script, argv, 0);
+}