X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=uclient-fetch.c;h=914bdccdeb59c51e3c76a42e1d5eaf85eb9de8f9;hb=c61c854703515fa7bafcbe105ec01e3d833eeb19;hp=22f15c6feb801cdafe05b811ce076e56d22f9ea4;hpb=5152b7147e7a2fbb4543160e69ea75dbb3b5821a;p=project%2Fuclient.git

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 22f15c6..914bdcc 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -22,6 +22,7 @@
 #include <dlfcn.h>
 #include <getopt.h>
 #include <fcntl.h>
+#include <glob.h>
 
 #include <libubox/blobmsg.h>
 
@@ -34,10 +35,12 @@
 #define LIB_EXT "so"
 #endif
 
+static const char *user_agent = "uclient-fetch";
 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;
@@ -45,6 +48,10 @@ 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)
 {
@@ -75,16 +82,6 @@ static int open_output_file(const char *path, bool create)
 	return ret;
 }
 
-static void request_done(struct uclient *cl)
-{
-	if (output_fd >= 0 && !output_file) {
-		close(output_fd);
-		output_fd = -1;
-	}
-	uclient_disconnect(cl);
-	uloop_end();
-}
-
 static void header_done_cb(struct uclient *cl)
 {
 	static int retries;
@@ -154,6 +151,7 @@ static int init_request(struct uclient *cl)
 	int rc;
 
 	out_bytes = 0;
+	uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
 
 	rc = uclient_connect(cl);
 	if (rc)
@@ -165,6 +163,9 @@ static int init_request(struct uclient *cl)
 	if (rc)
 		return rc;
 
+	uclient_http_reset_headers(cl);
+	uclient_http_set_header(cl, "User-Agent", user_agent);
+
 	rc = uclient_request(cl);
 	if (rc)
 		return rc;
@@ -172,6 +173,25 @@ static int init_request(struct uclient *cl)
 	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) {
@@ -194,6 +214,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;
@@ -232,6 +256,9 @@ 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"
 		"\n"
 		"HTTPS options:\n"
 		"	--ca-certificate=<cert>:        Load CA certificates from file <cert>\n"
@@ -240,6 +267,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)
 {
@@ -267,6 +303,7 @@ enum {
 	L_CA_CERTIFICATE,
 	L_USER,
 	L_PASSWORD,
+	L_USER_AGENT,
 };
 
 static const struct option longopts[] = {
@@ -274,20 +311,24 @@ static const struct option longopts[] = {
 	[L_CA_CERTIFICATE] = { "ca-certificate", required_argument },
 	[L_USER] = { "user", required_argument },
 	[L_PASSWORD] = { "password", required_argument },
+	[L_USER_AGENT] = { "user-agent", 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) {
@@ -295,6 +336,7 @@ 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;
@@ -310,10 +352,16 @@ int main(int argc, char **argv)
 				password = strdup(optarg);
 				memset(optarg, '*', strlen(optarg));
 				break;
+			case L_USER_AGENT:
+				user_agent = optarg;
+				break;
 			default:
 				return usage(progname);
 			}
 			break;
+		case 'U':
+			user_agent = optarg;
+			break;
 		case 'O':
 			output_file = optarg;
 			break;
@@ -328,11 +376,21 @@ 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();
 
@@ -353,7 +411,7 @@ int main(int argc, char **argv)
 	}
 
 	if (ssl_ctx)
-		uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
+		init_ca_cert();
 
 	rc = init_request(cl);
 	if (!rc) {