X-Git-Url: http://git.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-fetch.c;h=5f7ac6200bb867690d91468433225820562ad8b3;hp=c64afb7e0b2b10ded49c967547af69a3c7f5343f;hb=e6b5b8a98ce21d4b8374370b5d7592ead4b351e5;hpb=97f6c34884927dbf1b1858ab232e00c61fce48de

diff --git a/uclient-fetch.c b/uclient-fetch.c
index c64afb7..5f7ac62 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -18,6 +18,7 @@
 
 #define _GNU_SOURCE
 #include <sys/stat.h>
+#include <sys/socket.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <dlfcn.h>
@@ -26,9 +27,11 @@
 #include <glob.h>
 #include <stdint.h>
 #include <inttypes.h>
+#include <signal.h>
 
 #include <libubox/blobmsg.h>
 
+#include "progress.h"
 #include "uclient.h"
 #include "uclient-utils.h"
 
@@ -40,6 +43,7 @@
 
 static const char *user_agent = "uclient-fetch";
 static const char *post_data;
+static const char *post_file;
 static struct ustream_ssl_ctx *ssl_ctx;
 static const struct ustream_ssl_ops *ssl_ops;
 static int quiet = false;
@@ -47,19 +51,30 @@ static bool verify = true;
 static bool proxy = true;
 static bool default_certs = false;
 static bool no_output;
-static const char *output_file;
+static const char *opt_output_file;
 static int output_fd = -1;
 static int error_ret;
-static int out_bytes;
+static off_t out_offset;
+static off_t out_bytes;
+static off_t out_len;
 static char *auth_str;
 static char **urls;
 static int n_urls;
 static int timeout;
 static bool resume, cur_resume;
 
+static struct progress pmt;
+static struct uloop_timeout pmt_timer;
+
 static int init_request(struct uclient *cl);
 static void request_done(struct uclient *cl);
 
+static void pmt_update(struct uloop_timeout *t)
+{
+	progress_update(&pmt, out_offset, out_bytes, out_len);
+	uloop_timeout_set(t, 1000);
+}
+
 static const char *
 get_proxy_url(char *url)
 {
@@ -83,6 +98,7 @@ get_proxy_url(char *url)
 
 static int open_output_file(const char *path, uint64_t resume_offset)
 {
+	const char *output_file = opt_output_file;
 	char *filename = NULL;
 	int flags;
 	int ret;
@@ -90,7 +106,10 @@ static int open_output_file(const char *path, uint64_t resume_offset)
 	if (cur_resume)
 		flags = O_RDWR;
 	else
-		flags = O_WRONLY | O_EXCL;
+		flags = O_WRONLY | O_TRUNC;
+
+	if (!cur_resume && !output_file)
+		flags |= O_EXCL;
 
 	flags |= O_CREAT;
 
@@ -99,50 +118,80 @@ static int open_output_file(const char *path, uint64_t resume_offset)
 			if (!quiet)
 				fprintf(stderr, "Writing to stdout\n");
 
-			return STDOUT_FILENO;
+			ret = STDOUT_FILENO;
+			goto done;
 		}
 	} else {
 		filename = uclient_get_url_filename(path, "index.html");
+		if (!filename) {
+			ret = -ENOMEM;
+			goto out;
+		}
+
 		output_file = filename;
 	}
 
 	if (!quiet)
 		fprintf(stderr, "Writing to '%s'\n", output_file);
 	ret = open(output_file, flags, 0644);
-	free(filename);
-
 	if (ret < 0)
-		return ret;
+		goto free;
 
 	if (resume_offset &&
 	    lseek(ret, resume_offset, SEEK_SET) < 0) {
 		if (!quiet)
 			fprintf(stderr, "Failed to seek %"PRIu64" bytes in output file\n", resume_offset);
 		close(ret);
-		return -1;
+		ret = -1;
+		goto free;
 	}
 
