Release v49

- List tarball contents prior to extraction to improve robustness
- Plug some memory leaks
- Print errors to stderr instead of stdout

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>

.gitignore

@@ -8,6 +8,7 @@ clr_debug_prepare
 Makefile
 Makefile.in
 aclocal.m4
+ar-lib
 autom4te.cache/
 compile
 config.h

Makefile.am

@@ -40,7 +40,7 @@ clr_debug_prepare_SOURCES = src/prepare.c
 
 
 clr_debug_fuse_LDADD = ${fuse_LIBS} libnica.la
-clr_debug_daemon_LDADD = ${curl_LIBS} libnica.la
+clr_debug_daemon_LDADD = ${curl_LIBS} libnica.la ${LIBSYSTEMD_LIBS}
 clr_debug_prepare_LDADD = libnica.la
 
 systemdsystemunit_DATA = clr_debug_fuse.service clr_debug_daemon.service clr_debug_daemon.socket

clr_debug_fuse.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=Clear Linux debuginfo fuse monitor
-After=clr_debug_daemon.service
+After=clr_debug_daemon.socket
+Requires=clr_debug_daemon.socket
 DefaultDependencies=no
 
 [Service]

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.66])
-AC_INIT(clr-debug-info, 43, arjan@linux.intel.com)
+AC_INIT(clr-debug-info, 49, arjan@linux.intel.com)
 AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
 AM_SILENT_RULES([yes])
 AC_PROG_CC
@@ -15,6 +15,8 @@ PKG_CHECK_MODULES([SYSTEMD], [systemd])
 PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd])
 LT_INIT
 
+AC_DEFINE([SOCKET_PATH], ["/run/clr-debug-info"], [path to communication socket])
+
 dir=""
 AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
 	    [path to systemd system service dir @<:@default=/usr/lib/systemd/system@:>@]), [dir=${withval}],

src/client.c

@@ -36,6 +36,8 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "config.h"
+
 /* 0.75 seconds timeout */
 #define TIMEOUT 75000
 #define TIMEOUT2 1500
@@ -58,7 +60,7 @@ void try_to_get(const char *path, int pid, time_t timestamp)
         int shorttime = 0;
         __nc_unused__ size_t wr = -1;
 
-        //	printf("Trying to aquire %s\n", path);
+        // printf("Trying to aquire %s\n", path);
 
         sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
         if (sockfd < 0) {
@@ -66,13 +68,13 @@ void try_to_get(const char *path, int pid, time_t timestamp)
         }
 
         sun.sun_family = AF_UNIX;
-        strcpy(sun.sun_path, "/run/clr-debug-info");
+        strcpy(sun.sun_path, SOCKET_PATH);
 
         ret = connect(sockfd,
                       (struct sockaddr *)&sun,
-                      offsetof(struct sockaddr_un, sun_path) + strlen("/run/clr-debug-info") + 1);
+                      offsetof(struct sockaddr_un, sun_path) + strlen(SOCKET_PATH) + 1);
         if (ret < 0) {
-                printf("Cannot connect %s\n", strerror(errno));
+                printf("Cannot connect to %s: %s\n", SOCKET_PATH, strerror(errno));
                 close(sockfd);
                 return;
         }

src/fuse.c

@@ -75,6 +75,16 @@ static int xmp_getattr(const char *path, struct stat *stbuf)
         memset(stbuf, 0, sizeof(struct stat));
         res = lstat(newpath, stbuf);
 
