X-Git-Url: http://git.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-fetch.c;h=958f75618194d141d5aaaec74ca0db165a2ae8f2;hp=38c9c53e35c7f20c4f36d059f5f25673a4e81176;hb=073f89f567c04ee0e5df235051cb8d4c93dbcbea;hpb=9fd8070c6395ee0ab6b5a7c0d98c370ce0847553

diff --git a/uclient-fetch.c b/uclient-fetch.c
index 38c9c53..958f756 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -43,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;
@@ -232,6 +233,7 @@ static void header_done_cb(struct uclient *cl)
 			error_ret = 8;
 			break;
 		}
+		/* fall through */
 	case 204:
 	case 200:
 		if (no_output)
@@ -334,7 +336,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;
 
@@ -347,6 +349,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)
@@ -460,6 +482,7 @@ static int usage(const char *progname)
 		"	--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"
@@ -467,6 +490,7 @@ static int usage(const char *progname)
 		"HTTPS options:\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;
 }
@@ -474,11 +498,12 @@ 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++)
 		ssl_ops->context_add_ca_crt_file(ssl_ctx, gl.gl_pathv[i]);
+	globfree(&gl);
 }
 
 static void init_ustream_ssl(void)
@@ -510,10 +535,12 @@ static int no_ssl(const char *progname)
 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,
@@ -523,18 +550,20 @@ enum {
 };
 
 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_QUIET] = { "quiet", 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 },
 	{}
 };
 
@@ -562,22 +591,33 @@ int main(int argc, char **argv)
 			switch (longopt_idx) {
 			case L_NO_CHECK_CERTIFICATE:
 				verify = false;
+				if (ssl_ctx)
+					ssl_ops->context_set_require_validation(ssl_ctx, verify);
 				break;
 			case L_CA_CERTIFICATE:
 				has_cert = true;
 				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;
-				username = strdup(optarg);
+				username = strdupa(optarg);
 				memset(optarg, '*', strlen(optarg));
 				break;
 			case L_PASSWORD:
 				if (!strlen(optarg))
 					break;
-				password = strdup(optarg);
+				password = strdupa(optarg);
 				memset(optarg, '*', strlen(optarg));
 				break;
 			case L_USER_AGENT:
@@ -586,6 +626,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;
@@ -706,7 +749,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;
 	}