added pam support

diff --git a/job.c b/job.c
index e3d1d92d222a4480c4d0ab5339c17c3c4ef6527e..442c56d872f77ce59984324ce56004cd79606ec5 100644 (file)
--- a/job.c
+++ b/job.c
@@ -22,9 +22,10 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: job.c,v 1.42 2001-08-20 10:53:22 thib Exp $ */
+ /* $Id: job.c,v 1.43 2001-09-12 13:35:09 thib Exp $ */
 
 #include "fcron.h"
+
 #include "job.h"
 
 void sig_dfl(void);
@@ -33,18 +34,25 @@ void end_mailer(CL *line, int status);
 
 
 int
-change_user(char *user_name)
+change_user(struct CL *cl)
 {
     struct passwd *pas;
+#ifdef HAVE_LIBPAM
+    int    retcode = 0;
+    const char * const * env;
+    char *a_pam_user;
+#endif
+
 
     /* First, restore umask to default */
     umask (saved_umask);
 
     /* Obtain password entry and change privileges */
 
-    if ((pas = getpwnam(user_name)) == NULL) 
-        die("failed to get passwd fields for user \"%s\"", user_name);
+    if ((pas = getpwnam(cl->cl_runas)) == NULL) 
+        die("failed to get passwd fields for user \"%s\"", cl->cl_runas);
     
+/* #ifndef USE_PAM */
 #ifdef HAVE_SETENV
     setenv("USER", pas->pw_name, 1);
     setenv("HOME", pas->pw_dir, 1);
@@ -60,6 +68,35 @@ change_user(char *user_name)
        putenv( strncat(buf, pas->pw_shell, sizeof(buf)-7) );
     }
 #endif /* HAVE_SETENV */
+/* #endif /* USE_PAM */
+
+#ifdef HAVE_LIBPAM
+    /* Open PAM session for the user and obtain any security
+       credentials we might need */
+
+    retcode = pam_start("fcron", pas->pw_name, &apamconv, &pamh);
+    if (retcode != PAM_SUCCESS) die_pame(pamh, retcode, "Could not start PAM for %s",
+                                        cl->cl_shell);
+    retcode = pam_acct_mgmt(pamh, PAM_SILENT);
+    if (retcode != PAM_SUCCESS) die_pame(pamh, retcode, "Could not init PAM account "
+                                        "management for %s", cl->cl_shell);
+    retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT);
+    if (retcode != PAM_SUCCESS) die_pame(pamh, retcode, "Could not set PAM credentials "
+                                        "for %s", cl->cl_shell);
+    retcode = pam_open_session(pamh, PAM_SILENT);
+    if (retcode != PAM_SUCCESS) die_pame(pamh, retcode, "Could not open PAM session "
+                                        "for %s", cl->cl_shell);
+
+    env = (const char * const *) pam_getenvlist(pamh);
+    while (env && *env) {
+       if (putenv((char*) *env)) die_e("Could not copy PAM environment");
+       env++;
+    }
+
+    /* Close the log here, because PAM calls openlog(3) and
+       our log messages could go to the wrong facility */
+    xcloselog();
+#endif /* USE_PAM */
 
     /* Change running state to the user in question */
     if (initgroups(pas->pw_name, pas->pw_gid) < 0)
@@ -158,7 +195,7 @@ run_job(struct exe *exeent)
            mailpos = lseek(mailfd, 0, SEEK_END);
        }
 
-       if (change_user(line->cl_runas) < 0)
+       if (change_user(line) < 0)
            return ;
 
        sig_dfl();
@@ -275,14 +312,33 @@ end_job(CL *line, int status, int mailfd, short mailpos)
     }
     else if (WIFEXITED(status))
        warn("Job %s terminated (exit status: %d)%s",
-               line->cl_shell, WEXITSTATUS(status), m);
+            line->cl_shell, WEXITSTATUS(status), m);
     else if (WIFSIGNALED(status))
        error("Job %s terminated due to signal %d%s",
              line->cl_shell, WTERMSIG(status), m);
     else /* is this possible? */
        error("Job %s terminated abnormally %s", line->cl_shell, m);
 
