Marcela Mašláňová 92956e
diff -up at-3.1.13/atd.c.selinux at-3.1.13/atd.c
Marcela Mašláňová 92956e
--- at-3.1.13/atd.c.selinux	2011-07-29 13:58:54.282221007 +0200
Marcela Mašláňová 92956e
+++ at-3.1.13/atd.c	2011-07-29 14:02:46.563175313 +0200
Marcela Mašláňová 92956e
@@ -83,6 +83,14 @@
Marcela Mašláňová 92956e
 #include "getloadavg.h"
Marcela Mašláňová 92956e
 #endif
Marcela Mašláňová 92956e
 
Marcela Mašláňová 92956e
+#ifdef WITH_SELINUX
Marcela Mašláňová 92956e
+#include <selinux/selinux.h>
Marcela Mašláňová 92956e
+#include <selinux/get_context_list.h>
Marcela Mašláňová 92956e
+int selinux_enabled=0;
Marcela Mašláňová 92956e
+#include <selinux/flask.h>
Marcela Mašláňová 92956e
+#include <selinux/av_permissions.h>
Marcela Mašláňová 92956e
+#endif
Marcela Mašláňová 92956e
+
Marcela Mašláňová 92956e
 #ifndef LOG_ATD
Marcela Mašláňová 92956e
 #define LOG_ATD        LOG_DAEMON
Marcela Mašláňová 92956e
 #endif
Marcela Mašláňová 92956e
@@ -202,6 +210,68 @@ myfork()
Marcela Mašláňová 92956e
 #define ATD_MAIL_NAME    "mailx"
Marcela Mašláňová 92956e
 #endif
Marcela Mašláňová 92956e
 
Marcela Mašláňová 92956e
+#ifdef WITH_SELINUX
Marcela Mašláňová 92956e
+static int set_selinux_context(const char *name, const char *filename) {
Marcela Mašláňová 92956e
+       security_context_t user_context=NULL;
Marcela Mašláňová 92956e
+       security_context_t  file_context=NULL;
Marcela Mašláňová 92956e
+       struct av_decision avd;
Marcela Mašláňová 92956e
+       int retval=-1;
Marcela Mašláňová 92956e
+       char *seuser=NULL;
Marcela Mašláňová 92956e
+       char *level=NULL;
Marcela Mašláňová 92956e
+
Marcela Mašláňová 92956e
+       if (getseuserbyname(name, &seuser, &level) == 0) {
Marcela Mašláňová 92956e
+               retval=get_default_context_with_level(seuser, level, NULL, &user_context);
Marcela Mašláňová 92956e
+               free(seuser);
Marcela Mašláňová 92956e
+               free(level);
Marcela Mašláňová 92956e
+               if (retval) {
Marcela Mašláňová 92956e
+                       if (security_getenforce()==1) {
Marcela Mašláňová 92956e
+                               perr("execle: couldn't get security context for user %s\n", name);
Marcela Mašláňová 92956e
+                       } else {
Marcela Mašláňová 92956e
+                               syslog(LOG_ERR, "execle: couldn't get security context for user %s\n", name);
Marcela Mašláňová 92956e
+                               return -1;
Marcela Mašláňová 92956e
+                       }
Marcela Mašláňová 92956e
+               }
Marcela Mašláňová 92956e
+       }
Marcela Mašláňová 92956e
+
Marcela Mašláňová 92956e
+       /*
Marcela Mašláňová 92956e
+       * Since crontab files are not directly executed,
Marcela Mašláňová 92956e
+       * crond must ensure that the crontab file has
Marcela Mašláňová 92956e
+       * a context that is appropriate for the context of
Marcela Mašláňová 92956e
+       * the user cron job.  It performs an entrypoint
Marcela Mašláňová 92956e
+       * permission check for this purpose.
Marcela Mašláňová 92956e
+       */
Marcela Mašláňová 92956e
+       if (fgetfilecon(STDIN_FILENO, &file_context) < 0)
Marcela Mašláňová 92956e
+               perr("fgetfilecon FAILED %s", filename);
Marcela Mašláňová 92956e
+
Marcela Mašláňová 92956e
+       retval = security_compute_av(user_context,
Marcela Mašláňová 92956e
+                                    file_context,
Marcela Mašláňová 92956e
+                                    SECCLASS_FILE,
Marcela Mašláňová 92956e
+                                    FILE__ENTRYPOINT,
Marcela Mašláňová 92956e
+                                    &avd);
Marcela Mašláňová 92956e
+       freecon(file_context);
Marcela Mašláňová 92956e
+       if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) {
Marcela Mašláňová 92956e
+               if (security_getenforce()==1) {
Marcela Mašláňová 92956e
+                       perr("Not allowed to set exec context to %s for user  %s\n", user_context,name);
Marcela Mašláňová 92956e
+               } else {
Marcela Mašláňová 92956e
+                       syslog(LOG_ERR, "Not allowed to set exec context to %s for user  %s\n", user_context,name);
Marcela Mašláňová 92956e
+                       retval = -1;
Marcela Mašláňová 92956e
+                       goto err;
Marcela Mašláňová 92956e
+               }
Marcela Mašláňová 92956e
+       }
Marcela Mašláňová 92956e
+       if (setexeccon(user_context) < 0) {
Marcela Mašláňová 92956e
+               if (security_getenforce()==1) {
Marcela Mašláňová 92956e
+                       perr("Could not set exec context to %s for user  %s\n", user_context,name);
Marcela Mašláňová 92956e
+                       retval = -1;
Marcela Mašláňová 92956e
+               } else {
Marcela Mašláňová 92956e
+                       syslog(LOG_ERR, "Could not set exec context to %s for user  %s\n", user_context,name);
Marcela Mašláňová 92956e
+               }
Marcela Mašláňová 92956e
+       }
Marcela Mašláňová 92956e
+  err:
Marcela Mašláňová 92956e
+       freecon(user_context);
Marcela Mašláňová 92956e
+       return 0;
Marcela Mašláňová 92956e
+}
Marcela Mašláňová 92956e
+#endif
Marcela Mašláňová 92956e
+
Marcela Mašláňová 92956e
 static void
