mirror of
https://github.com/moparisthebest/curl
synced 2024-11-13 21:15:08 -05:00
8996300211
- Move verify_certificate functionality in schannel.c into a new file called schannel_verify.c. Additionally, some structure defintions from schannel.c have been moved to schannel.h to allow them to be used in schannel_verify.c. - Make verify_certificate functionality for Schannel available on all versions of Windows instead of just Windows CE. verify_certificate will be invoked on Windows CE or when the user specifies CURLOPT_CAINFO and CURLOPT_SSL_VERIFYPEER. - In verify_certificate, create a custom certificate chain engine that exclusively trusts the certificate store backed by the CURLOPT_CAINFO file. - doc updates of --cacert/CAINFO support for schannel - Use CERT_NAME_SEARCH_ALL_NAMES_FLAG when invoking CertGetNameString when available. This implements a TODO in schannel.c to improve handling of multiple SANs in a certificate. In particular, all SANs will now be searched instead of just the first name. - Update tool_operate.c to not search for the curl-ca-bundle.crt file when using Schannel to maintain backward compatibility. Previously, any curl-ca-bundle.crt file found in that search would have been ignored by Schannel. But, with CAINFO support, the file found by that search would have been used as the certificate store and could cause issues for any users that have curl-ca-bundle.crt in the search path. - Update url.c to not set the build time CURL_CA_BUNDLE if the selected SSL backend is Schannel. We allow setting CA location for schannel only when explicitly specified by the user via CURLOPT_CAINFO / --cacert. - Add new test cases 3000 and 3001. These test cases check that the first and last SAN, respectively, matches the connection hostname. New test certificates have been added for these cases. For 3000, the certificate prefix is Server-localhost-firstSAN and for 3001, the certificate prefix is Server-localhost-secondSAN. - Remove TODO 15.2 (Add support for custom server certificate validation), this commit addresses it. Closes https://github.com/curl/curl/pull/1325
154 lines
4.9 KiB
C
154 lines
4.9 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(USE_OPENSSL) \
|
|
|| defined(USE_AXTLS) \
|
|
|| defined(USE_GSKIT) \
|
|
|| defined(USE_SCHANNEL)
|
|
/* these backends use functions from this file */
|
|
|
|
#ifdef HAVE_NETINET_IN_H
|
|
#include <netinet/in.h>
|
|
#endif
|
|
#ifdef HAVE_NETINET_IN6_H
|
|
#include <netinet/in6.h>
|
|
#endif
|
|
|
|
#include "hostcheck.h"
|
|
#include "strcase.h"
|
|
#include "inet_pton.h"
|
|
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
/*
|
|
* Match a hostname against a wildcard pattern.
|
|
* E.g.
|
|
* "foo.host.com" matches "*.host.com".
|
|
*
|
|
* We use the matching rule described in RFC6125, section 6.4.3.
|
|
* https://tools.ietf.org/html/rfc6125#section-6.4.3
|
|
*
|
|
* In addition: ignore trailing dots in the host names and wildcards, so that
|
|
* the names are used normalized. This is what the browsers do.
|
|
*
|
|
* Do not allow wildcard matching on IP numbers. There are apparently
|
|
* certificates being used with an IP address in the CN field, thus making no
|
|
* apparent distinction between a name and an IP. We need to detect the use of
|
|
* an IP address and not wildcard match on such names.
|
|
*
|
|
* NOTE: hostmatch() gets called with copied buffers so that it can modify the
|
|
* contents at will.
|
|
*/
|
|
|
|
static int hostmatch(char *hostname, char *pattern)
|
|
{
|
|
const char *pattern_label_end, *pattern_wildcard, *hostname_label_end;
|
|
int wildcard_enabled;
|
|
size_t prefixlen, suffixlen;
|
|
struct in_addr ignored;
|
|
#ifdef ENABLE_IPV6
|
|
struct sockaddr_in6 si6;
|
|
#endif
|
|
|
|
/* normalize pattern and hostname by stripping off trailing dots */
|
|
size_t len = strlen(hostname);
|
|
if(hostname[len-1]=='.')
|
|
hostname[len-1] = 0;
|
|
len = strlen(pattern);
|
|
if(pattern[len-1]=='.')
|
|
pattern[len-1] = 0;
|
|
|
|
pattern_wildcard = strchr(pattern, '*');
|
|
if(pattern_wildcard == NULL)
|
|
return strcasecompare(pattern, hostname) ?
|
|
CURL_HOST_MATCH : CURL_HOST_NOMATCH;
|
|
|
|
/* detect IP address as hostname and fail the match if so */
|
|
if(Curl_inet_pton(AF_INET, hostname, &ignored) > 0)
|
|
return CURL_HOST_NOMATCH;
|
|
#ifdef ENABLE_IPV6
|
|
if(Curl_inet_pton(AF_INET6, hostname, &si6.sin6_addr) > 0)
|
|
return CURL_HOST_NOMATCH;
|
|
#endif
|
|
|
|
/* We require at least 2 dots in pattern to avoid too wide wildcard
|
|
match. */
|
|
wildcard_enabled = 1;
|
|
pattern_label_end = strchr(pattern, '.');
|
|
if(pattern_label_end == NULL || strchr(pattern_label_end + 1, '.') == NULL ||
|
|
pattern_wildcard > pattern_label_end ||
|
|
strncasecompare(pattern, "xn--", 4)) {
|
|
wildcard_enabled = 0;
|
|
}
|
|
if(!wildcard_enabled)
|
|
return strcasecompare(pattern, hostname) ?
|
|
CURL_HOST_MATCH : CURL_HOST_NOMATCH;
|
|
|
|
hostname_label_end = strchr(hostname, '.');
|
|
if(hostname_label_end == NULL ||
|
|
!strcasecompare(pattern_label_end, hostname_label_end))
|
|
return CURL_HOST_NOMATCH;
|
|
|
|
/* The wildcard must match at least one character, so the left-most
|
|
label of the hostname is at least as large as the left-most label
|
|
of the pattern. */
|
|
if(hostname_label_end - hostname < pattern_label_end - pattern)
|
|
return CURL_HOST_NOMATCH;
|
|
|
|
prefixlen = pattern_wildcard - pattern;
|
|
suffixlen = pattern_label_end - (pattern_wildcard + 1);
|
|
return strncasecompare(pattern, hostname, prefixlen) &&
|
|
strncasecompare(pattern_wildcard + 1, hostname_label_end - suffixlen,
|
|
suffixlen) ?
|
|
CURL_HOST_MATCH : CURL_HOST_NOMATCH;
|
|
}
|
|
|
|
int Curl_cert_hostcheck(const char *match_pattern, const char *hostname)
|
|
{
|
|
char *matchp;
|
|
char *hostp;
|
|
int res = 0;
|
|
if(!match_pattern || !*match_pattern ||
|
|
!hostname || !*hostname) /* sanity check */
|
|
;
|
|
else {
|
|
matchp = strdup(match_pattern);
|
|
if(matchp) {
|
|
hostp = strdup(hostname);
|
|
if(hostp) {
|
|
if(hostmatch(hostp, matchp) == CURL_HOST_MATCH)
|
|
res = 1;
|
|
free(hostp);
|
|
}
|
|
free(matchp);
|
|
}
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
#endif /* OPENSSL, AXTLS, GSKIT or schannel+wince */
|