+        /*
+         * filter out things that never should get fetched
+         * this prevents us from asking curl to fetch us useless things
+         */
+        if (strncmp(path, "/.Trash", strlen("/.Trash")) == 0) {
+                return -ENOENT;
+        } else if (strcmp(path, "/") == 0) {
+                return 0;
+        }
+
         /*
          * get the file. if the st_mtime is set, this is just an async refresh, otherwise it's
          * a synchronous request.

src/prepare.c

@@ -137,7 +137,7 @@ static void do_one_file(char *base1, char *base2, char *path, int isdir)
 
                 if (!isdir &&
                     asprintf(&command,
-                             "tar --no-recursion -h -C %s -Jcf %s %s &",
+                             "tar --no-recursion -C %s -Jcf %s %s &",
                              base1,
                              fullpath2,
                              path) >= 0) {

src/server.c

@@ -2,7 +2,7 @@
  *   Clear Linux -- automatic debug information installation
  *
  *      Copyright (C) 2013  Arjan van de Ven
- * 	Curl portions borrowed from the Fenrus Update code
+ *     Curl portions borrowed from the Fenrus Update code
  *          which in part is (C) 2012 Intel Corporation
  *      Copyright (C) 2014  Intel Corporation
  *
@@ -32,6 +32,7 @@
 #include <malloc.h>
 #include <pthread.h>
 #include <pwd.h>
+#include <libgen.h>
 #include <signal.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -57,6 +58,8 @@
 #include <stdatomic.h>
 #endif
 
+#define TIMEOUT 600 /* 10 minutes */
+
 static pthread_mutex_t dupes_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 char *urls[2] = { "https://cdn.download.clearlinux.org/debuginfo/",
@@ -168,10 +171,9 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
         long ret;
         long changed;
         int fd;
-        char filename[PATH_MAX];
+        autofree(char) *filename = NULL;
         CURL *curl = NULL;
         FILE *file;
-        struct stat statbuf;
 
         if (avoid_dupes(url)) {
                 return 300;
@@ -182,12 +184,15 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
                 return 301;
         }
 
-        strcpy(filename, "/tmp/clr-debug-info-XXXXXX");
+        // fprintf(stderr, "Fetching %s, prefix %s, path %s\n", url, prefix, path);
-
+        if (asprintf(&filename, "/tmp/clr-debug-info-XXXXXX") < 0) {
+                curl_easy_cleanup(curl);
+                return 418;
+        }
         fd = mkstemp(filename);
         if (fd < 0) {
                 curl_easy_cleanup(curl);
-                return 500;
+                return 418;
         }
 
         file = fdopen(fd, "w");
@@ -225,7 +230,7 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
 
         curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &ret);
         fflush(file);
-        //	printf("HTTP return code is %i\n", ret);
+        //        printf("HTTP return code is %i\n", ret);
 
         /* HTTP 304 is returned if (a) the cached debuginfo has the same
          * timestamp or is newer than that on the server and (b) we haven't
@@ -238,6 +243,9 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
         }
 
         if (ret == 200) {
+                autofree(char) *command = NULL;
+                struct stat statbuf;
+
                 /* get timestamp, if any */
                 curl_easy_getinfo(curl, CURLINFO_FILETIME, &changed);
                 if (changed >= 0) {
@@ -249,22 +257,45 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
                         futimens(fd, times);
                 }
 
-                autofree(char) *command = NULL;
-                //		printf("Filename is %s\n", filename);
-
                 memset(&statbuf, 0, sizeof(statbuf));
                 stat(filename, &statbuf);
-                if (statbuf.st_size > 0 &&
+                if (statbuf.st_size <= 0) {
-                    asprintf(&command,
+                        ret = 418;
-                             "tar -C /var/cache/debuginfo/%s --no-same-owner "
+                        goto out;
-                             "--no-same-permissions  -xf %s",
+                }
+
+                /* test extraction first */
+                if (asprintf(&command, "tar -C /var/cache/debuginfo/%s --no-same-owner "
+                             "--no-same-permissions -tf %s",
                              prefix,
-                             filename) >= 0) {
+                             filename) < 0) {
-                        if (system(command) != 0) {
+                        ret = 418;
-                                fputs("Warning: tar extraction failed\n", stderr);
+                        goto out;
-                        }
+                }
+
+                if (system(command) != 0) {
+                        ret = 418;
+                        fprintf(stderr, "Error: tar validation failed\n");
+                        goto out;
+                }
+
+                free(command); /* reuse */
+                if (asprintf(&command, "tar -C /var/cache/debuginfo/%s --no-same-owner "
+                             "--no-same-permissions -xf %s",
+                             prefix,
+                             filename) < 0) {
+                        ret = 418;
+                        goto out;
+                }
+
+                if (system(command) != 0) {
+                        ret = 418;
+                        fprintf(stderr, "Error: tar extraction failed\n");
+                        goto out;
                 }
         }
+
+out:
         unlink(filename);
         curl_easy_cleanup(curl);
         fclose(file);
@@ -338,7 +369,7 @@ static void *server_thread(void *arg)
                 goto thread_end;
         }
 