+	out_offset = resume_offset;
 	out_bytes += resume_offset;
+done:
+	if (!quiet) {
+		progress_init(&pmt, output_file);
+		pmt_timer.cb = pmt_update;
+		pmt_timer.cb(&pmt_timer);
+	}
 
+free:
+	free(filename);
+out:
 	return ret;
 }
 
 static void header_done_cb(struct uclient *cl)
 {
-	static const struct blobmsg_policy policy = {
-		.name = "content-range",
-		.type = BLOBMSG_TYPE_STRING
+	enum {
+		H_RANGE,
+		H_LEN,
+		__H_MAX
 	};
-	struct blob_attr *attr;
+	static const struct blobmsg_policy policy[__H_MAX] = {
+		[H_RANGE] = { .name = "content-range", .type = BLOBMSG_TYPE_STRING },
+		[H_LEN] = { .name = "content-length", .type = BLOBMSG_TYPE_STRING },
+	};
+	struct blob_attr *tb[__H_MAX];
 	uint64_t resume_offset = 0, resume_end, resume_size;
 	static int retries;
 
-	if (retries < 10 && uclient_http_redirect(cl)) {
-		if (!quiet)
-			fprintf(stderr, "Redirected to %s on %s\n", cl->url->location, cl->url->host);
+	if (retries < 10) {
+		int ret = uclient_http_redirect(cl);
+		if (ret < 0) {
+			if (!quiet)
+				fprintf(stderr, "Failed to redirect to %s on %s\n", cl->url->location, cl->url->host);
+			error_ret = 8;
+			request_done(cl);
+			return;
+		}
+		if (ret > 0) {
+			if (!quiet)
+				fprintf(stderr, "Redirected to %s on %s\n", cl->url->location, cl->url->host);
 
-		retries++;
-		return;
+			retries++;
+			return;
+		}
 	}
 
 	if (cl->status_code == 204 && cur_resume) {
@@ -152,6 +201,8 @@ static void header_done_cb(struct uclient *cl)
 		return;
 	}
 
+	blobmsg_parse(policy, __H_MAX, tb, blob_data(cl->meta), blob_len(cl->meta));
+
 	switch (cl->status_code) {
 	case 416:
 		if (!quiet)
@@ -167,15 +218,15 @@ static void header_done_cb(struct uclient *cl)
 			break;
 		}
 
-		blobmsg_parse(&policy, 1, &attr, blob_data(cl->meta), blob_len(cl->meta));
-		if (!attr) {
+		if (!tb[H_RANGE]) {
 			if (!quiet)
 				fprintf(stderr, "Content-Range header is missing\n");
 			error_ret = 8;
 			break;
 		}
 
-		if (sscanf(blobmsg_get_string(attr), "bytes %"PRIu64"-%"PRIu64"/%"PRIu64,
+		if (sscanf(blobmsg_get_string(tb[H_RANGE]),
+			   "bytes %"PRIu64"-%"PRIu64"/%"PRIu64,
 			   &resume_offset, &resume_end, &resume_size) != 3) {
 			if (!quiet)
 				fprintf(stderr, "Content-Range header is invalid\n");
@@ -186,6 +237,10 @@ static void header_done_cb(struct uclient *cl)
 	case 200:
 		if (no_output)
 			break;
+
+		if (tb[H_LEN])
+			out_len = strtoul(blobmsg_get_string(tb[H_LEN]), NULL, 10);
+
 		output_fd = open_output_file(cl->url->location, resume_offset);
 		if (output_fd < 0) {
 			if (!quiet)
@@ -207,6 +262,7 @@ static void header_done_cb(struct uclient *cl)
 static void read_data_cb(struct uclient *cl)
 {
 	char buf[256];
+	ssize_t n;
 	int len;
 
 	if (!no_output && output_fd < 0)
@@ -214,12 +270,15 @@ static void read_data_cb(struct uclient *cl)
 
 	while (1) {
 		len = uclient_read(cl, buf, sizeof(buf));
-		if (!len)
+		if (len <= 0)
 			return;
 
 		out_bytes += len;
-		if (!no_output)
-			write(output_fd, buf, len);
+		if (!no_output) {
+			n = write(output_fd, buf, len);
+			if (n < 0)
+				return;
+		}
 	}
 }
 
@@ -262,7 +321,9 @@ static int init_request(struct uclient *cl)
 {
 	int rc;
 
+	out_offset = 0;
 	out_bytes = 0;
+	out_len = 0;
 	uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
 
 	if (timeout)
@@ -274,7 +335,7 @@ static int init_request(struct uclient *cl)
 
 	msg_connecting(cl);
 
-	rc = uclient_http_set_request_type(cl, post_data ? "POST" : "GET");
+	rc = uclient_http_set_request_type(cl, post_data || post_file ? "POST" : "GET");
 	if (rc)
 		return rc;
 
@@ -287,6 +348,26 @@ static int init_request(struct uclient *cl)
 		uclient_http_set_header(cl, "Content-Type", "application/x-www-form-urlencoded");
 		uclient_write(cl, post_data, strlen(post_data));
 	}
+	else if(post_file)
+	{
+		FILE *input_file;
+		uclient_http_set_header(cl, "Content-Type", "application/x-www-form-urlencoded");
+
+		input_file = fopen(post_file, "r");
+		if (!input_file)
+			return errno;
+
+		char tbuf[1024];
+		size_t rlen = 0;
+		do
+		{
+			rlen = fread(tbuf, 1, sizeof(tbuf), input_file);
+			uclient_write(cl, tbuf, rlen);
+		}
+		while(rlen);
+
+		fclose(input_file);
+	}
 
 	rc = uclient_request(cl);
 	if (rc)
@@ -314,7 +395,7 @@ static void request_done(struct uclient *cl)
 			return;
 	}
 
-	if (output_fd >= 0 && !output_file) {
+	if (output_fd >= 0 && !opt_output_file) {
 		close(output_fd);
 		output_fd = -1;
 	}
@@ -325,12 +406,18 @@ static void request_done(struct uclient *cl)
 
 static void eof_cb(struct uclient *cl)
 {
+	if (!quiet) {
+		pmt_update(&pmt_timer);
+		uloop_timeout_cancel(&pmt_timer);
+		fprintf(stderr, "\n");
+	}
+
 	if (!cl->data_eof) {
 		if (!quiet)
 			fprintf(stderr, "Connection reset prematurely\n");
 		error_ret = 4;
 	} else if (!quiet) {
-		fprintf(stderr, "Download completed (%d bytes)\n", out_bytes);
+		fprintf(stderr, "Download completed (%"PRIu64" bytes)\n", (uint64_t) out_bytes);
 	}
 	request_done(cl);
 }
@@ -385,19 +472,24 @@ static int usage(const char *progname)
 	fprintf(stderr,
 		"Usage: %s [options] <URL>\n"
 		"Options:\n"
-		"	-q:                             Turn off status messages\n"
-		"	-O <file>:                      Redirect output to file (use \"-\" for stdout)\n"
+		"	-4				Use IPv4 only\n"
+		"	-6				Use IPv6 only\n"
+		"	-q				Turn off status messages\n"
+		"	-O <file>			Redirect output to file (use \"-\" for stdout)\n"
+		"	-P <dir>			Set directory for output files\n"
 		"	--user=<user>			HTTP authentication username\n"
 		"	--password=<password>		HTTP authentication password\n"
 		"	--user-agent|-U <str>		Set HTTP user agent\n"
 		"	--post-data=STRING		use the POST method; send STRING as the data\n"
+		"	--post-file=FILE		use the POST method; send FILE as the data\n"
 		"	--spider|-s			Spider mode - only check file existence\n"
 		"	--timeout=N|-T N		Set connect/request timeout to N seconds\n"
 		"	--proxy=on|off|-Y on|off	Enable/disable env var configured proxy\n"
 		"\n"
 		"HTTPS options:\n"
-		"	--ca-certificate=<cert>:        Load CA certificates from file <cert>\n"
-		"	--no-check-certificate:         don't validate the server's certificate\n"
+		"	--ca-certificate=<cert>		Load CA certificates from file <cert>\n"
+		"	--no-check-certificate		don't validate the server's certificate\n"
+		"	--ciphers=<cipherlist>		Set the cipher list string\n"
 		"\n", progname);
 	return 1;
 }
@@ -405,7 +497,7 @@ static int usage(const char *progname)
 static void init_ca_cert(void)
 {
 	glob_t gl;
-	int i;
+	unsigned int i;
 
 	glob("/etc/ssl/certs/*.crt", 0, NULL, &gl);
 	for (i = 0; i < gl.gl_pathc; i++)
@@ -429,36 +521,47 @@ static void init_ustream_ssl(void)
 
 static int no_ssl(const char *progname)
 {
-	fprintf(stderr, "%s: SSL support not available, please install ustream-ssl\n", progname);
+	fprintf(stderr,
+	        "%s: SSL support not available, please install one of the "
+	        "libustream-.*[ssl|tls] packages as well as the ca-bundle and "
+		"ca-certificates packages.\n",
+	        progname);
+
 	return 1;
 }
 
 enum {
 	L_NO_CHECK_CERTIFICATE,
 	L_CA_CERTIFICATE,
+	L_CIPHERS,
 	L_USER,
 	L_PASSWORD,
 	L_USER_AGENT,
 	L_POST_DATA,
+	L_POST_FILE,
 	L_SPIDER,
 	L_TIMEOUT,
 	L_CONTINUE,
 	L_PROXY,
 	L_NO_PROXY,
+	L_QUIET,
 };
 
 static const struct option longopts[] = {
-	[L_NO_CHECK_CERTIFICATE] = { "no-check-certificate", no_argument },
-	[L_CA_CERTIFICATE] = { "ca-certificate", required_argument },
-	[L_USER] = { "user", required_argument },
-	[L_PASSWORD] = { "password", required_argument },
-	[L_USER_AGENT] = { "user-agent", required_argument },
-	[L_POST_DATA] = { "post-data", required_argument },
-	[L_SPIDER] = { "spider", no_argument },
-	[L_TIMEOUT] = { "timeout", required_argument },
-	[L_CONTINUE] = { "continue", no_argument },
-	[L_PROXY] = { "proxy", required_argument },
-	[L_NO_PROXY] = { "no-proxy", no_argument },
+	[L_NO_CHECK_CERTIFICATE] = { "no-check-certificate", no_argument, NULL, 0 },
+	[L_CA_CERTIFICATE] = { "ca-certificate", required_argument, NULL, 0 },
+	[L_CIPHERS] = { "ciphers", required_argument, NULL, 0 },
+	[L_USER] = { "user", required_argument, NULL, 0 },
+	[L_PASSWORD] = { "password", required_argument, NULL, 0 },
+	[L_USER_AGENT] = { "user-agent", required_argument, NULL, 0 },
+	[L_POST_DATA] = { "post-data", required_argument, NULL, 0 },
+	[L_POST_FILE] = { "post-file", required_argument, NULL, 0 },
+	[L_SPIDER] = { "spider", no_argument, NULL, 0 },
+	[L_TIMEOUT] = { "timeout", required_argument, NULL, 0 },
+	[L_CONTINUE] = { "continue", no_argument, NULL, 0 },
+	[L_PROXY] = { "proxy", required_argument, NULL, 0 },
+	[L_NO_PROXY] = { "no-proxy", no_argument, NULL, 0 },
+	[L_QUIET] = { "quiet", no_argument, NULL, 0 },
 	{}
 };
 
@@ -475,10 +578,12 @@ int main(int argc, char **argv)
 	bool has_cert = false;
 	int i, ch;
 	int rc;
+	int af = -1;
 
+	signal(SIGPIPE, SIG_IGN);
 	init_ustream_ssl();
 
-	while ((ch = getopt_long(argc, argv, "cO:qsU:Y:", longopts, &longopt_idx)) != -1) {
+	while ((ch = getopt_long(argc, argv, "46cO:P:qsT:U:Y:", longopts, &longopt_idx)) != -1) {
 		switch(ch) {
 		case 0:
 			switch (longopt_idx) {
@@ -490,6 +595,15 @@ int main(int argc, char **argv)
 				if (ssl_ctx)
 					ssl_ops->context_add_ca_crt_file(ssl_ctx, optarg);
 				break;
+			case L_CIPHERS:
+				if (ssl_ctx) {
+					if (ssl_ops->context_set_ciphers(ssl_ctx, optarg)) {
+						if (!quiet)
+							fprintf(stderr, "No recognized ciphers in cipher list\n");
+						exit(1);
+					}
+				}
+				break;
 			case L_USER:
 				if (!strlen(optarg))
 					break;
@@ -508,6 +622,9 @@ int main(int argc, char **argv)
 			case L_POST_DATA:
 				post_data = optarg;
 				break;
+			case L_POST_FILE:
+				post_file = optarg;
+				break;
 			case L_SPIDER:
 				no_output = true;
 				break;
@@ -524,10 +641,19 @@ int main(int argc, char **argv)
 			case L_NO_PROXY:
 				proxy = false;
 				break;
+			case L_QUIET:
+				quiet = true;
+				break;
 			default:
 				return usage(progname);
 			}
 			break;
+		case '4':
+			af = AF_INET;
+			break;
+		case '6':
+			af = AF_INET6;
+			break;
 		case 'c':
 			resume = true;
 			break;
@@ -535,7 +661,14 @@ int main(int argc, char **argv)
 			user_agent = optarg;
 			break;
 		case 'O':
-			output_file = optarg;
+			opt_output_file = optarg;
+			break;
+		case 'P':
+			if (chdir(optarg)) {
+				if (!quiet)
+					perror("Change output directory");
+				exit(1);
+			}
 			break;
 		case 'q':
 			quiet = true;
@@ -577,9 +710,11 @@ int main(int argc, char **argv)
 	uloop_init();
 
 	if (username) {
-		if (password)
-			asprintf(&auth_str, "%s:%s", username, password);
-		else
+		if (password) {
+			rc = asprintf(&auth_str, "%s:%s", username, password);
+			if (rc < 0)
+				return rc;
+		} else
 			auth_str = username;
 	}
 
@@ -589,7 +724,8 @@ int main(int argc, char **argv)
 	proxy_url = get_proxy_url(argv[0]);
 	if (proxy_url) {
 		cl = uclient_new(proxy_url, auth_str, &cb);
-		uclient_set_proxy_url(cl, argv[0], NULL);
+		if (cl)
+		    uclient_set_proxy_url(cl, argv[0], NULL);
 	} else {
 		cl = uclient_new(argv[0], auth_str, &cb);
 	}
@@ -597,6 +733,8 @@ int main(int argc, char **argv)
 		fprintf(stderr, "Failed to allocate uclient context\n");
 		return 1;
 	}
+	if (af >= 0)
+	    uclient_http_set_address_family(cl, af);
 
 	if (ssl_ctx && default_certs)
 		init_ca_cert();
@@ -607,7 +745,7 @@ int main(int argc, char **argv)
 		/* no error received, we can enter main loop */
 		uloop_run();
 	} else {
-		fprintf(stderr, "Failed to establish connection\n");
+		fprintf(stderr, "Failed to send request: %s\n", strerror(rc));
 		error_ret = 4;
 	}