X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-fetch.c;h=ab29ceac2803e03dbf78cde41ee1904384596470;hp=9040f84fa7588e13fe6a4d5f5bb0b04e70aab2d9;hb=b9bb340542facf12789047182d2f05a11499dcdd;hpb=131a36634ca800b377a212c5e14527d0ee0f7222

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 9040f84..ab29cea 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -16,15 +16,18 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define _GNU_SOURCE
 #include <unistd.h>
 #include <stdio.h>
 #include <dlfcn.h>
 #include <getopt.h>
 #include <fcntl.h>
+#include <glob.h>
 
 #include <libubox/blobmsg.h>
 
 #include "uclient.h"
+#include "uclient-utils.h"
 
 #ifdef __APPLE__
 #define LIB_EXT "dylib"
@@ -32,75 +35,58 @@
 #define LIB_EXT "so"
 #endif
 
+static const char *user_agent = "uclient-fetch";
+static const char *post_data;
 static struct ustream_ssl_ctx *ssl_ctx;
 static const struct ustream_ssl_ops *ssl_ops;
 static int quiet = false;
 static bool verify = true;
+static bool default_certs = false;
 static const char *output_file;
 static int output_fd = -1;
 static int error_ret;
+static int out_bytes;
+static char *username;
+static char *password;
+static char *auth_str;
+static char **urls;
+static int n_urls;
+
+static void request_done(struct uclient *cl);
 
 static int open_output_file(const char *path, bool create)
 {
-	const char *str;
 	char *filename;
-	int len;
 	int flags = O_WRONLY;
+	int ret;
 
 	if (create)
-		flags |= O_CREAT;
+		flags |= O_CREAT | O_EXCL;
 
 	if (output_file) {
 		if (!strcmp(output_file, "-"))
 			return STDOUT_FILENO;
 
-		return open(output_file, flags, 0644);
-	}
-
-	/* Don't automatically overwrite files if the name is derived from the URL */
-	if (create)
-		flags |= O_EXCL;
-
-	len = strcspn(path, ";&");
-	while (len > 0 && path[len - 1] == '/')
-		len--;
-
-	for (str = path + len - 1; str >= path; str--) {
-		if (*str == '/')
-			break;
-	}
-
-	str++;
-	len -= str - path;
+		if (!quiet)
+			fprintf(stderr, "Writing to stdout\n");
 
-	if (len > 0) {
-		filename = alloca(len + 1);
-		strncpy(filename, str, len);
-		filename[len] = 0;
-	} else {
-		filename = "index.html";
+		unlink(output_file);
+		return open(output_file, flags, 0644);
 	}
 
-	return open(filename, flags, 0644);
-}
+	filename = uclient_get_url_filename(path, "index.html");
+	if (!quiet)
+		fprintf(stderr, "Writing to '%s'\n", filename);
+	ret = open(filename, flags, 0644);
+	free(filename);
 
-static void request_done(struct uclient *cl)
-{
-	if (output_fd >= 0 && !output_file) {
-		close(output_fd);
-		output_fd = -1;
-	}
-	uclient_disconnect(cl);
-	uloop_end();
+	return ret;
 }
 
 static void header_done_cb(struct uclient *cl)
 {
 	static int retries;
 
-	struct blob_attr *cur;
-	int rem;
-
 	if (retries < 10 && uclient_http_redirect(cl)) {
 		if (!quiet)
 			fprintf(stderr, "Redirected to %s on %s\n", cl->url->location, cl->url->host);
@@ -110,13 +96,6 @@ static void header_done_cb(struct uclient *cl)
 	}
 
 	retries = 0;
-	if (!quiet) {
-		fprintf(stderr, "Headers (%d): \n", cl->status_code);
-		blobmsg_for_each_attr(cur, cl->meta, rem) {
-			fprintf(stderr, "%s=%s\n", blobmsg_name(cur), (char *) blobmsg_data(cur));
-		}
-	}
-
 	switch (cl->status_code) {
 	case 204:
 	case 200:
@@ -130,6 +109,8 @@ static void header_done_cb(struct uclient *cl)
 		break;
 
 	default:
+		if (!quiet)
+			fprintf(stderr, "HTTP error %d\n", cl->status_code);
 		request_done(cl);
 		error_ret = 8;
 		break;
@@ -149,6 +130,7 @@ static void read_data_cb(struct uclient *cl)
 		if (!len)
 			return;
 
+		out_bytes += len;
 		write(output_fd, buf, len);
 	}
 }
@@ -162,19 +144,69 @@ static void msg_connecting(struct uclient *cl)
 		return;
 
 	uclient_get_addr(addr, &port, &cl->remote_addr);
-	fprintf(stderr, "Connecting to %s %s:%d\n", cl->url->host, addr, port);
+	fprintf(stderr, "Connecting to %s:%d\n", addr, port);
 }
 
-static void init_request(struct uclient *cl)
+static int init_request(struct uclient *cl)
 {
-	uclient_connect(cl);
+	int rc;
+
+	out_bytes = 0;
+	uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
+
+	rc = uclient_connect(cl);
+	if (rc)
+		return rc;
+
 	msg_connecting(cl);
-	uclient_http_set_request_type(cl, "GET");
-	uclient_request(cl);
+
+	rc = uclient_http_set_request_type(cl, post_data ? "POST" : "GET");
+	if (rc)
+		return rc;
+
+	uclient_http_reset_headers(cl);
+	uclient_http_set_header(cl, "User-Agent", user_agent);
+
+	if (post_data) {
+		uclient_http_set_header(cl, "Content-Type", "application/x-www-form-urlencoded");
+		uclient_write(cl, post_data, strlen(post_data));
+	}
+
+	rc = uclient_request(cl);
+	if (rc)
+		return rc;
+
+	return 0;
+}
+
+static void request_done(struct uclient *cl)
+{
+	if (n_urls) {
+		uclient_set_url(cl, *urls, auth_str);
+		n_urls--;
+		error_ret = init_request(cl);
+		if (error_ret == 0)
+			return;
+	}
+
+	if (output_fd >= 0 && !output_file) {
+		close(output_fd);
+		output_fd = -1;
+	}
+	uclient_disconnect(cl);
+	uloop_end();
 }
 
