X-Git-Url: http://git.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-fetch.c;h=282092e2f556a54c9a74366840231c57450c1428;hp=3c0c36b9e1cf4c119418621b53a7189e3ba130e6;hb=HEAD;hpb=c444957f5589049932f62cb901669ceb86ba48c1 diff --git a/uclient-fetch.c b/uclient-fetch.c index 3c0c36b..b2b8d0d 100644 --- a/uclient-fetch.c +++ b/uclient-fetch.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -35,14 +34,13 @@ #include "uclient.h" #include "uclient-utils.h" -#ifdef __APPLE__ -#define LIB_EXT "dylib" -#else -#define LIB_EXT "so" +#ifndef strdupa +#define strdupa(x) strcpy(alloca(strlen(x)+1),x) #endif 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; @@ -50,7 +48,7 @@ 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 off_t out_offset; @@ -97,6 +95,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; @@ -121,6 +120,11 @@ static int open_output_file(const char *path, uint64_t resume_offset) } } else { filename = uclient_get_url_filename(path, "index.html"); + if (!filename) { + ret = -ENOMEM; + goto out; + } + output_file = filename; } @@ -150,6 +154,7 @@ done: free: free(filename); +out: return ret; } @@ -225,6 +230,7 @@ static void header_done_cb(struct uclient *cl) error_ret = 8; break; } + /* fall through */ case 204: case 200: if (no_output) @@ -254,6 +260,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) @@ -261,12 +268,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; + } } } @@ -323,7 +333,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; @@ -336,6 +346,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) @@ -363,7 +393,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; } @@ -390,6 +420,23 @@ static void eof_cb(struct uclient *cl) request_done(cl); } +static void +handle_uclient_log_msg(struct uclient *cl, enum uclient_log_type type, const char *msg) +{ + static const char * const type_str_list[] = { + [UCLIENT_LOG_SSL_ERROR] = "SSL error", + [UCLIENT_LOG_SSL_VERIFY_ERROR] = "SSL verify error", + }; + const char *type_str = NULL; + + if (type < ARRAY_SIZE(type_str_list)) + type_str = type_str_list[type]; + if (!type_str) + type_str = "Unknown"; + + fprintf(stderr, "%s: %s\n", type_str, msg); +} + static void handle_uclient_error(struct uclient *cl, int code) { const char *type = "Unknown error"; @@ -433,6 +480,7 @@ static const struct uclient_cb cb = { .data_read = read_data_cb, .data_eof = eof_cb, .error = handle_uclient_error, + .log_msg = handle_uclient_log_msg, }; static int usage(const char *progname) @@ -442,20 +490,25 @@ static int usage(const char *progname) "Options:\n" " -4 Use IPv4 only\n" " -6 Use IPv6 only\n" - " -q Turn off status messages\n" " -O Redirect output to file (use \"-\" for stdout)\n" " -P Set directory for output files\n" + " --quiet | -q Turn off status messages\n" + " --continue | -c Continue a partially-downloaded file\n" " --user= HTTP authentication username\n" " --password= HTTP authentication password\n" - " --user-agent|-U Set HTTP user agent\n" + " --user-agent | -U Set HTTP user agent\n" " --post-data=STRING use the POST method; send STRING 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" + " --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 | -Y on Enable interpretation of proxy env vars (default)\n" + " --proxy=off | -Y off |\n" + " --no-proxy Disable interpretation of proxy env vars\n" "\n" "HTTPS options:\n" " --ca-certificate= Load CA certificates from file \n" " --no-check-certificate don't validate the server's certificate\n" + " --ciphers= Set the cipher list string\n" "\n", progname); return 1; } @@ -463,67 +516,64 @@ 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]); -} - -static void init_ustream_ssl(void) -{ - void *dlh; - - dlh = dlopen("libustream-ssl." LIB_EXT, RTLD_LAZY | RTLD_LOCAL); - if (!dlh) - return; - - ssl_ops = dlsym(dlh, "ustream_ssl_ops"); - if (!ssl_ops) - return; - - ssl_ctx = ssl_ops->context_new(false); + globfree(&gl); } static int no_ssl(const char *progname) { fprintf(stderr, "%s: SSL support not available, please install one of the " - "libustream-ssl-* libraries as well as the ca-bundle and ", + "libustream-.*[ssl|tls] packages as well as the ca-bundle and " "ca-certificates packages.\n", progname); return 1; } +static void debug_cb(void *priv, int level, const char *msg) +{ + fprintf(stderr, "%s\n", msg); +} + 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, + L_VERBOSE, }; 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 }, + [L_VERBOSE] = { "verbose", no_argument, NULL, 0 }, {} }; @@ -541,32 +591,44 @@ int main(int argc, char **argv) int i, ch; int rc; int af = -1; + int debug_level = 0; signal(SIGPIPE, SIG_IGN); - init_ustream_ssl(); + ssl_ctx = uclient_new_ssl_context(&ssl_ops); - while ((ch = getopt_long(argc, argv, "46cO:P:qsT:U:Y:", longopts, &longopt_idx)) != -1) { + while ((ch = getopt_long(argc, argv, "46cO:P:qsT:U:vY:", longopts, &longopt_idx)) != -1) { switch(ch) { case 0: 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: @@ -575,6 +637,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; @@ -594,6 +659,9 @@ int main(int argc, char **argv) case L_QUIET: quiet = true; break; + case L_VERBOSE: + debug_level++; + break; default: return usage(progname); } @@ -611,7 +679,7 @@ 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)) { @@ -629,6 +697,9 @@ int main(int argc, char **argv) case 'T': timeout = atoi(optarg); break; + case 'v': + debug_level++; + break; case 'Y': if (strcmp(optarg, "on") != 0) proxy = false; @@ -641,6 +712,9 @@ int main(int argc, char **argv) argv += optind; argc -= optind; + if (debug_level) + ssl_ops->context_set_debug(ssl_ctx, debug_level, debug_cb, NULL); + if (verify && !has_cert) default_certs = true; @@ -660,9 +734,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; } @@ -693,7 +769,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; }