X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuclient.git;a=blobdiff_plain;f=uclient-fetch.c;h=38c9c53e35c7f20c4f36d059f5f25673a4e81176;hp=fa60eb3ba18b099f1dfa644948ff7dfc3ea99c2d;hb=9fd8070c6395ee0ab6b5a7c0d98c370ce0847553;hpb=b99c7ce8573f8650c4cafdc23ac7f44da46f4927 diff --git a/uclient-fetch.c b/uclient-fetch.c index fa60eb3..38c9c53 100644 --- a/uclient-fetch.c +++ b/uclient-fetch.c @@ -18,6 +18,7 @@ #define _GNU_SOURCE #include +#include #include #include #include @@ -26,9 +27,11 @@ #include #include #include +#include #include +#include "progress.h" #include "uclient.h" #include "uclient-utils.h" @@ -44,25 +47,57 @@ 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 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 char *username; -static char *password; +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) +{ + char prefix[16]; + char *sep; + + if (!proxy) + return NULL; + + sep = strchr(url, ':'); + if (!sep) + return NULL; + + if (sep - url > 5) + return NULL; + + memcpy(prefix, url, sep - url); + strcpy(prefix + (sep - url), "_proxy"); + return getenv(prefix); +} + 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; @@ -70,7 +105,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; @@ -79,50 +117,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 + }; + 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 *attr; + 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) { @@ -132,6 +200,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) @@ -147,15 +217,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"); @@ -166,6 +236,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) @@ -187,6 +261,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) @@ -194,12 +269,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; + } } } @@ -242,7 +320,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) @@ -277,8 +357,16 @@ static int init_request(struct uclient *cl) static void request_done(struct uclient *cl) { + const char *proxy_url; + if (n_urls) { - uclient_set_url(cl, *urls, auth_str); + proxy_url = get_proxy_url(*urls); + if (proxy_url) { + uclient_set_url(cl, proxy_url, NULL); + uclient_set_proxy_url(cl, *urls, auth_str); + } else { + uclient_set_url(cl, *urls, auth_str); + } n_urls--; cur_resume = resume; error_ret = init_request(cl); @@ -286,7 +374,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; } @@ -297,12 +385,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); } @@ -357,18 +451,22 @@ static int usage(const char *progname) fprintf(stderr, "Usage: %s [options] \n" "Options:\n" - " -q: Turn off status messages\n" - " -O : 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 Redirect output to file (use \"-\" for stdout)\n" + " -P Set directory for output files\n" " --user= HTTP authentication username\n" " --password= HTTP authentication password\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" "\n" "HTTPS options:\n" - " --ca-certificate=: Load CA certificates from file \n" - " --no-check-certificate: don't validate the server's certificate\n" + " --ca-certificate= Load CA certificates from file \n" + " --no-check-certificate don't validate the server's certificate\n" "\n", progname); return 1; } @@ -400,7 +498,12 @@ 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; } @@ -414,6 +517,9 @@ enum { L_SPIDER, L_TIMEOUT, L_CONTINUE, + L_PROXY, + L_NO_PROXY, + L_QUIET, }; static const struct option longopts[] = { @@ -426,6 +532,9 @@ static const struct option longopts[] = { [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 }, {} }; @@ -434,15 +543,20 @@ static const struct option longopts[] = { int main(int argc, char **argv) { const char *progname = argv[0]; + const char *proxy_url; + char *username = NULL; + char *password = NULL; struct uclient *cl; int longopt_idx = 0; 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:", 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) { @@ -481,10 +595,26 @@ int main(int argc, char **argv) case L_CONTINUE: resume = true; break; + case L_PROXY: + if (strcmp(optarg, "on") != 0) + proxy = false; + break; + 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; @@ -492,7 +622,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; @@ -503,6 +640,10 @@ int main(int argc, char **argv) case 'T': timeout = atoi(optarg); break; + case 'Y': + if (strcmp(optarg, "on") != 0) + proxy = false; + break; default: return usage(progname); } @@ -530,20 +671,31 @@ 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; } if (!quiet) fprintf(stderr, "Downloading '%s'\n", argv[0]); - cl = uclient_new(argv[0], auth_str, &cb); + proxy_url = get_proxy_url(argv[0]); + if (proxy_url) { + cl = uclient_new(proxy_url, auth_str, &cb); + if (cl) + uclient_set_proxy_url(cl, argv[0], NULL); + } else { + cl = uclient_new(argv[0], auth_str, &cb); + } if (!cl) { 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();