Marcela Mašláňová 92956e
 run_file(const char *filename, uid_t uid, gid_t gid)
Marcela Mašláňová 92956e
 {
Marcela Mašláňová 92956e
@@ -445,9 +515,24 @@ run_file(const char *filename, uid_t uid
Marcela Mašláňová 92956e
                 perr("Cannot reset signal handler to default");
Marcela Mašláňová 92956e
 
Marcela Mašláňová 92956e
 	    chdir("/");
Marcela Mašláňová 92956e
+#ifdef WITH_SELINUX
Marcela Mašláňová 92956e
+            if (selinux_enabled > 0) {
Marcela Mašláňová 92956e
+                if (set_selinux_context(pentry->pw_name, filename) < 0)
Marcela Mašláňová 92956e
+                       perr("SELinux Failed to set context\n");
Marcela Mašláňová 92956e
+            }
Marcela Mašláňová 92956e
+#endif
Marcela Mašláňová 92956e
 
Marcela Mašláňová 92956e
 	    if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0)
Marcela Mašláňová 92956e
 		perr("Exec failed for /bin/sh");
Marcela Mašláňová 92956e
+//add for fedora
Marcela Mašláňová 92956e
+#ifdef WITH_SELINUX
Marcela Mašláňová 92956e
+		if (selinux_enabled>0)
Marcela Mašláňová 92956e
+			if (setexeccon(NULL) < 0)
Marcela Mašláňová 92956e
+				if (security_getenforce()==1)
Marcela Mašláňová 92956e
+					perr("Could not resset exec context for user %s\n", pentry->pw_name);
Marcela Mašláňová 92956e
+#endif
Marcela Mašláňová 92956e
+//end
Marcela Mašláňová 92956e
+//add for fedora
Marcela Mašláňová 92956e
 #ifdef  WITH_PAM
Marcela Mašláňová 92956e
 	    if ( ( nenvp != &nul ) && (pam_envp != 0L)  && (*pam_envp != 0L))
Marcela Mašláňová 92956e
 	    {
Marcela Mašláňová 92956e
@@ -751,6 +836,10 @@ main(int argc, char *argv[])
Marcela Mašláňová 92956e
     struct passwd *pwe;
Marcela Mašláňová 92956e
     struct group *ge;
Marcela Mašláňová 92956e
 
Marcela Mašláňová 92956e
+#ifdef WITH_SELINUX
Marcela Mašláňová 92956e
+    selinux_enabled=is_selinux_enabled();
Marcela Mašláňová 92956e
+#endif
Marcela Mašláňová 92956e
+
Marcela Mašláňová 92956e
 /* We don't need root privileges all the time; running under uid and gid
Marcela Mašláňová 92956e
  * daemon is fine.
Marcela Mašláňová 92956e
  */
Marcela Mašláňová 92956e
diff -up at-3.1.13/config.h.in.selinux at-3.1.13/config.h.in
Marcela Mašláňová 92956e
--- at-3.1.13/config.h.in.selinux	2011-07-29 13:58:54.283221003 +0200
Marcela Mašláňová 92956e
+++ at-3.1.13/config.h.in	2011-07-29 13:58:54.289220979 +0200
Marcela Mašláňová 92956e
@@ -71,6 +71,9 @@
Marcela Mašláňová 92956e
 /* Define if you are building with_pam */
Marcela Mašláňová 92956e
 #undef WITH_PAM
Marcela Mašláňová 92956e
 
Marcela Mašláňová 92956e
+/* Define if you are building with_selinux  */
Marcela Mašláňová 92956e
+#undef WITH_SELINUX
Marcela Mašláňová 92956e
+
Marcela Mašláňová 92956e
 /* Define to 1 if you have the `pstat_getdynamic' function. */
Marcela Mašláňová 92956e
 #undef HAVE_PSTAT_GETDYNAMIC
Marcela Mašláňová 92956e
 
Marcela Mašláňová 92956e
diff -up at-3.1.13/configure.ac.selinux at-3.1.13/configure.ac
Marcela Mašláňová 92956e
--- at-3.1.13/configure.ac.selinux	2011-07-29 13:58:54.284220999 +0200
Marcela Mašláňová 92956e
+++ at-3.1.13/configure.ac	2011-07-29 13:58:54.290220975 +0200
Marcela Mašláňová 92956e
@@ -266,5 +266,13 @@ AC_ARG_WITH(daemon_groupname,
Marcela Mašláňová 92956e
 )
Marcela Mašláňová 92956e
 AC_SUBST(DAEMON_GROUPNAME)
Marcela Mašláňová 92956e
 
Marcela Mašláňová 92956e
+AC_ARG_WITH(selinux,
Marcela Mašláňová 92956e
+[ --with-selinux       Define to run with selinux],
Marcela Mašláňová 92956e
+AC_DEFINE(WITH_SELINUX),
Marcela Mašláňová 92956e
+)
Marcela Mašláňová 92956e
+AC_CHECK_LIB(selinux, is_selinux_enabled, SELINUXLIB=-lselinux)
Marcela Mašláňová 92956e
+AC_SUBST(SELINUXLIB)
Marcela Mašláňová 92956e
+AC_SUBST(WITH_SELINUX)
Marcela Mašláňová 92956e
+
Marcela Mašláňová 92956e
 AC_CONFIG_FILES(Makefile atrun atd.8 atrun.8 at.1 at.allow.5 batch)
Marcela Mašláňová 92956e
 AC_OUTPUT
Marcela Mašláňová 92956e
diff -up at-3.1.13/Makefile.in.selinux at-3.1.13/Makefile.in
Marcela Mašláňová 92956e
--- at-3.1.13/Makefile.in.selinux	2011-07-29 13:58:54.270221055 +0200
Marcela Mašláňová 92956e
+++ at-3.1.13/Makefile.in	2011-07-29 13:58:54.290220975 +0200
Marcela Mašláňová 92956e
@@ -39,6 +39,8 @@ LIBS		= @LIBS@
Marcela Mašláňová 92956e
 LIBOBJS		= @LIBOBJS@
Marcela Mašláňová 92956e
 INSTALL		= @INSTALL@
Marcela Mašláňová 92956e
 PAMLIB          = @PAMLIB@
Marcela Mašláňová 92956e
+SELINUXLIB      = @SELINUXLIB@
Marcela Mašláňová 92956e
+
Marcela Mašláňová 92956e
 
Marcela Mašláňová 92956e
 CLONES		= atq atrm
Marcela Mašláňová 92956e
 ATOBJECTS	= at.o panic.o perm.o posixtm.o y.tab.o lex.yy.o