Merge branch 'master' into ppa

CMakeLists.txt

@@ -1,7 +1,10 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.4)
 project(postsrsd C)
 
 option(GENERATE_SRS_SECRET "Generate a random SRS secret if none exists during install" ON)
+option(USE_APPARMOR "Enable AppArmor profile" OFF)
+
+set(CHROOT_DIR "${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}" CACHE PATH "Chroot jail for daemon")
 
 find_program(HELP2MAN help2man DOC "path to help2man executable")
 find_program(DD dd DOC "path to dd executable")
@@ -26,9 +29,13 @@ add_executable(${PROJECT_NAME} postsrsd.c sha1.c srs2.c)
 
 get_target_property(POSTSRSD ${PROJECT_NAME} LOCATION)
 get_filename_component(POSTSRSD ${POSTSRSD} NAME_WE)
+set(APPARMOR_PROFILE "${CMAKE_INSTALL_PREFIX}/sbin/${POSTSRSD}")
+string(SUBSTRING "${APPARMOR_PROFILE}" 1 -1 APPARMOR_PROFILE)
+string(REPLACE "/" "." APPARMOR_PROFILE "${APPARMOR_PROFILE}")
 
 configure_file(${PROJECT_NAME}.init.in ${PROJECT_NAME}.init @ONLY)
 configure_file(${PROJECT_NAME}.upstart.in ${PROJECT_NAME}.upstart @ONLY)
+configure_file(${PROJECT_NAME}.apparmor.in ${PROJECT_NAME}.apparmor @ONLY)
 configure_file(postinstall.cmake.in postinstall.cmake @ONLY)
 
 if(HELP2MAN)
@@ -39,6 +46,10 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.8 DESTINATION "share/man/man8")
 endif()
 
+if(USE_APPARMOR)
+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.apparmor DESTINATION "/etc/apparmor.d" RENAME "${APPARMOR_PROFILE}")
+endif()
+
 install(TARGETS ${PROJECT_NAME} DESTINATION "sbin")
 install(FILES README.md main.cf.ex DESTINATION "share/doc/${PROJECT_NAME}")
 install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/postinstall.cmake")

postinstall.cmake.in

@@ -1,10 +1,16 @@
 set(GENERATE_SRS_SECRET "@GENERATE_SRS_SECRET@")
+set(CHROOT_DIR "@CHROOT_DIR@")
 set(INIT_FLAVOR "@INIT_FLAVOR@")
 set(SECRET_FILE "@PROJECT_NAME@.secret")
 set(DD "@DD@")
 set(BASE64 "@BASE64@")
 set(INSSERV "@INSSERV@")
 
+if(CHROOT_DIR AND NOT EXISTS "$ENV{DESTDIR}${CHROOT_DIR}")
+	message(STATUS "Chroot jail: $ENV{DESTDIR}${CHROOT_DIR}")
+	file(MAKE_DIRECTORY "$ENV{DESTDIR}${CHROOT_DIR}")
+endif()
+
 if(INIT_FLAVOR AND NOT EXISTS "$ENV{DESTDIR}/etc/default/@PROJECT_NAME@")
 	file(INSTALL "@CMAKE_CURRENT_SOURCE_DIR@/@PROJECT_NAME@.default" DESTINATION "/etc/default" RENAME "@PROJECT_NAME@")
 endif()

postsrsd.apparmor.in

@@ -0,0 +1,12 @@
+#include <tunables/global>
+
+/usr/sbin/postsrsd {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+
+  capability setuid,
+  capability sys_chroot,
+  /etc/postsrsd.secret r,
+  @CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@ mr,
+}
+

postsrsd.c

@@ -193,6 +193,7 @@ static void show_help ()
     "   -f<port>       set port for the forward SRS lookup (default: 10001)\n"
     "   -r<port>       set port for the reverse SRS lookup (default: 10002)\n"
     "   -p<pidfile>    write process ID to pidfile (default: none)\n"