-        //	printf("Getting url %s    %i:%06i\n", url, before.tv_sec, before.tv_usec);
+        //        printf("Getting url %s    %i:%06i\n", url, before.tv_sec, before.tv_usec);
         ret = curl_get_file(url, prefix, timestamp);
 
         switch (ret) {
@@ -349,7 +380,7 @@ static void *server_thread(void *arg)
                 // ignore these error codes
                 break;
         default:
-                printf("Request for %s resulted in error %i\n", url, ret);
+                fprintf(stderr, "Request for %s resulted in error %i\n", url, ret);
                 break;
         }
 
@@ -431,54 +462,71 @@ int main(__nc_unused__ int argc, __nc_unused__ char **argv)
 
         signal(SIGPIPE, SIG_IGN);
 
-	if (sd_listen_fds(0) == 1) {
+        if (sd_listen_fds(0) == 1) {
-		/* systemd socket activation */
+                /* systemd socket activation */
-		printf("Received socket from systemd socket activation\n");
+                sockfd = SD_LISTEN_FDS_START + 0;
-		sockfd = SD_LISTEN_FDS_START + 0;
+        } else if (sd_listen_fds(0) > 1) {
-	} else if (sd_listen_fds(0) > 1) {
+                fprintf(stderr, "Too many file descriptors received.\n");
-		printf("Too many file descriptors received.\n");
+                exit(EXIT_FAILURE);
-		exit(1);
+        } else {
-	} else {
+                sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
-		sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
+                if (sockfd < 0) {
-		if (sockfd < 0) {
+                        exit(EXIT_FAILURE);
-			return EXIT_FAILURE;
+                }
-		}
 
-		sun.sun_family = AF_UNIX;
+                sun.sun_family = AF_UNIX;
-		strcpy(sun.sun_path, "/run/clr-debug-info");
+                strcpy(sun.sun_path, SOCKET_PATH);
 
-		ret = bind(sockfd,
+                ret = bind(sockfd,
-			(struct sockaddr *)&sun,
+                        (struct sockaddr *)&sun,
-			offsetof(struct sockaddr_un, sun_path) + strlen("/run/clr-debug-info") + 1);
+                        offsetof(struct sockaddr_un, sun_path) + strlen(SOCKET_PATH) + 1);
-		if (ret < 0) {
+                if (ret < 0) {
-			printf("Failed to bind:%s \n", strerror(errno));
+                        fprintf(stderr, "Failed to bind:%s \n", strerror(errno));
-			return EXIT_FAILURE;
+                        exit(EXIT_FAILURE);
-		}
+                }
 
-		if (listen(sockfd, 16) < 0) {
+                if (listen(sockfd, 16) < 0) {
-			printf("Failed to listen:%s \n", strerror(errno));
+                        fprintf(stderr, "Failed to listen:%s \n", strerror(errno));
-			return EXIT_FAILURE;
+                        exit(EXIT_FAILURE);
-		}
+                }
-	}
+        }
 
         if (setgid(dbg_group)) {
                 fprintf(stderr, "Unable to drop privileges setgid %s\n", strerror(errno));
-                return EXIT_FAILURE;
+                exit(EXIT_FAILURE);
         }
         if (setgroups(1, &dbg_group)) {
                 fprintf(stderr, "Unable to drop privileges setgroups %s\n", strerror(errno));
-                return EXIT_FAILURE;
+                exit(EXIT_FAILURE);
         }
         if (setuid(dbg_user)) {
                 fprintf(stderr, "Unable to drop privileges setuid  %s\n", strerror(errno));
-                return EXIT_FAILURE;
+                exit(EXIT_FAILURE);
         }
 
         while (1) {
+                fd_set rfds;
+                struct timeval tv;
+                int ret;
                 int clientsock;
                 pthread_t thread;
 
                 malloc_trim(0);
+
+                /* use select() to timeout and exit gracefully */
+                FD_ZERO(&rfds);
+                FD_SET(sockfd, &rfds);
+                tv.tv_sec = TIMEOUT;
+                tv.tv_usec = 0;
+                ret = select(sockfd + 1, &rfds, NULL, NULL, &tv);
+                if (ret == -1) {
+                        perror("select()");
+                        exit(EXIT_FAILURE);
+                } else if (ret == 0) {
+                        break;
+                }
+
+
                 clientsock = accept(sockfd, NULL, NULL);
 
                 /* Too many connections, wait for the next loop/retry */
@@ -503,6 +551,4 @@ int main(__nc_unused__ int argc, __nc_unused__ char **argv)
         if (hash) {
                 nc_hashmap_free(hash);
         }
-
-        close(sockfd);
 }