#include <sys/socket.h>
#include <unistd.h>
#include <stdio.h>
-#include <dlfcn.h>
#include <getopt.h>
#include <fcntl.h>
#include <glob.h>
#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";
error_ret = 8;
break;
}
+ /* fall through */
case 204:
case 200:
if (no_output)
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";
.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)
"Options:\n"
" -4 Use IPv4 only\n"
" -6 Use IPv6 only\n"
- " -q Turn off status messages\n"
" -O <file> Redirect output to file (use \"-\" for stdout)\n"
" -P <dir> Set directory for output files\n"
+ " --quiet | -q Turn off status messages\n"
+ " --continue | -c Continue a partially-downloaded file\n"
" --user=<user> HTTP authentication username\n"
" --password=<password> HTTP authentication password\n"
- " --user-agent|-U <str> Set HTTP user agent\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"
+ " --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=<cert> Load CA certificates from file <cert>\n"
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)
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_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_CIPHERS] = { "ciphers", 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_POST_FILE] = { "post-file", 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 },
{}
};
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;
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:
case L_QUIET:
quiet = true;
break;
+ case L_VERBOSE:
+ debug_level++;
+ break;
default:
return usage(progname);
}
case 'T':
timeout = atoi(optarg);
break;
+ case 'v':
+ debug_level++;
+ break;
case 'Y':
if (strcmp(optarg, "on") != 0)
proxy = false;
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;
projects / project / uclient.git / blobdiff