[Midnightbsd-cvs] src [7120] trunk: Sync fetch with FreeBSD 10-stable.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jul 21 19:33:23 EDT 2015
Revision: 7120
http://svnweb.midnightbsd.org/src/?rev=7120
Author: laffer1
Date: 2015-07-21 19:33:22 -0400 (Tue, 21 Jul 2015)
Log Message:
-----------
Sync fetch with FreeBSD 10-stable. Also introduce SSL support
Modified Paths:
--------------
trunk/lib/libfetch/Makefile
trunk/lib/libfetch/common.c
trunk/lib/libfetch/common.h
trunk/lib/libfetch/fetch.3
trunk/lib/libfetch/fetch.c
trunk/lib/libfetch/fetch.h
trunk/lib/libfetch/file.c
trunk/lib/libfetch/ftp.c
trunk/lib/libfetch/ftp.errors
trunk/lib/libfetch/http.c
trunk/lib/libfetch/http.errors
trunk/usr.bin/fetch/Makefile
trunk/usr.bin/fetch/fetch.1
trunk/usr.bin/fetch/fetch.c
Modified: trunk/lib/libfetch/Makefile
===================================================================
--- trunk/lib/libfetch/Makefile 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/Makefile 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libfetch/Makefile 240496 2012-09-14 13:00:43Z des $
.include <bsd.own.mk>
Modified: trunk/lib/libfetch/common.c
===================================================================
--- trunk/lib/libfetch/common.c 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/common.c 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,5 +1,6 @@
/*-
- * Copyright (c) 1998-2011 Dag-Erling Smørgrav
+ * Copyright (c) 1998-2014 Dag-Erling Smørgrav
+ * Copyright (c) 2013 Michael Gmelin <freebsd at grem.de>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libfetch/common.c 277060 2015-01-12 10:02:23Z des $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -40,6 +41,7 @@
#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
+#include <poll.h>
#include <pwd.h>
#include <stdarg.h>
#include <stdlib.h>
@@ -47,6 +49,10 @@
#include <string.h>
#include <unistd.h>
+#ifdef WITH_SSL
+#include <openssl/x509v3.h>
+#endif
+
#include "fetch.h"
#include "common.h"
@@ -317,15 +323,498 @@
return (conn);
}
+#ifdef WITH_SSL
+/*
+ * Convert characters A-Z to lowercase (intentionally avoid any locale
+ * specific conversions).
+ */
+static char
+fetch_ssl_tolower(char in)
+{
+ if (in >= 'A' && in <= 'Z')
+ return (in + 32);
+ else
+ return (in);
+}
/*
+ * isalpha implementation that intentionally avoids any locale specific
+ * conversions.
+ */
+static int
+fetch_ssl_isalpha(char in)
+{
+ return ((in >= 'A' && in <= 'Z') || (in >= 'a' && in <= 'z'));
+}
+
+/*
+ * Check if passed hostnames a and b are equal.
+ */
+static int
+fetch_ssl_hname_equal(const char *a, size_t alen, const char *b,
+ size_t blen)
+{
+ size_t i;
+
+ if (alen != blen)
+ return (0);
+ for (i = 0; i < alen; ++i) {
+ if (fetch_ssl_tolower(a[i]) != fetch_ssl_tolower(b[i]))
+ return (0);
+ }
+ return (1);
+}
+
+/*
+ * Check if domain label is traditional, meaning that only A-Z, a-z, 0-9
+ * and '-' (hyphen) are allowed. Hyphens have to be surrounded by alpha-
+ * numeric characters. Double hyphens (like they're found in IDN a-labels
+ * 'xn--') are not allowed. Empty labels are invalid.
+ */
+static int
+fetch_ssl_is_trad_domain_label(const char *l, size_t len, int wcok)
+{
+ size_t i;
+
+ if (!len || l[0] == '-' || l[len-1] == '-')
+ return (0);
+ for (i = 0; i < len; ++i) {
+ if (!isdigit(l[i]) &&
+ !fetch_ssl_isalpha(l[i]) &&
+ !(l[i] == '*' && wcok) &&
+ !(l[i] == '-' && l[i - 1] != '-'))
+ return (0);
+ }
+ return (1);
+}
+
+/*
+ * Check if host name consists only of numbers. This might indicate an IP
+ * address, which is not a good idea for CN wildcard comparison.
+ */
+static int
+fetch_ssl_hname_is_only_numbers(const char *hostname, size_t len)
+{
+ size_t i;
+
+ for (i = 0; i < len; ++i) {
+ if (!((hostname[i] >= '0' && hostname[i] <= '9') ||
+ hostname[i] == '.'))
+ return (0);
+ }
+ return (1);
+}
+
+/*
+ * Check if the host name h passed matches the pattern passed in m which
+ * is usually part of subjectAltName or CN of a certificate presented to
+ * the client. This includes wildcard matching. The algorithm is based on
+ * RFC6125, sections 6.4.3 and 7.2, which clarifies RFC2818 and RFC3280.
+ */
+static int
+fetch_ssl_hname_match(const char *h, size_t hlen, const char *m,
+ size_t mlen)
+{
+ int delta, hdotidx, mdot1idx, wcidx;
+ const char *hdot, *mdot1, *mdot2;
+ const char *wc; /* wildcard */
+
+ if (!(h && *h && m && *m))
+ return (0);
+ if ((wc = strnstr(m, "*", mlen)) == NULL)
+ return (fetch_ssl_hname_equal(h, hlen, m, mlen));
+ wcidx = wc - m;
+ /* hostname should not be just dots and numbers */
+ if (fetch_ssl_hname_is_only_numbers(h, hlen))
+ return (0);
+ /* only one wildcard allowed in pattern */
+ if (strnstr(wc + 1, "*", mlen - wcidx - 1) != NULL)
+ return (0);
+ /*
+ * there must be at least two more domain labels and
+ * wildcard has to be in the leftmost label (RFC6125)
+ */
+ mdot1 = strnstr(m, ".", mlen);
+ if (mdot1 == NULL || mdot1 < wc || (mlen - (mdot1 - m)) < 4)
+ return (0);
+ mdot1idx = mdot1 - m;
+ mdot2 = strnstr(mdot1 + 1, ".", mlen - mdot1idx - 1);
+ if (mdot2 == NULL || (mlen - (mdot2 - m)) < 2)
+ return (0);
+ /* hostname must contain a dot and not be the 1st char */
+ hdot = strnstr(h, ".", hlen);
+ if (hdot == NULL || hdot == h)
+ return (0);
+ hdotidx = hdot - h;
+ /*
+ * host part of hostname must be at least as long as
+ * pattern it's supposed to match
+ */
+ if (hdotidx < mdot1idx)
+ return (0);
+ /*
+ * don't allow wildcards in non-traditional domain names
+ * (IDN, A-label, U-label...)
+ */
+ if (!fetch_ssl_is_trad_domain_label(h, hdotidx, 0) ||
+ !fetch_ssl_is_trad_domain_label(m, mdot1idx, 1))
+ return (0);
+ /* match domain part (part after first dot) */
+ if (!fetch_ssl_hname_equal(hdot, hlen - hdotidx, mdot1,
+ mlen - mdot1idx))
+ return (0);
+ /* match part left of wildcard */
+ if (!fetch_ssl_hname_equal(h, wcidx, m, wcidx))
+ return (0);
+ /* match part right of wildcard */
+ delta = mdot1idx - wcidx - 1;
+ if (!fetch_ssl_hname_equal(hdot - delta, delta,
+ mdot1 - delta, delta))
+ return (0);
+ /* all tests succeded, it's a match */
+ return (1);
+}
+
+/*
+ * Get numeric host address info - returns NULL if host was not an IP
+ * address. The caller is responsible for deallocation using
+ * freeaddrinfo(3).
+ */
+static struct addrinfo *
+fetch_ssl_get_numeric_addrinfo(const char *hostname, size_t len)
+{
+ struct addrinfo hints, *res;
+ char *host;
+
+ host = (char *)malloc(len + 1);
+ memcpy(host, hostname, len);
+ host[len] = '\0';
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = PF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = 0;
+ hints.ai_flags = AI_NUMERICHOST;
+ /* port is not relevant for this purpose */
+ getaddrinfo(host, "443", &hints, &res);
+ free(host);
+ return res;
+}
+
+/*
+ * Compare ip address in addrinfo with address passes.
+ */
+static int
+fetch_ssl_ipaddr_match_bin(const struct addrinfo *lhost, const char *rhost,
+ size_t rhostlen)
+{
+ const void *left;
+
+ if (lhost->ai_family == AF_INET && rhostlen == 4) {
+ left = (void *)&((struct sockaddr_in*)(void *)
+ lhost->ai_addr)->sin_addr.s_addr;
+#ifdef INET6
+ } else if (lhost->ai_family == AF_INET6 && rhostlen == 16) {
+ left = (void *)&((struct sockaddr_in6 *)(void *)
+ lhost->ai_addr)->sin6_addr;
+#endif
+ } else
+ return (0);
+ return (!memcmp(left, (const void *)rhost, rhostlen) ? 1 : 0);
+}
+
+/*
+ * Compare ip address in addrinfo with host passed. If host is not an IP
+ * address, comparison will fail.
+ */
+static int
+fetch_ssl_ipaddr_match(const struct addrinfo *laddr, const char *r,
+ size_t rlen)
+{
+ struct addrinfo *raddr;
+ int ret;
+ char *rip;
+
+ ret = 0;
+ if ((raddr = fetch_ssl_get_numeric_addrinfo(r, rlen)) == NULL)
+ return 0; /* not a numeric host */
+
+ if (laddr->ai_family == raddr->ai_family) {
+ if (laddr->ai_family == AF_INET) {
+ rip = (char *)&((struct sockaddr_in *)(void *)
+ raddr->ai_addr)->sin_addr.s_addr;
+ ret = fetch_ssl_ipaddr_match_bin(laddr, rip, 4);
+#ifdef INET6
+ } else if (laddr->ai_family == AF_INET6) {
+ rip = (char *)&((struct sockaddr_in6 *)(void *)
+ raddr->ai_addr)->sin6_addr;
+ ret = fetch_ssl_ipaddr_match_bin(laddr, rip, 16);
+#endif
+ }
+
+ }
+ freeaddrinfo(raddr);
+ return (ret);
+}
+
+/*
+ * Verify server certificate by subjectAltName.
+ */
+static int
+fetch_ssl_verify_altname(STACK_OF(GENERAL_NAME) *altnames,
+ const char *host, struct addrinfo *ip)
+{
+ const GENERAL_NAME *name;
+ size_t nslen;
+ int i;
+ const char *ns;
+
+ for (i = 0; i < sk_GENERAL_NAME_num(altnames); ++i) {
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
+ /*
+ * This is a workaround, since the following line causes
+ * alignment issues in clang:
+ * name = sk_GENERAL_NAME_value(altnames, i);
+ * OpenSSL explicitly warns not to use those macros
+ * directly, but there isn't much choice (and there
+ * shouldn't be any ill side effects)
+ */
+ name = (GENERAL_NAME *)SKM_sk_value(void, altnames, i);
+#else
+ name = sk_GENERAL_NAME_value(altnames, i);
+#endif
+ ns = (const char *)ASN1_STRING_data(name->d.ia5);
+ nslen = (size_t)ASN1_STRING_length(name->d.ia5);
+
+ if (name->type == GEN_DNS && ip == NULL &&
+ fetch_ssl_hname_match(host, strlen(host), ns, nslen))
+ return (1);
+ else if (name->type == GEN_IPADD && ip != NULL &&
+ fetch_ssl_ipaddr_match_bin(ip, ns, nslen))
+ return (1);
+ }
+ return (0);
+}
+
+/*
+ * Verify server certificate by CN.
+ */
+static int
+fetch_ssl_verify_cn(X509_NAME *subject, const char *host,
+ struct addrinfo *ip)
+{
+ ASN1_STRING *namedata;
+ X509_NAME_ENTRY *nameentry;
+ int cnlen, lastpos, loc, ret;
+ unsigned char *cn;
+
+ ret = 0;
+ lastpos = -1;
+ loc = -1;
+ cn = NULL;
+ /* get most specific CN (last entry in list) and compare */
+ while ((lastpos = X509_NAME_get_index_by_NID(subject,
+ NID_commonName, lastpos)) != -1)
+ loc = lastpos;
+
+ if (loc > -1) {
+ nameentry = X509_NAME_get_entry(subject, loc);
+ namedata = X509_NAME_ENTRY_get_data(nameentry);
+ cnlen = ASN1_STRING_to_UTF8(&cn, namedata);
+ if (ip == NULL &&
+ fetch_ssl_hname_match(host, strlen(host), cn, cnlen))
+ ret = 1;
+ else if (ip != NULL && fetch_ssl_ipaddr_match(ip, cn, cnlen))
+ ret = 1;
+ OPENSSL_free(cn);
+ }
+ return (ret);
+}
+
+/*
+ * Verify that server certificate subjectAltName/CN matches
+ * hostname. First check, if there are alternative subject names. If yes,
+ * those have to match. Only if those don't exist it falls back to
+ * checking the subject's CN.
+ */
+static int
+fetch_ssl_verify_hname(X509 *cert, const char *host)
+{
+ struct addrinfo *ip;
+ STACK_OF(GENERAL_NAME) *altnames;
+ X509_NAME *subject;
+ int ret;
+
+ ret = 0;
+ ip = fetch_ssl_get_numeric_addrinfo(host, strlen(host));
+ altnames = X509_get_ext_d2i(cert, NID_subject_alt_name,
+ NULL, NULL);
+
+ if (altnames != NULL) {
+ ret = fetch_ssl_verify_altname(altnames, host, ip);
+ } else {
+ subject = X509_get_subject_name(cert);
+ if (subject != NULL)
+ ret = fetch_ssl_verify_cn(subject, host, ip);
+ }
+
+ if (ip != NULL)
+ freeaddrinfo(ip);
+ if (altnames != NULL)
+ GENERAL_NAMES_free(altnames);
+ return (ret);
+}
+
+/*
+ * Configure transport security layer based on environment.
+ */
+static void
+fetch_ssl_setup_transport_layer(SSL_CTX *ctx, int verbose)
+{
+ long ssl_ctx_options;
+
+ ssl_ctx_options = SSL_OP_ALL | SSL_OP_NO_TICKET;
+ if (getenv("SSL_ALLOW_SSL2") == NULL)
+ ssl_ctx_options |= SSL_OP_NO_SSLv2;
+ if (getenv("SSL_ALLOW_SSL3") == NULL)
+ ssl_ctx_options |= SSL_OP_NO_SSLv3;
+ if (getenv("SSL_NO_TLS1") != NULL)
+ ssl_ctx_options |= SSL_OP_NO_TLSv1;
+ if (getenv("SSL_NO_TLS1_1") != NULL)
+ ssl_ctx_options |= SSL_OP_NO_TLSv1_1;
+ if (getenv("SSL_NO_TLS1_2") != NULL)
+ ssl_ctx_options |= SSL_OP_NO_TLSv1_2;
+ if (verbose)
+ fetch_info("SSL options: %lx", ssl_ctx_options);
+ SSL_CTX_set_options(ctx, ssl_ctx_options);
+}
+
+
+/*
+ * Configure peer verification based on environment.
+ */
+#define LOCAL_CERT_FILE "/usr/local/etc/ssl/cert.pem"
+#define BASE_CERT_FILE "/etc/ssl/cert.pem"
+static int
+fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose)
+{
+ X509_LOOKUP *crl_lookup;
+ X509_STORE *crl_store;
+ const char *ca_cert_file, *ca_cert_path, *crl_file;
+
+ if (getenv("SSL_NO_VERIFY_PEER") == NULL) {
+ ca_cert_file = getenv("SSL_CA_CERT_FILE");
+ if (ca_cert_file == NULL &&
+ access(LOCAL_CERT_FILE, R_OK) == 0)
+ ca_cert_file = LOCAL_CERT_FILE;
+ if (ca_cert_file == NULL)
+ ca_cert_file = BASE_CERT_FILE;
+ ca_cert_path = getenv("SSL_CA_CERT_PATH");
+ if (verbose) {
+ fetch_info("Peer verification enabled");
+ if (ca_cert_file != NULL)
+ fetch_info("Using CA cert file: %s",
+ ca_cert_file);
+ if (ca_cert_path != NULL)
+ fetch_info("Using CA cert path: %s",
+ ca_cert_path);
+ }
+ SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER,
+ fetch_ssl_cb_verify_crt);
+ SSL_CTX_load_verify_locations(ctx, ca_cert_file,
+ ca_cert_path);
+ if ((crl_file = getenv("SSL_CRL_FILE")) != NULL) {
+ if (verbose)
+ fetch_info("Using CRL file: %s", crl_file);
+ crl_store = SSL_CTX_get_cert_store(ctx);
+ crl_lookup = X509_STORE_add_lookup(crl_store,
+ X509_LOOKUP_file());
+ if (crl_lookup == NULL ||
+ !X509_load_crl_file(crl_lookup, crl_file,
+ X509_FILETYPE_PEM)) {
+ fprintf(stderr,
+ "Could not load CRL file %s\n",
+ crl_file);
+ return (0);
+ }
+ X509_STORE_set_flags(crl_store,
+ X509_V_FLAG_CRL_CHECK |
+ X509_V_FLAG_CRL_CHECK_ALL);
+ }
+ }
+ return (1);
+}
+
+/*
+ * Configure client certificate based on environment.
+ */
+static int
+fetch_ssl_setup_client_certificate(SSL_CTX *ctx, int verbose)
+{
+ const char *client_cert_file, *client_key_file;
+
+ if ((client_cert_file = getenv("SSL_CLIENT_CERT_FILE")) != NULL) {
+ client_key_file = getenv("SSL_CLIENT_KEY_FILE") != NULL ?
+ getenv("SSL_CLIENT_KEY_FILE") : client_cert_file;
+ if (verbose) {
+ fetch_info("Using client cert file: %s",
+ client_cert_file);
+ fetch_info("Using client key file: %s",
+ client_key_file);
+ }
+ if (SSL_CTX_use_certificate_chain_file(ctx,
+ client_cert_file) != 1) {
+ fprintf(stderr,
+ "Could not load client certificate %s\n",
+ client_cert_file);
+ return (0);
+ }
+ if (SSL_CTX_use_PrivateKey_file(ctx, client_key_file,
+ SSL_FILETYPE_PEM) != 1) {
+ fprintf(stderr,
+ "Could not load client key %s\n",
+ client_key_file);
+ return (0);
+ }
+ }
+ return (1);
+}
+
+/*
+ * Callback for SSL certificate verification, this is called on server
+ * cert verification. It takes no decision, but informs the user in case
+ * verification failed.
+ */
+int
+fetch_ssl_cb_verify_crt(int verified, X509_STORE_CTX *ctx)
+{
+ X509 *crt;
+ X509_NAME *name;
+ char *str;
+
+ str = NULL;
+ if (!verified) {
+ if ((crt = X509_STORE_CTX_get_current_cert(ctx)) != NULL &&
+ (name = X509_get_subject_name(crt)) != NULL)
+ str = X509_NAME_oneline(name, 0, 0);
+ fprintf(stderr, "Certificate verification failed for %s\n",
+ str != NULL ? str : "no relevant certificate");
+ OPENSSL_free(str);
+ }
+ return (verified);
+}
+
+#endif
+
+/*
* Enable SSL on a connection.
*/
int
-fetch_ssl(conn_t *conn, int verbose)
+fetch_ssl(conn_t *conn, const struct url *URL, int verbose)
{
#ifdef WITH_SSL
int ret, ssl_err;
+ X509_NAME *name;
+ char *str;
/* Init the SSL library and context */
if (!SSL_library_init()){
@@ -339,12 +828,28 @@
conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth);
SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY);
+ fetch_ssl_setup_transport_layer(conn->ssl_ctx, verbose);
+ if (!fetch_ssl_setup_peer_verification(conn->ssl_ctx, verbose))
+ return (-1);
+ if (!fetch_ssl_setup_client_certificate(conn->ssl_ctx, verbose))
+ return (-1);
+
conn->ssl = SSL_new(conn->ssl_ctx);
- if (conn->ssl == NULL){
+ if (conn->ssl == NULL) {
fprintf(stderr, "SSL context creation failed\n");
return (-1);
}
SSL_set_fd(conn->ssl, conn->sd);
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+ if (!SSL_set_tlsext_host_name(conn->ssl,
+ __DECONST(struct url *, URL)->host)) {
+ fprintf(stderr,
+ "TLS server name indication extension failed for host %s\n",
+ URL->host);
+ return (-1);
+ }
+#endif
while ((ret = SSL_connect(conn->ssl)) == -1) {
ssl_err = SSL_get_error(conn->ssl, ret);
if (ssl_err != SSL_ERROR_WANT_READ &&
@@ -353,22 +858,35 @@
return (-1);
}
}
+ conn->ssl_cert = SSL_get_peer_certificate(conn->ssl);
+ if (conn->ssl_cert == NULL) {
+ fprintf(stderr, "No server SSL certificate\n");
+ return (-1);
+ }
+
+ if (getenv("SSL_NO_VERIFY_HOSTNAME") == NULL) {
+ if (verbose)
+ fetch_info("Verify hostname");
+ if (!fetch_ssl_verify_hname(conn->ssl_cert, URL->host)) {
+ fprintf(stderr,
+ "SSL certificate subject doesn't match host %s\n",
+ URL->host);
+ return (-1);
+ }
+ }
+
if (verbose) {
- X509_NAME *name;
- char *str;
-
- fprintf(stderr, "SSL connection established using %s\n",
- SSL_get_cipher(conn->ssl));
- conn->ssl_cert = SSL_get_peer_certificate(conn->ssl);
+ fetch_info("%s connection established using %s",
+ SSL_get_version(conn->ssl), SSL_get_cipher(conn->ssl));
name = X509_get_subject_name(conn->ssl_cert);
str = X509_NAME_oneline(name, 0, 0);
- printf("Certificate subject: %s\n", str);
- free(str);
+ fetch_info("Certificate subject: %s", str);
+ OPENSSL_free(str);
name = X509_get_issuer_name(conn->ssl_cert);
str = X509_NAME_oneline(name, 0, 0);
- printf("Certificate issuer: %s\n", str);
- free(str);
+ fetch_info("Certificate issuer: %s", str);
+ OPENSSL_free(str);
}
return (0);
@@ -406,33 +924,6 @@
}
#endif
-/*
- * Cache some data that was read from a socket but cannot be immediately
- * returned because of an interrupted system call.
- */
-static int
-fetch_cache_data(conn_t *conn, char *src, size_t nbytes)
-{
- char *tmp;
-
- if (conn->cache.size < nbytes) {
- tmp = realloc(conn->cache.buf, nbytes);
- if (tmp == NULL) {
- fetch_syserr();
- return (-1);
- }
- conn->cache.buf = tmp;
- conn->cache.size = nbytes;
- }
-
- memcpy(conn->cache.buf, src, nbytes);
- conn->cache.len = nbytes;
- conn->cache.pos = 0;
-
- return (0);
-}
-
-
static ssize_t
fetch_socket_read(int sd, char *buf, size_t len)
{
@@ -455,9 +946,9 @@
fetch_read(conn_t *conn, char *buf, size_t len)
{
struct timeval now, timeout, delta;
- fd_set readfds;
- ssize_t rlen, total;
- char *start;
+ struct pollfd pfd;
+ ssize_t rlen;
+ int deltams;
if (fetchTimeout > 0) {
gettimeofday(&timeout, NULL);
@@ -464,37 +955,22 @@
timeout.tv_sec += fetchTimeout;
}
- total = 0;
- start = buf;
+ deltams = INFTIM;
+ memset(&pfd, 0, sizeof pfd);
+ pfd.fd = conn->sd;
+ pfd.events = POLLIN | POLLERR;
- if (conn->cache.len > 0) {
+ for (;;) {
/*
- * The last invocation of fetch_read was interrupted by a
- * signal after some data had been read from the socket. Copy
- * the cached data into the supplied buffer before trying to
- * read from the socket again.
- */
- total = (conn->cache.len < len) ? conn->cache.len : len;
- memcpy(buf, conn->cache.buf, total);
-
- conn->cache.len -= total;
- conn->cache.pos += total;
- len -= total;
- buf += total;
- }
-
- while (len > 0) {
- /*
* The socket is non-blocking. Instead of the canonical
- * select() -> read(), we do the following:
+ * poll() -> read(), we do the following:
*
* 1) call read() or SSL_read().
- * 2) if an error occurred, return -1.
- * 3) if we received data but we still expect more,
- * update our counters and loop.
+ * 2) if we received some data, return it.
+ * 3) if an error occurred, return -1.
* 4) if read() or SSL_read() signaled EOF, return.
* 5) if we did not receive any data but we're not at EOF,
- * call select().
+ * call poll().
*
* In the SSL case, this is necessary because if we
* receive a close notification, we have to call
@@ -510,46 +986,34 @@
else
#endif
rlen = fetch_socket_read(conn->sd, buf, len);
- if (rlen == 0) {
+ if (rlen >= 0) {
break;
- } else if (rlen > 0) {
- len -= rlen;
- buf += rlen;
- total += rlen;
- continue;
} else if (rlen == FETCH_READ_ERROR) {
- if (errno == EINTR)
- fetch_cache_data(conn, start, total);
+ fetch_syserr();
return (-1);
}
// assert(rlen == FETCH_READ_WAIT);
- FD_ZERO(&readfds);
- while (!FD_ISSET(conn->sd, &readfds)) {
- FD_SET(conn->sd, &readfds);
- if (fetchTimeout > 0) {
- gettimeofday(&now, NULL);
- if (!timercmp(&timeout, &now, >)) {
- errno = ETIMEDOUT;
- fetch_syserr();
- return (-1);
- }
- timersub(&timeout, &now, &delta);
- }
- errno = 0;
- if (select(conn->sd + 1, &readfds, NULL, NULL,
- fetchTimeout > 0 ? &delta : NULL) < 0) {
- if (errno == EINTR) {
- if (fetchRestartCalls)
- continue;
- /* Save anything that was read. */
- fetch_cache_data(conn, start, total);
- }
+ if (fetchTimeout > 0) {
+ gettimeofday(&now, NULL);
+ if (!timercmp(&timeout, &now, >)) {
+ errno = ETIMEDOUT;
fetch_syserr();
return (-1);
}
+ timersub(&timeout, &now, &delta);
+ deltams = delta.tv_sec * 1000 +
+ delta.tv_usec / 1000;;
}
+ errno = 0;
+ pfd.revents = 0;
+ if (poll(&pfd, 1, deltams) < 0) {
+ if (errno == EINTR && fetchRestartCalls)
+ continue;
+ fetch_syserr();
+ return (-1);
+ }
}
- return (total);
+ return (rlen);
}
@@ -623,12 +1087,14 @@
fetch_writev(conn_t *conn, struct iovec *iov, int iovcnt)
{
struct timeval now, timeout, delta;
- fd_set writefds;
+ struct pollfd pfd;
ssize_t wlen, total;
- int r;
+ int deltams;
+ memset(&pfd, 0, sizeof pfd);
if (fetchTimeout) {
- FD_ZERO(&writefds);
+ pfd.fd = conn->sd;
+ pfd.events = POLLOUT | POLLERR;
gettimeofday(&timeout, NULL);
timeout.tv_sec += fetchTimeout;
}
@@ -635,23 +1101,22 @@
total = 0;
while (iovcnt > 0) {
- while (fetchTimeout && !FD_ISSET(conn->sd, &writefds)) {
- FD_SET(conn->sd, &writefds);
+ while (fetchTimeout && pfd.revents == 0) {
gettimeofday(&now, NULL);
- delta.tv_sec = timeout.tv_sec - now.tv_sec;
- delta.tv_usec = timeout.tv_usec - now.tv_usec;
- if (delta.tv_usec < 0) {
- delta.tv_usec += 1000000;
- delta.tv_sec--;
- }
- if (delta.tv_sec < 0) {
+ if (!timercmp(&timeout, &now, >)) {
errno = ETIMEDOUT;
fetch_syserr();
return (-1);
}
+ timersub(&timeout, &now, &delta);
+ deltams = delta.tv_sec * 1000 +
+ delta.tv_usec / 1000;
errno = 0;
- r = select(conn->sd + 1, NULL, &writefds, NULL, &delta);
- if (r == -1) {
+ pfd.revents = 0;
+ if (poll(&pfd, 1, deltams) < 0) {
+ /* POSIX compliance */
+ if (errno == EAGAIN)
+ continue;
if (errno == EINTR && fetchRestartCalls)
continue;
return (-1);
@@ -726,8 +1191,23 @@
if (--conn->ref > 0)
return (0);
+#ifdef WITH_SSL
+ if (conn->ssl) {
+ SSL_shutdown(conn->ssl);
+ SSL_set_connect_state(conn->ssl);
+ SSL_free(conn->ssl);
+ conn->ssl = NULL;
+ }
+ if (conn->ssl_ctx) {
+ SSL_CTX_free(conn->ssl_ctx);
+ conn->ssl_ctx = NULL;
+ }
+ if (conn->ssl_cert) {
+ X509_free(conn->ssl_cert);
+ conn->ssl_cert = NULL;
+ }
+#endif
ret = close(conn->sd);
- free(conn->cache.buf);
free(conn->buf);
free(conn);
return (ret);
Modified: trunk/lib/libfetch/common.h
===================================================================
--- trunk/lib/libfetch/common.h 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/common.h 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998-2011 Dag-Erling Smørgrav
+ * Copyright (c) 1998-2014 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libfetch/common.h 268900 2014-07-20 00:29:41Z bapt $
*/
#ifndef _COMMON_H_INCLUDED
@@ -52,18 +52,11 @@
size_t bufsize; /* buffer size */
size_t buflen; /* length of buffer contents */
int err; /* last protocol reply code */
- struct { /* data cached after an interrupted
- read */
- char *buf;
- size_t size;
- size_t pos;
- size_t len;
- } cache;
#ifdef WITH_SSL
SSL *ssl; /* SSL handle */
SSL_CTX *ssl_ctx; /* SSL context */
X509 *ssl_cert; /* server certificate */
- SSL_METHOD *ssl_meth; /* SSL method */
+ const SSL_METHOD *ssl_meth; /* SSL method */
#endif
int ref; /* reference count */
};
@@ -87,7 +80,10 @@
conn_t *fetch_connect(const char *, int, int, int);
conn_t *fetch_reopen(int);
conn_t *fetch_ref(conn_t *);
-int fetch_ssl(conn_t *, int);
+#ifdef WITH_SSL
+int fetch_ssl_cb_verify_crt(int, X509_STORE_CTX*);
+#endif
+int fetch_ssl(conn_t *, const struct url *, int);
ssize_t fetch_read(conn_t *, char *, size_t);
int fetch_getln(conn_t *);
ssize_t fetch_write(conn_t *, const char *, size_t);
@@ -121,6 +117,9 @@
*/
FILE *http_request(struct url *, const char *,
struct url_stat *, struct url *, const char *);
+FILE *http_request_body(struct url *, const char *,
+ struct url_stat *, struct url *, const char *,
+ const char *, const char *);
FILE *ftp_request(struct url *, const char *,
struct url_stat *, struct url *, const char *);
Modified: trunk/lib/libfetch/fetch.3
===================================================================
--- trunk/lib/libfetch/fetch.3 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/fetch.3 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,5 +1,6 @@
.\"-
-.\" Copyright (c) 1998-2011 Dag-Erling Smørgrav
+.\" Copyright (c) 1998-2013 Dag-Erling Smørgrav
+.\" Copyright (c) 2013 Michael Gmelin <freebsd at grem.de>
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -23,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/lib/libfetch/fetch.3 277060 2015-01-12 10:02:23Z des $
.\"
-.Dd September 27, 2011
+.Dd October 15, 2014
.Dt FETCH 3
.Os
.Sh NAME
@@ -392,6 +393,62 @@
library,
.Fn fetchPutHTTP
is currently unimplemented.
+.Sh HTTPS SCHEME
+Based on HTTP SCHEME.
+By default the peer is verified using the CA bundle located in
+.Pa /etc/ssl/cert.pem .
+The file may contain multiple CA certificates.
+A common source of a current CA bundle is
+.Pa \%security/ca_root_nss .
+.Pp
+The CA bundle used for peer verification can be changed by setting the
+environment variables
+.Ev SSL_CA_CERT_FILE
+to point to a concatenated bundle of trusted certificates and
+.Ev SSL_CA_CERT_PATH
+to point to a directory containing hashes of trusted CAs (see
+.Xr verify 1 ) .
+.Pp
+A certificate revocation list (CRL) can be used by setting the
+environment variable
+.Ev SSL_CRL_FILE
+(see
+.Xr crl 1 ) .
+.Pp
+Peer verification can be disabled by setting the environment variable
+.Ev SSL_NO_VERIFY_PEER .
+Note that this also disables CRL checking.
+.Pp
+By default the service identity is verified according to the rules
+detailed in RFC6125 (also known as hostname verification).
+This feature can be disabled by setting the environment variable
+.Ev SSL_NO_VERIFY_HOSTNAME .
+.Pp
+Client certificate based authentication is supported.
+The environment variable
+.Ev SSL_CLIENT_CERT_FILE
+should be set to point to a file containing key and client certificate
+to be used in PEM format. In case the key is stored in a separate
+file, the environment variable
+.Ev SSL_CLIENT_KEY_FILE
+can be set to point to the key in PEM format.
+In case the key uses a password, the user will be prompted on standard
+input (see
+.Xr PEM 3 ) .
+.Pp
+By default
+.Nm libfetch
+allows TLSv1 and newer when negotiating the connecting with the remote
+peer.
+You can change this behavior by setting the
+.Ev SSL_ALLOW_SSL2
+and
+.Ev SSL_ALLOW_SSL3
+environment variables to allow SSLv2 and SSLv3, respectively, and
+.Ev SSL_NO_TLS1 ,
+.Ev SSL_NO_TLS1_1 and
+.Ev SSL_NO_TLS1_2
+to disable TLS 1.0, 1.1 and 1.2 respectively.
.Sh AUTHENTICATION
Apart from setting the appropriate environment variables and
specifying the user name and password in the URL or the
@@ -516,6 +573,15 @@
Same as
.Ev FTP_PROXY ,
for compatibility.
+.It Ev HTTP_ACCEPT
+Specifies the value of the
+.Va Accept
+header for HTTP requests.
+If empty, no
+.Va Accept
+header is sent.
+The default is
+.Dq */* .
.It Ev HTTP_AUTH
Specifies HTTP authorization parameters as a colon-separated list of
items.
@@ -563,6 +629,7 @@
Specifies the User-Agent string to use for HTTP requests.
This can be useful when working with HTTP origin or proxy servers that
differentiate between user agents.
+If defined but empty, no User-Agent header is sent.
.It Ev NETRC
Specifies a file to use instead of
.Pa ~/.netrc
@@ -579,6 +646,35 @@
Same as
.Ev NO_PROXY ,
for compatibility.
+.It Ev SSL_ALLOW_SSL2
+Allow SSL version 2 when negotiating the connection (not recommended).
+.It Ev SSL_ALLOW_SSL3
+Allow SSL version 3 when negotiating the connection (not recommended).
+.It Ev SSL_CA_CERT_FILE
+CA certificate bundle containing trusted CA certificates.
+Default value:
+.Pa /etc/ssl/cert.pem .
+.It Ev SSL_CA_CERT_PATH
+Path containing trusted CA hashes.
+.It Ev SSL_CLIENT_CERT_FILE
+PEM encoded client certificate/key which will be used in
+client certificate authentication.
+.It Ev SSL_CLIENT_KEY_FILE
+PEM encoded client key in case key and client certificate
+are stored separately.
+.It Ev SSL_CRL_FILE
+File containing certificate revocation list.
+.It Ev SSL_NO_TLS1
+Do not allow TLS version 1.0 when negotiating the connection.
+.It Ev SSL_NO_TLS1_1
+Do not allow TLS version 1.1 when negotiating the connection.
+.It Ev SSL_NO_TLS1_2
+Do not allow TLS version 1.2 when negotiating the connection.
+.It Ev SSL_NO_VERIFY_HOSTNAME
+If set, do not verify that the hostname matches the subject of the
+certificate presented by the server.
+.It Ev SSL_NO_VERIFY_PEER
+If set, do not verify the peer certificate against trusted CAs.
.El
.Sh EXAMPLES
To access a proxy server on
@@ -610,6 +706,19 @@
.Bd -literal -offset indent
NO_PROXY=localhost,127.0.0.1
.Ed
+.Pp
+Access HTTPS website without any certificate verification whatsoever:
+.Bd -literal -offset indent
+SSL_NO_VERIFY_PEER=1
+SSL_NO_VERIFY_HOSTNAME=1
+.Ed
+.Pp
+Access HTTPS website using client certificate based authentication
+and a private CA:
+.Bd -literal -offset indent
+SSL_CLIENT_CERT_FILE=/path/to/client.pem
+SSL_CA_CERT_FILE=/path/to/myca.pem
+.Ed
.Sh SEE ALSO
.Xr fetch 1 ,
.Xr ftpio 3 ,
@@ -678,7 +787,8 @@
.An Hajimu Umemoto Aq ume at FreeBSD.org ,
.An Henry Whincup Aq henry at techiebod.com ,
.An Jukka A. Ukkonen Aq jau at iki.fi ,
-.An Jean-Fran\(,cois Dockes Aq jf at dockes.org
+.An Jean-Fran\(,cois Dockes Aq jf at dockes.org ,
+.An Michael Gmelin Aq freebsd at grem.de
and others.
It replaces the older
.Nm ftpio
@@ -688,7 +798,9 @@
.An Jordan K. Hubbard Aq jkh at FreeBSD.org .
.Pp
This manual page was written by
-.An Dag-Erling Sm\(/orgrav Aq des at FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des at FreeBSD.org
+and
+.An Michael Gmelin Aq freebsd at grem.de .
.Sh BUGS
Some parts of the library are not yet implemented.
The most notable
@@ -717,6 +829,10 @@
.Fn fetchStatFTP
does not check that the result of an MDTM command is a valid date.
.Pp
+In case password protected keys are used for client certificate based
+authentication the user is prompted for the password on each and every
+fetch operation.
+.Pp
The man page is incomplete, poorly written and produces badly
formatted text.
.Pp
Modified: trunk/lib/libfetch/fetch.c
===================================================================
--- trunk/lib/libfetch/fetch.c 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/fetch.c 2015-07-21 23:33:22 UTC (rev 7120)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libfetch/fetch.c 252375 2013-06-29 15:51:27Z kientzle $");
#include <sys/param.h>
#include <sys/errno.h>
Modified: trunk/lib/libfetch/fetch.h
===================================================================
--- trunk/lib/libfetch/fetch.h 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/fetch.h 2015-07-21 23:33:22 UTC (rev 7120)
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libfetch/fetch.h 268900 2014-07-20 00:29:41Z bapt $
*/
#ifndef _FETCH_H_INCLUDED
@@ -102,6 +102,8 @@
FILE *fetchPutHTTP(struct url *, const char *);
int fetchStatHTTP(struct url *, struct url_stat *, const char *);
struct url_ent *fetchListHTTP(struct url *, const char *);
+FILE *fetchReqHTTP(struct url *, const char *, const char *,
+ const char *, const char *);
/* FTP-specific functions */
FILE *fetchXGetFTP(struct url *, struct url_stat *, const char *);
Modified: trunk/lib/libfetch/file.c
===================================================================
--- trunk/lib/libfetch/file.c 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/file.c 2015-07-21 23:33:22 UTC (rev 7120)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libfetch/file.c 240495 2012-09-14 12:15:13Z eadler $");
#include <sys/param.h>
#include <sys/stat.h>
Modified: trunk/lib/libfetch/ftp.c
===================================================================
--- trunk/lib/libfetch/ftp.c 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/ftp.c 2015-07-21 23:33:22 UTC (rev 7120)
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libfetch/ftp.c 226537 2011-10-19 11:43:51Z des $");
/*
* Portions of this code were taken from or based on ftpio.c:
Modified: trunk/lib/libfetch/ftp.errors
===================================================================
--- trunk/lib/libfetch/ftp.errors 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/ftp.errors 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libfetch/ftp.errors 106190 2002-10-30 06:06:16Z des $
#
# This list is taken from RFC 959.
# It probably needs a going over.
Modified: trunk/lib/libfetch/http.c
===================================================================
--- trunk/lib/libfetch/http.c 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/http.c 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 2000-2011 Dag-Erling Smørgrav
+ * Copyright (c) 2000-2014 Dag-Erling Smørgrav
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libfetch/http.c 270460 2014-08-24 14:04:20Z des $");
/*
* The following copyright applies to the base64 code:
@@ -204,10 +204,11 @@
/*
* Fill the input buffer, do chunk decoding on the fly
*/
-static int
+static ssize_t
http_fillbuf(struct httpio *io, size_t len)
{
ssize_t nbytes;
+ char ch;
if (io->error)
return (-1);
@@ -229,7 +230,7 @@
if (io->chunksize == 0) {
switch (http_new_chunk(io)) {
case -1:
- io->error = 1;
+ io->error = EPROTO;
return (-1);
case 0:
io->eof = 1;
@@ -249,10 +250,8 @@
io->chunksize -= io->buflen;
if (io->chunksize == 0) {
- char endl[2];
-
- if (fetch_read(io->conn, endl, 2) != 2 ||
- endl[0] != '\r' || endl[1] != '\n')
+ if (fetch_read(io->conn, &ch, 1) != 1 || ch != '\r' ||
+ fetch_read(io->conn, &ch, 1) != 1 || ch != '\n')
return (-1);
}
@@ -268,7 +267,7 @@
http_readfn(void *v, char *buf, int len)
{
struct httpio *io = (struct httpio *)v;
- int l, pos;
+ int rlen;
if (io->error)
return (-1);
@@ -275,24 +274,23 @@
if (io->eof)
return (0);
- for (pos = 0; len > 0; pos += l, len -= l) {
- /* empty buffer */
- if (!io->buf || io->bufpos == io->buflen)
- if (http_fillbuf(io, len) < 1)
- break;
- l = io->buflen - io->bufpos;
- if (len < l)
- l = len;
- memcpy(buf + pos, io->buf + io->bufpos, l);
- io->bufpos += l;
+ /* empty buffer */
+ if (!io->buf || io->bufpos == io->buflen) {
+ if ((rlen = http_fillbuf(io, len)) < 0) {
+ if ((errno = io->error) == EINTR)
+ io->error = 0;
+ return (-1);
+ } else if (rlen == 0) {
+ return (0);
+ }
}
- if (!pos && io->error) {
- if (io->error == EINTR)
- io->error = 0;
- return (-1);
- }
- return (pos);
+ rlen = io->buflen - io->bufpos;
+ if (len < rlen)
+ rlen = len;
+ memcpy(buf, io->buf + io->bufpos, rlen);
+ io->bufpos += rlen;
+ return (rlen);
}
/*
@@ -878,6 +876,12 @@
strncpy(locale, setlocale(LC_TIME, NULL), sizeof(locale));
setlocale(LC_TIME, "C");
r = strptime(p, "%a, %d %b %Y %H:%M:%S GMT", &tm);
+ /*
+ * Some proxies use UTC in response, but it should still be
+ * parsed. RFC2616 states GMT and UTC are exactly equal for HTTP.
+ */
+ if (r == NULL)
+ r = strptime(p, "%a, %d %b %Y %H:%M:%S UTC", &tm);
/* XXX should add support for date-2 and date-3 */
setlocale(LC_TIME, locale);
if (r == NULL)
@@ -1026,7 +1030,7 @@
static void
init_http_auth_params(http_auth_params_t *s)
{
- s->scheme = s->realm = s->user = s->password = 0;
+ s->scheme = s->realm = s->user = s->password = NULL;
}
static void
@@ -1125,7 +1129,7 @@
Hex[i*2] = hexchars[j];
j = Bin[i] & 0xf;
Hex[i*2+1] = hexchars[j];
- };
+ }
Hex[HASHHEXLEN] = '\0';
};
@@ -1160,7 +1164,7 @@
MD5Update(&Md5Ctx, ":", 1);
MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce));
MD5Final(HA1, &Md5Ctx);
- };
+ }
CvtHex(HA1, SessionKey);
}
@@ -1194,7 +1198,7 @@
if (strcasecmp(pszQop, "auth-int") == 0) {
MD5Update(&Md5Ctx, ":", 1);
MD5Update(&Md5Ctx, HEntity, HASHHEXLEN);
- };
+ }
MD5Final(HA2, &Md5Ctx);
CvtHex(HA2, HA2Hex);
@@ -1211,7 +1215,7 @@
MD5Update(&Md5Ctx, ":", 1);
MD5Update(&Md5Ctx, pszQop, strlen(pszQop));
MD5Update(&Md5Ctx, ":", 1);
- };
+ }
MD5Update(&Md5Ctx, HA2Hex, HASHHEXLEN);
MD5Final(RespHash, &Md5Ctx);
CvtHex(RespHash, Response);
@@ -1245,7 +1249,7 @@
int r;
char noncecount[10];
char cnonce[40];
- char *options = 0;
+ char *options = NULL;
if (!c->realm || !c->nonce) {
DEBUG(fprintf(stderr, "realm/nonce not set in challenge\n"));
@@ -1400,6 +1404,8 @@
if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 && purl) {
http_cmd(conn, "CONNECT %s:%d HTTP/1.1",
URL->host, URL->port);
+ http_cmd(conn, "Host: %s:%d",
+ URL->host, URL->port);
http_cmd(conn, "");
if (http_get_reply(conn) != HTTP_OK) {
fetch_close(conn);
@@ -1408,7 +1414,7 @@
http_get_reply(conn);
}
if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 &&
- fetch_ssl(conn, verbose) == -1) {
+ fetch_ssl(conn, URL, verbose) == -1) {
fetch_close(conn);
/* grrr */
errno = EAUTH;
@@ -1488,6 +1494,14 @@
* Core
*/
+FILE *
+http_request(struct url *URL, const char *op, struct url_stat *us,
+ struct url *purl, const char *flags)
+{
+
+ return (http_request_body(URL, op, us, purl, flags, NULL, NULL));
+}
+
/*
* Send a request and process the reply
*
@@ -1495,8 +1509,9 @@
* XXX off into a separate function.
*/
FILE *
-http_request(struct url *URL, const char *op, struct url_stat *us,
- struct url *purl, const char *flags)
+http_request_body(struct url *URL, const char *op, struct url_stat *us,
+ struct url *purl, const char *flags, const char *content_type,
+ const char *body)
{
char timebuf[80];
char hbuf[MAXHOSTNAMELEN + 7], *host;
@@ -1513,6 +1528,7 @@
http_headerbuf_t headerbuf;
http_auth_challenges_t server_challenges;
http_auth_challenges_t proxy_challenges;
+ size_t body_len;
/* The following calls don't allocate anything */
init_http_headerbuf(&headerbuf);
@@ -1581,7 +1597,7 @@
if (verbose)
fetch_info("requesting %s://%s%s",
url->scheme, host, url->doc);
- if (purl) {
+ if (purl && strcasecmp(URL->scheme, SCHEME_HTTPS) != 0) {
http_cmd(conn, "%s %s://%s%s HTTP/1.1",
op, url->scheme, host, url->doc);
} else {
@@ -1664,6 +1680,12 @@
}
/* other headers */
+ if ((p = getenv("HTTP_ACCEPT")) != NULL) {
+ if (*p != '\0')
+ http_cmd(conn, "Accept: %s", p);
+ } else {
+ http_cmd(conn, "Accept: */*");
+ }
if ((p = getenv("HTTP_REFERER")) != NULL && *p != '\0') {
if (strcasecmp(p, "auto") == 0)
http_cmd(conn, "Referer: %s://%s%s",
@@ -1671,15 +1693,31 @@
else
http_cmd(conn, "Referer: %s", p);
}
- if ((p = getenv("HTTP_USER_AGENT")) != NULL && *p != '\0')
- http_cmd(conn, "User-Agent: %s", p);
- else
- http_cmd(conn, "User-Agent: %s " _LIBFETCH_VER, getprogname());
+ if ((p = getenv("HTTP_USER_AGENT")) != NULL) {
+ /* no User-Agent if defined but empty */
+ if (*p != '\0')
+ http_cmd(conn, "User-Agent: %s", p);
+ } else {
+ /* default User-Agent */
+ http_cmd(conn, "User-Agent: %s " _LIBFETCH_VER,
+ getprogname());
+ }
if (url->offset > 0)
http_cmd(conn, "Range: bytes=%lld-", (long long)url->offset);
http_cmd(conn, "Connection: close");
+
+ if (body) {
+ body_len = strlen(body);
+ http_cmd(conn, "Content-Length: %zu", body_len);
+ if (content_type != NULL)
+ http_cmd(conn, "Content-Type: %s", content_type);
+ }
+
http_cmd(conn, "");
+ if (body)
+ fetch_write(conn, body, body_len);
+
/*
* Force the queued request to be dispatched. Normally, one
* would do this with shutdown(2) but squid proxies can be
@@ -2030,3 +2068,12 @@
warnx("fetchListHTTP(): not implemented");
return (NULL);
}
+
+FILE *
+fetchReqHTTP(struct url *URL, const char *method, const char *flags,
+ const char *content_type, const char *body)
+{
+
+ return (http_request_body(URL, method, NULL, http_get_proxy(URL, flags),
+ flags, content_type, body));
+}
Modified: trunk/lib/libfetch/http.errors
===================================================================
--- trunk/lib/libfetch/http.errors 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/lib/libfetch/http.errors 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libfetch/http.errors 241840 2012-10-22 03:00:10Z eadler $
#
# This list is taken from RFC 2068.
#
Modified: trunk/usr.bin/fetch/Makefile
===================================================================
--- trunk/usr.bin/fetch/Makefile 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/usr.bin/fetch/Makefile 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,4 +1,4 @@
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.bin/fetch/Makefile 240496 2012-09-14 13:00:43Z des $
.include <bsd.own.mk>
Modified: trunk/usr.bin/fetch/fetch.1
===================================================================
--- trunk/usr.bin/fetch/fetch.1 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/usr.bin/fetch/fetch.1 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,5 +1,6 @@
.\"-
-.\" Copyright (c) 2000-2012 Dag-Erling Smørgrav
+.\" Copyright (c) 2000-2014 Dag-Erling Smørgrav
+.\" Copyright (c) 2013 Michael Gmelin <freebsd at grem.de>
.\" All rights reserved.
.\" Portions Copyright (c) 1999 Massachusetts Institute of Technology; used
.\" by permission.
@@ -27,9 +28,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/fetch/fetch.1 262558 2014-02-27 13:25:26Z des $
.\"
-.Dd February 28, 2012
+.Dd January 28, 2014
.Dt FETCH 1
.Os
.Sh NAME
@@ -38,22 +39,51 @@
.Sh SYNOPSIS
.Nm
.Op Fl 146AadFlMmnPpqRrsUv
+.Op Fl -allow-sslv2
.Op Fl B Ar bytes
+.Op Fl -bind-address= Ns Ar host
+.Op Fl -ca-cert= Ns Ar file
+.Op Fl -ca-path= Ns Ar dir
+.Op Fl -cert= Ns Ar file
+.Op Fl -crl= Ns Ar file
.Op Fl i Ar file
+.Op Fl -key= Ns Ar file
.Op Fl N Ar file
+.Op Fl -no-passive
+.Op Fl -no-proxy= Ns Ar list
+.Op Fl -no-sslv3
+.Op Fl -no-tlsv1
+.Op Fl -no-verify-hostname
+.Op Fl -no-verify-peer
.Op Fl o Ar file
+.Op Fl -referer= Ns Ar URL
.Op Fl S Ar bytes
.Op Fl T Ar seconds
+.Op Fl -user-agent= Ns Ar agent-string
.Op Fl w Ar seconds
.Ar URL ...
.Nm
.Op Fl 146AadFlMmnPpqRrsUv
.Op Fl B Ar bytes
+.Op Fl -bind-address= Ns Ar host
+.Op Fl -ca-cert= Ns Ar file
+.Op Fl -ca-path= Ns Ar dir
+.Op Fl -cert= Ns Ar file
+.Op Fl -crl= Ns Ar file
.Op Fl i Ar file
+.Op Fl -key= Ns Ar file
.Op Fl N Ar file
+.Op Fl -no-passive
+.Op Fl -no-proxy= Ns Ar list
+.Op Fl -no-sslv3
+.Op Fl -no-tlsv1
+.Op Fl -no-verify-hostname
+.Op Fl -no-verify-peer
.Op Fl o Ar file
+.Op Fl -referer= Ns Ar URL
.Op Fl S Ar bytes
.Op Fl T Ar seconds
+.Op Fl -user-agent= Ns Ar agent-string
.Op Fl w Ar seconds
.Fl h Ar host Fl f Ar file Oo Fl c Ar dir Oc
.Sh DESCRIPTION
@@ -67,25 +97,28 @@
.Pp
The following options are available:
.Bl -tag -width Fl
-.It Fl 1
+.It Fl 1 , -one-file
Stop and return exit code 0 at the first successfully retrieved file.
-.It Fl 4
+.It Fl 4 , -ipv4-only
Forces
.Nm
to use IPv4 addresses only.
-.It Fl 6
+.It Fl 6 , -ipv6-only
Forces
.Nm
to use IPv6 addresses only.
-.It Fl A
+.It Fl A , -no-redirect
Do not automatically follow ``temporary'' (302) redirects.
Some broken Web sites will return a redirect instead of a not-found
error when the requested object does not exist.
-.It Fl a
+.It Fl a , -retry
Automatically retry the transfer upon soft failures.
-.It Fl B Ar bytes
+.It Fl -allow-sslv2
+[SSL]
+Allow SSL version 2 when negotiating the connection.
+.It Fl B Ar bytes , Fl -buffer-size= Ns Ar bytes
Specify the read buffer size in bytes.
-The default is 4096 bytes.
+The default is 16,384 bytes.
Attempts to set a buffer size lower than this will be silently
ignored.
The number of reads actually performed is reported at verbosity level
@@ -92,6 +125,9 @@
two or higher (see the
.Fl v
flag).
+.It Fl -bind-address= Ns Ar host
+Specifies a hostname or IP address to which sockets used for outgoing
+connections will be bound.
.It Fl c Ar dir
The file to retrieve is in directory
.Ar dir
@@ -98,9 +134,34 @@
on the remote host.
This option is deprecated and is provided for backward compatibility
only.
-.It Fl d
+.It Fl -ca-cert= Ns Ar file
+[SSL]
+Path to certificate bundle containing trusted CA certificates.
+If not specified,
+.Pa /etc/ssl/cert.pem
+is used.
+The file may contain multiple CA certificates. The port
+.Pa security/ca_root_nss
+is a common source of a current CA bundle.
+.It Fl -ca-path= Ns Ar dir
+[SSL]
+The directory
+.Ar dir
+contains trusted CA hashes.
+.It Fl -cert= Ns Ar file
+[SSL]
+.Ar file
+is a PEM encoded client certificate/key which will be used in
+client certificate authentication.
+.It Fl -crl= Ns Ar file
+[SSL]
+Points to certificate revocation list
+.Ar file ,
+which has to be in PEM format and may contain peer certificates that have
+been revoked.
+.It Fl d , -direct
Use a direct connection even if a proxy is configured.
-.It Fl F
+.It Fl F , -force-restart
In combination with the
.Fl r
flag, forces a restart even if the local and remote files have
@@ -118,17 +179,22 @@
.Ar host .
This option is deprecated and is provided for backward compatibility
only.
-.It Fl i Ar file
+.It Fl i Ar file , Fl -if-modified-since= Ns Ar file
If-Modified-Since mode: the remote file will only be retrieved if it
is newer than
.Ar file
on the local host.
(HTTP only)
-.It Fl l
+.It Fl -key= Ns Ar file
+[SSL]
+.Ar file
+is a PEM encoded client key that will be used in client certificate
+authentication in case key and client certificate are stored separately.
+.It Fl l , -symlink
If the target is a file-scheme URL, make a symbolic link to the target
rather than trying to copy it.
.It Fl M
-.It Fl m
+.It Fl m , -mirror
Mirror mode: if the file already exists locally and has the same size
and modification time as the remote file, it will not be fetched.
Note that the
@@ -136,7 +202,7 @@
and
.Fl r
flags are mutually exclusive.
-.It Fl N Ar file
+.It Fl N Ar file , Fl -netrc= Ns Ar file
Use
.Ar file
instead of
@@ -146,9 +212,28 @@
.Xr ftp 1
for a description of the file format.
This feature is experimental.
-.It Fl n
+.It Fl n , -no-mtime
Do not preserve the modification time of the transferred file.
-.It Fl o Ar file
+.It Fl -no-passive
+Forces the FTP code to use active mode.
+.It Fl -no-proxy= Ns Ar list
+Either a single asterisk, which disables the use of proxies
+altogether, or a comma- or whitespace-separated list of hosts for
+which proxies should not be used.
+.It Fl -no-sslv3
+[SSL]
+Don't allow SSL version 3 when negotiating the connection.
+.It Fl -no-tlsv1
+[SSL]
+Don't allow TLS version 1 when negotiating the connection.
+.It Fl -no-verify-hostname
+[SSL]
+Do not verify that the hostname matches the subject of the
+certificate presented by the server.
+.It Fl -no-verify-peer
+[SSL]
+Do not verify the peer certificate against trusted CAs.
+.It Fl o Ar file , Fl output= Ns Ar file
Set the output file name to
.Ar file .
By default, a ``pathname'' is extracted from the specified URI, and
@@ -163,21 +248,30 @@
argument is a directory, fetched file(s) will be placed within the
directory, with name(s) selected as in the default behaviour.
.It Fl P
-.It Fl p
+.It Fl p , -passive
Use passive FTP.
These flags have no effect, since passive FTP is the default, but are
provided for compatibility with earlier versions where active FTP was
the default.
-To force active mode, set the
+To force active mode, use the
+.Fl -no-passive
+flag or set the
.Ev FTP_PASSIVE_MODE
environment variable to
.Ql NO .
-.It Fl q
+.It Fl -referer= Ns Ar URL
+Specifies the referrer URL to use for HTTP requests.
+If
+.Ar URL
+is set to
+.Dq auto ,
+the document URL will be used as referrer URL.
+.It Fl q , -quiet
Quiet mode.
-.It Fl R
+.It Fl R , -keep-output
The output files are precious, and should not be deleted under any
circumstances, even if the transfer failed or was incomplete.
-.It Fl r
+.It Fl r , -restart
Restart a previously interrupted transfer.
Note that the
.Fl m
@@ -184,15 +278,15 @@
and
.Fl r
flags are mutually exclusive.
-.It Fl S Ar bytes
+.It Fl S Ar bytes , Fl -require-size= Ns Ar bytes
Require the file size reported by the server to match the specified
value.
If it does not, a message is printed and the file is not fetched.
If the server does not support reporting file sizes, this option is
ignored and the file is fetched unconditionally.
-.It Fl s
+.It Fl s , -print-size
Print the size in bytes of each requested file, without fetching it.
-.It Fl T Ar seconds
+.It Fl T Ar seconds , Fl -timeout= Ns Ar seconds
Set timeout value to
.Ar seconds .
Overrides the environment variables
@@ -200,25 +294,24 @@
for FTP transfers or
.Ev HTTP_TIMEOUT
for HTTP transfers if set.
-.It Fl U
+.It Fl U , -passive-portrange-default
When using passive FTP, allocate the port for the data connection from
the low (default) port range.
See
.Xr ip 4
for details on how to specify which port range this corresponds to.
-.It Fl v
+.It Fl -user-agent= Ns Ar agent-string
+Specifies the User-Agent string to use for HTTP requests.
+This can be useful when working with HTTP origin or proxy servers that
+differentiate between user agents.
+.It Fl v , -verbose
Increase verbosity level.
-.It Fl w Ar seconds
+.It Fl w Ar seconds , Fl -retry-delay= Ns Ar seconds
When the
.Fl a
flag is specified, wait this many seconds between successive retries.
.El
.Pp
-.Ar URL
-.Bd -literal
- <scheme>:(//(<user>(:<pwd>)?@)?<host>(:<port>)?)?/(<document>)?
-.Ed
-.Pp
If
.Nm
receives a
@@ -247,6 +340,7 @@
.Ev FTP_PASSWORD ,
.Ev FTP_PROXY ,
.Ev ftp_proxy ,
+.Ev HTTP_ACCEPT ,
.Ev HTTP_AUTH ,
.Ev HTTP_PROXY ,
.Ev http_proxy ,
@@ -254,8 +348,19 @@
.Ev HTTP_REFERER ,
.Ev HTTP_USER_AGENT ,
.Ev NETRC ,
-.Ev NO_PROXY No and
-.Ev no_proxy .
+.Ev NO_PROXY ,
+.Ev no_proxy ,
+.Ev SSL_ALLOW_SSL2 ,
+.Ev SSL_CA_CERT_FILE ,
+.Ev SSL_CA_CERT_PATH ,
+.Ev SSL_CLIENT_CERT_FILE ,
+.Ev SSL_CLIENT_KEY_FILE ,
+.Ev SSL_CRL_FILE ,
+.Ev SSL_NO_SSL3 ,
+.Ev SSL_NO_TLS1 ,
+.Ev SSL_NO_VERIFY_HOSTNAME
+and
+.Ev SSL_NO_VERIFY_PEER .
.Sh EXIT STATUS
The
.Nm
@@ -292,7 +397,9 @@
and later completely rewritten to use the
.Xr fetch 3
library by
-.An Dag-Erling Sm\(/orgrav Aq des at FreeBSD.org .
+.An Dag-Erling Sm\(/orgrav Aq des at FreeBSD.org
+and
+.An Michael Gmelin Aq freebsd at grem.de .
.Sh NOTES
The
.Fl b
Modified: trunk/usr.bin/fetch/fetch.c
===================================================================
--- trunk/usr.bin/fetch/fetch.c 2015-07-21 23:32:00 UTC (rev 7119)
+++ trunk/usr.bin/fetch/fetch.c 2015-07-21 23:33:22 UTC (rev 7120)
@@ -1,5 +1,6 @@
/*-
- * Copyright (c) 2000-2011 Dag-Erling Smørgrav
+ * Copyright (c) 2000-2014 Dag-Erling Smørgrav
+ * Copyright (c) 2013 Michael Gmelin <freebsd at grem.de>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/usr.bin/fetch/fetch.c 262558 2014-02-27 13:25:26Z des $");
#include <sys/param.h>
#include <sys/socket.h>
@@ -37,6 +38,7 @@
#include <ctype.h>
#include <err.h>
#include <errno.h>
+#include <getopt.h>
#include <signal.h>
#include <stdint.h>
#include <stdio.h>
@@ -47,53 +49,125 @@
#include <fetch.h>
-#define MINBUFSIZE 4096
+#define MINBUFSIZE 16384
#define TIMEOUT 120
/* Option flags */
-int A_flag; /* -A: do not follow 302 redirects */
-int a_flag; /* -a: auto retry */
-off_t B_size; /* -B: buffer size */
-int b_flag; /*! -b: workaround TCP bug */
-char *c_dirname; /* -c: remote directory */
-int d_flag; /* -d: direct connection */
-int F_flag; /* -F: restart without checking mtime */
-char *f_filename; /* -f: file to fetch */
-char *h_hostname; /* -h: host to fetch from */
-int i_flag; /* -i: specify input file for mtime comparison */
-char *i_filename; /* name of input file */
-int l_flag; /* -l: link rather than copy file: URLs */
-int m_flag; /* -[Mm]: mirror mode */
-char *N_filename; /* -N: netrc file name */
-int n_flag; /* -n: do not preserve modification time */
-int o_flag; /* -o: specify output file */
-int o_directory; /* output file is a directory */
-char *o_filename; /* name of output file */
-int o_stdout; /* output file is stdout */
-int once_flag; /* -1: stop at first successful file */
-int p_flag; /* -[Pp]: use passive FTP */
-int R_flag; /* -R: don't delete partially transferred files */
-int r_flag; /* -r: restart previously interrupted transfer */
-off_t S_size; /* -S: require size to match */
-int s_flag; /* -s: show size, don't fetch */
-long T_secs; /* -T: transfer timeout in seconds */
-int t_flag; /*! -t: workaround TCP bug */
-int U_flag; /* -U: do not use high ports */
-int v_level = 1; /* -v: verbosity level */
-int v_tty; /* stdout is a tty */
-pid_t pgrp; /* our process group */
-long w_secs; /* -w: retry delay */
-int family = PF_UNSPEC; /* -[46]: address family to use */
+static int A_flag; /* -A: do not follow 302 redirects */
+static int a_flag; /* -a: auto retry */
+static off_t B_size; /* -B: buffer size */
+static int b_flag; /*! -b: workaround TCP bug */
+static char *c_dirname; /* -c: remote directory */
+static int d_flag; /* -d: direct connection */
+static int F_flag; /* -F: restart without checking mtime */
+static char *f_filename; /* -f: file to fetch */
+static char *h_hostname; /* -h: host to fetch from */
+static int i_flag; /* -i: specify file for mtime comparison */
+static char *i_filename; /* name of input file */
+static int l_flag; /* -l: link rather than copy file: URLs */
+static int m_flag; /* -[Mm]: mirror mode */
+static char *N_filename; /* -N: netrc file name */
+static int n_flag; /* -n: do not preserve modification time */
+static int o_flag; /* -o: specify output file */
+static int o_directory; /* output file is a directory */
+static char *o_filename; /* name of output file */
+static int o_stdout; /* output file is stdout */
+static int once_flag; /* -1: stop at first successful file */
+static int p_flag; /* -[Pp]: use passive FTP */
+static int R_flag; /* -R: don't delete partial files */
+static int r_flag; /* -r: restart previous transfer */
+static off_t S_size; /* -S: require size to match */
+static int s_flag; /* -s: show size, don't fetch */
+static long T_secs; /* -T: transfer timeout in seconds */
+static int t_flag; /*! -t: workaround TCP bug */
+static int U_flag; /* -U: do not use high ports */
+static int v_level = 1; /* -v: verbosity level */
+static int v_tty; /* stdout is a tty */
+static pid_t pgrp; /* our process group */
+static long w_secs; /* -w: retry delay */
+static int family = PF_UNSPEC; /* -[46]: address family to use */
-int sigalrm; /* SIGALRM received */
-int siginfo; /* SIGINFO received */
-int sigint; /* SIGINT received */
+static int sigalrm; /* SIGALRM received */
+static int siginfo; /* SIGINFO received */
+static int sigint; /* SIGINT received */
-long ftp_timeout = TIMEOUT; /* default timeout for FTP transfers */
-long http_timeout = TIMEOUT; /* default timeout for HTTP transfers */
-char *buf; /* transfer buffer */
+static long ftp_timeout = TIMEOUT; /* default timeout for FTP transfers */
+static long http_timeout = TIMEOUT;/* default timeout for HTTP transfers */
+static char *buf; /* transfer buffer */
+enum options
+{
+ OPTION_BIND_ADDRESS,
+ OPTION_NO_FTP_PASSIVE_MODE,
+ OPTION_HTTP_REFERER,
+ OPTION_HTTP_USER_AGENT,
+ OPTION_NO_PROXY,
+ OPTION_SSL_ALLOW_SSL2,
+ OPTION_SSL_CA_CERT_FILE,
+ OPTION_SSL_CA_CERT_PATH,
+ OPTION_SSL_CLIENT_CERT_FILE,
+ OPTION_SSL_CLIENT_KEY_FILE,
+ OPTION_SSL_CRL_FILE,
+ OPTION_SSL_NO_SSL3,
+ OPTION_SSL_NO_TLS1,
+ OPTION_SSL_NO_VERIFY_HOSTNAME,
+ OPTION_SSL_NO_VERIFY_PEER
+};
+
+static struct option longopts[] =
+{
+ /* mapping to single character argument */
+ { "one-file", no_argument, NULL, '1' },
+ { "ipv4-only", no_argument, NULL, '4' },
+ { "ipv6-only", no_argument, NULL, '6' },
+ { "no-redirect", no_argument, NULL, 'A' },
+ { "retry", no_argument, NULL, 'a' },
+ { "buffer-size", required_argument, NULL, 'B' },
+ /* -c not mapped, since it's deprecated */
+ { "direct", no_argument, NULL, 'd' },
+ { "force-restart", no_argument, NULL, 'F' },
+ /* -f not mapped, since it's deprecated */
+ /* -h not mapped, since it's deprecated */
+ { "if-modified-since", required_argument, NULL, 'i' },
+ { "symlink", no_argument, NULL, 'l' },
+ /* -M not mapped since it's the same as -m */
+ { "mirror", no_argument, NULL, 'm' },
+ { "netrc", required_argument, NULL, 'N' },
+ { "no-mtime", no_argument, NULL, 'n' },
+ { "output", required_argument, NULL, 'o' },
+ /* -P not mapped since it's the same as -p */
+ { "passive", no_argument, NULL, 'p' },
+ { "quiet", no_argument, NULL, 'q' },
+ { "keep-output", no_argument, NULL, 'R' },
+ { "restart", no_argument, NULL, 'r' },
+ { "require-size", required_argument, NULL, 'S' },
+ { "print-size", no_argument, NULL, 's' },
+ { "timeout", required_argument, NULL, 'T' },
+ { "passive-portrange-default", no_argument, NULL, 'T' },
+ { "verbose", no_argument, NULL, 'v' },
+ { "retry-delay", required_argument, NULL, 'w' },
+
+ /* options without a single character equivalent */
+ { "bind-address", required_argument, NULL, OPTION_BIND_ADDRESS },
+ { "no-passive", no_argument, NULL, OPTION_NO_FTP_PASSIVE_MODE },
+ { "referer", required_argument, NULL, OPTION_HTTP_REFERER },
+ { "user-agent", required_argument, NULL, OPTION_HTTP_USER_AGENT },
+ { "no-proxy", required_argument, NULL, OPTION_NO_PROXY },
+ { "allow-sslv2", no_argument, NULL, OPTION_SSL_ALLOW_SSL2 },
+ { "ca-cert", required_argument, NULL, OPTION_SSL_CA_CERT_FILE },
+ { "ca-path", required_argument, NULL, OPTION_SSL_CA_CERT_PATH },
+ { "cert", required_argument, NULL, OPTION_SSL_CLIENT_CERT_FILE },
+ { "key", required_argument, NULL, OPTION_SSL_CLIENT_KEY_FILE },
+ { "crl", required_argument, NULL, OPTION_SSL_CRL_FILE },
+ { "no-sslv3", no_argument, NULL, OPTION_SSL_NO_SSL3 },
+ { "no-tlsv1", no_argument, NULL, OPTION_SSL_NO_TLS1 },
+ { "no-verify-hostname", no_argument, NULL, OPTION_SSL_NO_VERIFY_HOSTNAME },
+ { "no-verify-peer", no_argument, NULL, OPTION_SSL_NO_VERIFY_PEER },
+
+ { NULL, 0, NULL, 0 }
+};
+
/*
* Signal handler
*/
@@ -565,7 +639,7 @@
goto failure;
}
if (nsb.st_dev != sb.st_dev ||
- nsb.st_ino != nsb.st_ino ||
+ nsb.st_ino != sb.st_ino ||
nsb.st_size != sb.st_size) {
warnx("%s: file has changed", URL);
fclose(of);
@@ -642,6 +716,7 @@
sigalrm = siginfo = sigint = 0;
/* suck in the data */
+ setvbuf(f, NULL, _IOFBF, B_size);
signal(SIGINFO, sig_handler);
while (!sigint) {
if (us.size != -1 && us.size - count < B_size &&
@@ -769,11 +844,19 @@
static void
usage(void)
{
- fprintf(stderr, "%s\n%s\n%s\n%s\n",
-"usage: fetch [-146AadFlMmnPpqRrsUv] [-B bytes] [-N file] [-o file] [-S bytes]",
-" [-T seconds] [-w seconds] [-i file] URL ...",
-" fetch [-146AadFlMmnPpqRrsUv] [-B bytes] [-N file] [-o file] [-S bytes]",
-" [-T seconds] [-w seconds] [-i file] -h host -f file [-c dir]");
+ fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+"usage: fetch [-146AadFlMmnPpqRrsUv] [--allow-sslv2] [-B bytes]",
+" [--bind-address=host] [--ca-cert=file] [--ca-path=dir] [--cert=file]",
+" [--crl=file] [-i file] [--key=file] [-N file] [--no-passive]",
+" [--no-proxy=list] [--no-sslv3] [--no-tlsv1] [--no-verify-hostname]",
+" [--no-verify-peer] [-o file] [--referer=URL] [-S bytes] [-T seconds]",
+" [--user-agent=agent-string] [-w seconds] URL ...",
+" fetch [-146AadFlMmnPpqRrsUv] [--allow-sslv2] [-B bytes]",
+" [--bind-address=host] [--ca-cert=file] [--ca-path=dir] [--cert=file]",
+" [--crl=file] [-i file] [--key=file] [-N file] [--no-passive]",
+" [--no-proxy=list] [--no-sslv3] [--no-tlsv1] [--no-verify-hostname]",
+" [--no-verify-peer] [-o file] [--referer=URL] [-S bytes] [-T seconds]",
+" [--user-agent=agent-string] [-w seconds] -h host -f file [-c dir]");
}
@@ -789,8 +872,10 @@
char *end, *q;
int c, e, r;
- while ((c = getopt(argc, argv,
- "146AaB:bc:dFf:Hh:i:lMmN:nPpo:qRrS:sT:tUvw:")) != -1)
+
+ while ((c = getopt_long(argc, argv,
+ "146AaB:bc:dFf:Hh:i:lMmN:nPpo:qRrS:sT:tUvw:",
+ longopts, NULL)) != -1)
switch (c) {
case '1':
once_flag = 1;
@@ -904,6 +989,51 @@
if (*optarg == '\0' || *end != '\0')
errx(1, "invalid delay (%s)", optarg);
break;
+ case OPTION_BIND_ADDRESS:
+ setenv("FETCH_BIND_ADDRESS", optarg, 1);
+ break;
+ case OPTION_NO_FTP_PASSIVE_MODE:
+ setenv("FTP_PASSIVE_MODE", "no", 1);
+ break;
+ case OPTION_HTTP_REFERER:
+ setenv("HTTP_REFERER", optarg, 1);
+ break;
+ case OPTION_HTTP_USER_AGENT:
+ setenv("HTTP_USER_AGENT", optarg, 1);
+ break;
+ case OPTION_NO_PROXY:
+ setenv("NO_PROXY", optarg, 1);
+ break;
+ case OPTION_SSL_ALLOW_SSL2:
+ setenv("SSL_ALLOW_SSL2", "", 1);
+ break;
+ case OPTION_SSL_CA_CERT_FILE:
+ setenv("SSL_CA_CERT_FILE", optarg, 1);
+ break;
+ case OPTION_SSL_CA_CERT_PATH:
+ setenv("SSL_CA_CERT_PATH", optarg, 1);
+ break;
+ case OPTION_SSL_CLIENT_CERT_FILE:
+ setenv("SSL_CLIENT_CERT_FILE", optarg, 1);
+ break;
+ case OPTION_SSL_CLIENT_KEY_FILE:
+ setenv("SSL_CLIENT_KEY_FILE", optarg, 1);
+ break;
+ case OPTION_SSL_CRL_FILE:
+ setenv("SSL_CLIENT_CRL_FILE", optarg, 1);
+ break;
+ case OPTION_SSL_NO_SSL3:
+ setenv("SSL_NO_SSL3", "", 1);
+ break;
+ case OPTION_SSL_NO_TLS1:
+ setenv("SSL_NO_TLS1", "", 1);
+ break;
+ case OPTION_SSL_NO_VERIFY_HOSTNAME:
+ setenv("SSL_NO_VERIFY_HOSTNAME", "", 1);
+ break;
+ case OPTION_SSL_NO_VERIFY_PEER:
+ setenv("SSL_NO_VERIFY_PEER", "", 1);
+ break;
default:
usage();
exit(1);
More information about the Midnightbsd-cvs
mailing list