+
 static void eof_cb(struct uclient *cl)
 {
+	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);
+	}
 	request_done(cl);
 }
 
@@ -188,6 +220,10 @@ static void handle_uclient_error(struct uclient *cl, int code)
 		type = "Connection failed";
 		error_ret = 4;
 		break;
+	case UCLIENT_ERROR_TIMEDOUT:
+		type = "Connection timed out";
+		error_ret = 4;
+		break;
 	case UCLIENT_ERROR_SSL_INVALID_CERT:
 		type = "Invalid SSL certificate";
 		ignore = !verify;
@@ -226,6 +262,10 @@ static int usage(const char *progname)
 		"Options:\n"
 		"	-q:                             Turn off status messages\n"
 		"	-O <file>:                      Redirect output to file (use \"-\" for stdout)\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"
 		"\n"
 		"HTTPS options:\n"
 		"	--ca-certificate=<cert>:        Load CA certificates from file <cert>\n"
@@ -234,6 +274,15 @@ static int usage(const char *progname)
 	return 1;
 }
 
+static void init_ca_cert(void)
+{
+	glob_t gl;
+	int i;
+
+	glob("/etc/ssl/certs/*.crt", 0, NULL, &gl);
+	for (i = 0; i < gl.gl_pathc; i++)
+		ssl_ops->context_add_ca_crt_file(ssl_ctx, gl.gl_pathv[i]);
+}
 
 static void init_ustream_ssl(void)
 {
@@ -259,24 +308,36 @@ static int no_ssl(const char *progname)
 enum {
 	L_NO_CHECK_CERTIFICATE,
 	L_CA_CERTIFICATE,
+	L_USER,
+	L_PASSWORD,
+	L_USER_AGENT,
+	L_POST_DATA,
 };
 
 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 },
 	{}
 };
 
+
+
 int main(int argc, char **argv)
 {
 	const char *progname = argv[0];
 	struct uclient *cl;
-	int ch;
 	int longopt_idx = 0;
+	bool has_cert = false;
+	int i, ch;
+	int rc;
 
 	init_ustream_ssl();
 
-	while ((ch = getopt_long(argc, argv, "qO:", longopts, &longopt_idx)) != -1) {
+	while ((ch = getopt_long(argc, argv, "qO:U:", longopts, &longopt_idx)) != -1) {
 		switch(ch) {
 		case 0:
 			switch (longopt_idx) {
@@ -284,13 +345,35 @@ int main(int argc, char **argv)
 				verify = false;
 				break;
 			case L_CA_CERTIFICATE:
+				has_cert = true;
 				if (ssl_ctx)
 					ssl_ops->context_add_ca_crt_file(ssl_ctx, optarg);
 				break;
+			case L_USER:
+				if (!strlen(optarg))
+					break;
+				username = strdup(optarg);
+				memset(optarg, '*', strlen(optarg));
+				break;
+			case L_PASSWORD:
+				if (!strlen(optarg))
+					break;
+				password = strdup(optarg);
+				memset(optarg, '*', strlen(optarg));
+				break;
+			case L_USER_AGENT:
+				user_agent = optarg;
+				break;
+			case L_POST_DATA:
+				post_data = optarg;
+				break;
 			default:
 				return usage(progname);
 			}
 			break;
+		case 'U':
+			user_agent = optarg;
+			break;
 		case 'O':
 			output_file = optarg;
 			break;
@@ -305,25 +388,52 @@ int main(int argc, char **argv)
 	argv += optind;
 	argc -= optind;
 
-	if (argc != 1)
+	if (verify && !has_cert)
+		default_certs = true;
+
+	if (argc < 1)
 		return usage(progname);
 
-	if (!strncmp(argv[0], "https", 5) && !ssl_ctx)
-		return no_ssl(progname);
+	if (!ssl_ctx) {
+		for (i = 0; i < argc; i++) {
+			if (!strncmp(argv[i], "https", 5))
+				return no_ssl(progname);
+		}
+	}
+
+	urls = argv + 1;
+	n_urls = argc - 1;
 
 	uloop_init();
 
-	cl = uclient_new(argv[0], NULL, &cb);
+	if (username) {
+		if (password)
+			asprintf(&auth_str, "%s:%s", username, password);
+		else
+			auth_str = username;
+	}
+
+	if (!quiet)
+		fprintf(stderr, "Downloading '%s'\n", argv[0]);
+
+	cl = uclient_new(argv[0], auth_str, &cb);
 	if (!cl) {
 		fprintf(stderr, "Failed to allocate uclient context\n");
 		return 1;
 	}
 
-	if (ssl_ctx)
-		uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
+	if (ssl_ctx && default_certs)
+		init_ca_cert();
+
+	rc = init_request(cl);
+	if (!rc) {
+		/* no error received, we can enter main loop */
+		uloop_run();
+	} else {
+		fprintf(stderr, "Failed to establish connection\n");
+		error_ret = 4;
+	}
 
-	init_request(cl);
-	uloop_run();
 	uloop_done();
 
 	uclient_free(cl);