https

This reverts commit 6fb3c6f193.

Makefile.am

@@ -14,9 +14,6 @@ clr_debug_fuse_LDADD = ${fuse_LIBS} $(glib_LIBS)
 clr_debug_daemon_LDADD = $(glib_LIBS) ${curl_LIBS}
 clr_debug_prepare_LDADD = $(glib_LIBS)
 
+systemdsystemunit_DATA = clr_debug_fuse.service clr_debug_daemon.service
 
-systemdunitdir = @SYSTEMD_UNITDIR@
+tmpfiles_DATA = debuginfo.conf
-systemdunit_DATA = clr_debug_fuse.service clr_debug_daemon.service
-
-tmpwatchdir = /etc/tmpfiles.d
-tmpwatch_DATA = debuginfo.conf

configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.66])
 AC_INIT(clr-debug-info, 11, arjan@linux.intel.com)
-AM_INIT_AUTOMAKE([foreign -Wall -W])
+AM_INIT_AUTOMAKE([foreign -Wall -W subdir-objects])
 AM_SILENT_RULES([yes])
 AC_PROG_CC
 AC_LANG(C)
@@ -13,14 +13,11 @@ PKG_CHECK_MODULES([curl], [libcurl])
 PKG_CHECK_MODULES([fuse], [fuse])
 PKG_CHECK_MODULES([SYSTEMD], [systemd])
 
-AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR],
+tmpfilesdir=`pkg-config --variable tmpfilesdir systemd`
-	[path to systemd service directory]), [path_systemdunit=${withval}],
+AC_SUBST(tmpfilesdir)
-	[path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
+
-if (test -n "${path_systemdunit}"); then
+systemdsystemunitdir=`pkg-config --variable systemdsystemunitdir systemd`
-SYSTEMD_UNITDIR="${path_systemdunit}"
+AC_SUBST(systemdsystemunitdir)
-AC_SUBST(SYSTEMD_UNITDIR)
-AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
-fi
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

src/server.c

@@ -36,12 +36,16 @@
 #include <string.h>
 #include <pthread.h>
 #include <sys/stat.h>
+#include <malloc.h>
 
 #include <curl/curl.h>
 #include <glib.h>
 
 GStaticMutex dupes_mutex = G_STATIC_MUTEX_INIT;
 
+char *urls[2] = {"https://debuginfo.clearlinux.org/debuginfo/", "http://debuginfo.fenrus.org/debuginfo/" };
+int urlcounter = 1;
+
 
 static GHashTable *hash;
 
@@ -118,6 +122,9 @@ static int curl_get_file(const char *url, const char *prefix, time_t timestamp)
 	fflush(file);
 //	printf("HTTP return code is %i\n", ret);
 
+	if (ret != 200 && ret != 404)
+		urlcounter++;
+
 	if (ret == 200) {
 		char *command = NULL;
 //		printf("Filename is %s\n", filename);
@@ -185,7 +192,7 @@ static void *server_thread(void *arg)
 	path++;
 
 
-	if (strstr(path, "..") || strstr(prefix, "..")) {
+	if (strstr(path, "..") || strstr(prefix, "..") || strstr(path, "'") || strstr(path, ";")) {
 		close(fd);
 		return NULL;
 	}
@@ -196,7 +203,7 @@ static void *server_thread(void *arg)
 		return NULL; 
 	}
 	url = NULL;
-	if (asprintf(&url, "http://debuginfo.clearlinux.org/debuginfo/%s%s.tar", prefix, path) < 0) {
+	if (asprintf(&url, "%s%s%s.tar", urls[urlcounter % 2], prefix, path) < 0) {
 		close(fd);
 		return NULL;
 	}
@@ -204,14 +211,19 @@ static void *server_thread(void *arg)
 //	printf("Getting url %s    %i:%06i\n", url, before.tv_sec, before.tv_usec);
 	ret = curl_get_file(url, prefix, timestamp);
 
-	/* tell the other side we're done with the download */
+	if (ret != 200)
-	write(fd, "ok", 3);
+		printf("Request for %s resulted in error %i\n", url, ret);
-	close(fd);
 
 	gettimeofday(&after, NULL);
 	if (timedelta(before, after) > 0.6) 
 		printf("Request for %s took %5.2f seconds (%i - %i)\n", url,
 			after.tv_sec - before.tv_sec + (1.0*after.tv_usec - before.tv_usec) / 1000000.0, ret, (int)timestamp);
+
+	/* tell the other side we're done with the download */
+	write(fd, "ok", 3);
+	close(fd);
+
+			
 	free(url);
 	return NULL;
 }
@@ -222,11 +234,11 @@ int main(int argc, char **argv)
 	int sockfd;
 	struct sockaddr_un sun;
 	int ret;
+	int curl_done = 0;
 
 	if (argc < -1)
 		(void)argv;
 
-	curl_global_init(CURL_GLOBAL_ALL);
 
 	signal(SIGPIPE,SIG_IGN);
 
@@ -235,7 +247,6 @@ int main(int argc, char **argv)
 	if (access("/var/cache/debuginfo/src/", F_OK))	
 		system("mkdir -p /var/cache/debuginfo/src/ &> /dev/null");
 
-  
 	sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (sockfd < 0)
 		return EXIT_FAILURE;
@@ -260,8 +271,14 @@ int main(int argc, char **argv)
 		int clientsock;
 		pthread_t thread;
 
+		malloc_trim(0);
 		clientsock = accept(sockfd, NULL, NULL);
 
+		if (!curl_done) {
+			curl_global_init(CURL_GLOBAL_ALL);
+			curl_done = 1;
+		}
+
 		pthread_create(&thread, NULL, server_thread, (void *)(unsigned long)clientsock);
 		pthread_detach(thread);
 	}