+    "   -c<dir>        chroot to <dir> (default: none)\n"
     "   -u<user>       switch user id after port bind (default: none)\n"
     "   -t<seconds>    timeout for idle client connections (default: 1800)\n"
     "   -D             fork into background\n"
@@ -212,10 +213,11 @@ int main (int argc, char **argv)
   int opt, timeout = 1800, family = AF_UNSPEC;
   int daemonize = FALSE;
   char *forward_service = NULL, *reverse_service = NULL,
-       *user = NULL, *domain = NULL;
+       *user = NULL, *domain = NULL, *chroot_dir = NULL;
   int forward_sock, reverse_sock;
   char *secret_file = NULL, *pid_file = NULL;
   FILE *pf = NULL;
+  struct passwd *pwd = NULL;
   char secret[1024];
   char *tmp;
   srs_t *srs;
@@ -225,7 +227,7 @@ int main (int argc, char **argv)
   tmp = strrchr(argv[0], '/');
   if (tmp) self = strdup(tmp + 1); else self = strdup(argv[0]);
 
-  while ((opt = getopt(argc, argv, "46d:f:r:s:u:t:p:Dhv")) != -1) {
+  while ((opt = getopt(argc, argv, "46d:f:r:s:u:t:p:c:Dhv")) != -1) {
     switch (opt) {
       case '?':
         return EXIT_FAILURE;
@@ -256,6 +258,9 @@ int main (int argc, char **argv)
       case 'u':
         user = strdup(optarg);
         break;
+      case 'c':
+	chroot_dir = strdup(optarg);
+	break;
       case 'D':
         daemonize = TRUE;
         break;
@@ -267,6 +272,15 @@ int main (int argc, char **argv)
 	return EXIT_SUCCESS;
     }
   }
+  if (domain == NULL) {
+    fprintf (stderr, "%s: You must set a home domain (-d)\n", self);
+    show_help();
+    return EXIT_FAILURE;
+  }
+
+  /* The stuff we do first may not be possible from within chroot or without privileges */
+
+  /* Open pid file for writing (the actual process ID is filled in later) */
   if (pid_file) {
     pf = fopen (pid_file, "w");
     if (pf == NULL) {
@@ -274,11 +288,7 @@ int main (int argc, char **argv)
       return EXIT_FAILURE;
     }
   }
-  if (domain == NULL) {
-    fprintf (stderr, "%s: You must set a home domain (-d)\n", self);
-    show_help();
-    return EXIT_FAILURE;
-  }
+  /* Read secret. The default installation makes this root accessible only. */
   if (secret_file != NULL) {
     size_t len;
     FILE *fp = fopen(secret_file, "rb");
@@ -298,6 +308,7 @@ int main (int argc, char **argv)
     show_help();
     return EXIT_FAILURE;
   }
+  /* Bind ports. May require privileges if the config specifies ports below 1024 */
   if (forward_service != NULL) {
     forward_sock = bind_service(forward_service, family);
     free (forward_service);
@@ -312,8 +323,11 @@ int main (int argc, char **argv)
     reverse_sock = bind_service("10002", family);
   }
   if (reverse_sock < 0) return EXIT_FAILURE;
+
+  /* Open syslog now (NDELAY), because it may no longer reachable from chroot */
+  openlog (self, LOG_PID | LOG_NDELAY, LOG_MAIL);
+  /* We also have to lookup the uid of the unprivileged user for the same reason. */
   if (user) {
-    struct passwd *pwd;
     errno = 0;
     pwd = getpwnam(user);
     if (pwd == NULL) {
@@ -323,23 +337,38 @@ int main (int argc, char **argv)
         fprintf (stderr, "%s: No such user: %s\n", self, user);
       return EXIT_FAILURE;
     }
+  }
+  /* Now we can chroot, which again requires root privileges */
+  if (chroot_dir) {
+    if (chdir(chroot_dir) < 0) {
+      fprintf (stderr, "%s: Cannot change to chroot: %s\n", self, strerror(errno));
+      return EXIT_FAILURE;
+    }
+    if (chroot(chroot_dir) < 0) {
+      fprintf (stderr, "%s: Failed to enable chroot: %s\n", self, strerror(errno));
+      return EXIT_FAILURE;
+    }
+  }
+  /* Finally, we revert to the unprivileged user */
+  if (pwd) {
     if (setuid(pwd->pw_uid) < 0) {
       fprintf (stderr, "%s: Failed to switch user id: %s\n", self, strerror(errno));
       return EXIT_FAILURE;
     }
   }
+  /* Standard double fork technique to disavow all knowledge about the controlling terminal */
   if (daemonize) {
     close(0); close(1); close(2);
     if (fork() != 0) return EXIT_SUCCESS;
     setsid();
     if (fork() != 0) return EXIT_SUCCESS;
   }
+  /* Make note of our actual process ID */
   if (pf) {
     fprintf (pf, "%d", (int)getpid());
     fclose (pf);
   }
 
-  openlog ("postsrsd", LOG_PID, LOG_MAIL);
   srs = srs_new();
   srs_add_secret (srs, secret);
   srs_set_separator (srs, '+');
@@ -356,7 +385,10 @@ int main (int argc, char **argv)
     char keybuf[1024], *key;
 
     if (poll(fds, 2, 1000) < 0) {
-      if (!daemonize) fprintf (stderr, "%s: Poll failure: %s\n", self, strerror(errno));
+      if (daemonize)
+        syslog (LOG_MAIL | LOG_ERR, "Poll failure: %s", strerror(errno));
+      else
+        fprintf (stderr, "%s: Poll failure: %s\n", self, strerror(errno));
       return EXIT_FAILURE;
     }
     for (i = 0; i < 2; ++i) {

postsrsd.init.in

@@ -33,6 +33,7 @@ SRS_FORWARD_PORT=10001
 SRS_REVERSE_PORT=10002
 SRS_SECRET=/etc/@PROJECT_NAME@.secret
 RUN_AS=nobody
+CHROOT=@CHROOT_DIR@
 
 # Read config file if it is present.
 if [ -r /etc/default/$NAME ]
@@ -40,7 +41,7 @@ then
     . /etc/default/$NAME
 fi
 
-POSTSRS_OPTS="-4 -f$SRS_FORWARD_PORT -r$SRS_REVERSE_PORT -d$SRS_DOMAIN -s$SRS_SECRET -u$RUN_AS -p$PIDFILE -D"
+POSTSRS_OPTS="-4 -f$SRS_FORWARD_PORT -r$SRS_REVERSE_PORT -d$SRS_DOMAIN -s$SRS_SECRET -u$RUN_AS -p$PIDFILE -c$CHROOT -D"
 
 test -r "$SRS_SECRET" -a -n "$SRS_DOMAIN" || exit 0
 
@@ -83,3 +84,4 @@ case "$1" in
 esac
 
 exit $ret
+

postsrsd.upstart.in

@@ -13,8 +13,10 @@ script
 	SRS_REVERSE_PORT=10002
 	SRS_SECRET=/etc/@PROJECT_NAME@.secret
 	RUN_AS=nobody
+	CHROOT=@CHROOT_DIR@
 	if [ -r "$DEFAULTFILE" ]; then
 		. "$DEFAULTFILE"
 	fi
-	exec @CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@ -4 -f$SRS_FORWARD_PORT -r$SRS_REVERSE_PORT -d$SRS_DOMAIN -s$SRS_SECRET -u$RUN_AS
+	exec @CMAKE_INSTALL_PREFIX@/sbin/@POSTSRSD@ -4 -f$SRS_FORWARD_PORT -r$SRS_REVERSE_PORT -d$SRS_DOMAIN -s$SRS_SECRET -u$RUN_AS -c$CHROOT
 end script
+