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;
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;
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;
}
} else {
filename = uclient_get_url_filename(path, "index.html");
+ if (!filename) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
output_file = filename;
}
free:
free(filename);
+out:
return ret;
}
static void read_data_cb(struct uclient *cl)
{
char buf[256];
+ ssize_t n;
int len;
if (!no_output && output_fd < 0)
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;
+ }
}
}
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;
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)
return;
}
- if (output_fd >= 0 && !output_file) {
+ if (output_fd >= 0 && !opt_output_file) {
close(output_fd);
output_fd = -1;
}
" --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"
"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;
}
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++)
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;
}
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,
};
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 },
{}
};
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;
case L_POST_DATA:
post_data = optarg;
break;
+ case L_POST_FILE:
+ post_file = optarg;
+ break;
case L_SPIDER:
no_output = true;
break;
user_agent = optarg;
break;
case 'O':
- output_file = optarg;
+ opt_output_file = optarg;
break;
case 'P':
if (chdir(optarg)) {
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;
}
/* 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;
}
projects / project / uclient.git / blobdiff