-    if (mail_output == 1) launch_mailer(line, mailfd);
+#ifdef HAVE_LIBPAM
+    /* we close the PAM session before running the mailer command :
+     * it avoids a fork(), and we use PAM anyway to control whether a user command
+     * should be run or not.
+     * We consider that the administrator can use a PAM compliant mailer to control
+     * whether a mail can be sent or not.
+     * It should be ok like that, otherwise contact me ... -tg */
+
+    /* Aiee! we may need to be root to do this properly under Linux.  Let's
+       hope we're more l33t than PAM and try it as non-root. If someone
+       complains, I'll fix this :P -hmh */
+    pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
+    pam_end(pamh, pam_close_session(pamh, PAM_SILENT));
+#endif
+
+    if (mail_output == 1) {
+       launch_mailer(line, mailfd);
+       /* never reached */
+       die_e("Internal error: launch_mailer returned");
+    }
 
     /* if mail is sent, execution doesn't get here : close /dev/null */
     if ( close(mailfd) != 0 )

diff --git a/log.c b/log.c
index 3b221c43bdd8a3394e54ac305d27ba94852152c9..533eeccc405262620edca172ce01d030df47987d 100644 (file)
--- a/log.c
+++ b/log.c
@@ -22,13 +22,14 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: log.c,v 1.8 2001-07-09 11:49:17 thib Exp $ */
+ /* $Id: log.c,v 1.9 2001-09-12 13:37:13 thib Exp $ */
 
 /* This code is inspired by Anacron's sources of
    Itai Tzur <itzur@actcom.co.il> */
 
 
 #include "fcron.h"
+
 #include "log.h"
 
 static void xopenlog(void);
@@ -132,6 +133,34 @@ log_e(int priority, char *fmt, va_list args)
 }
 
 
+#ifdef HAVE_LIBPAM
+/* Same as log(), but also appends an error description corresponding
+ * to the pam_error. */
+static void
+log_pame(int priority, pam_handle_t *pamh, int pamerrno, char *fmt, va_list args)
+{
+    char *msg;
+
+    if ( (msg = make_msg(fmt, args)) == NULL )
+        return ;
+
+    xopenlog();
+    syslog(priority, "%s: %s", msg, pam_strerror(pamh, pamerrno));
+
+    if (foreground == 1) {
+        time_t t = time(NULL);
+        struct tm *ft;
+        char date[30];
+
+        ft = localtime(&t);
+        date[0] = '\0';
+        strftime(date, sizeof(date), "%H:%M:%S", ft);
+        fprintf(stderr, "%s %s: %s\n", date, msg, pam_strerror(pamh, pamerrno));
+    }
+}
+#endif
+
+
 /* Log an "explain" level message */
 void
 explain(char *fmt, ...)
@@ -238,6 +267,25 @@ die_e(char *fmt, ...)
 
 }  
 
+#ifdef HAVE_LIBPAM
+/* Log a "complain" level message, with a PAM error description, and exit */
+void
+die_pame(pam_handle_t *pamh, int pamerrno, char *fmt, ...)
+{
+    va_list args;
+
+    xcloselog();  /* PAM is likely to have used openlog() */
+
+    va_start(args, fmt);
+    log_pame(COMPLAIN_LEVEL, pamh, pamerrno, fmt, args);
+    va_end(args);
+    pam_end(pamh, pamerrno);  
+    if (getpid() == daemon_pid) error("Aborted");
+
+    exit(EXIT_ERR);
+
+}
+#endif
 
 void
 Debug(char *fmt, ...)

diff --git a/log.h b/log.h
index e0fdbff095014eac3e8f2ea59ef9178077781ae0..c422f4aa50179426272e7bcc46cca0a2be93c8f3 100644 (file)
--- a/log.h
+++ b/log.h
@@ -21,7 +21,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: log.h,v 1.2 2001-05-15 00:43:29 thib Exp $ */
+ /* $Id: log.h,v 1.3 2001-09-12 13:37:31 thib Exp $ */
 
 #ifndef __LOG_H__
 #define __LOG_H__
@@ -37,6 +37,9 @@ extern void error(char *fmt, ...);
 extern void error_e(char *fmt, ...);
 extern void die(char *fmt, ...);
 extern void die_e(char *fmt, ...);
+#ifdef HAVE_LIBPAM
+extern void die_pame(pam_handle_t *pamh, int pamerrno, char *fmt, ...);
+#endif
 extern void Debug(char *fmt, ...);
 
 #endif /* __LOG_H__ */