mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
54e7475016
- Disable auto credentials by default. This is a breaking change for clients that are using it, wittingly or not. - New libcurl ssl option value CURLSSLOPT_AUTO_CLIENT_CERT tells libcurl to automatically locate and use a client certificate for authentication, when requested by the server. - New curl tool options --ssl-auto-client-cert and --proxy-ssl-auto-client-cert map to CURLSSLOPT_AUTO_CLIENT_CERT. This option is only supported for Schannel (the native Windows SSL library). Prior to this change Schannel would, with no notification to the client, attempt to locate a client certificate and send it to the server, when requested by the server. Since the server can request any certificate that supports client authentication in the OS certificate store it could be a privacy violation and unexpected. Fixes https://github.com/curl/curl/issues/2262 Reported-by: Jeroen Ooms Assisted-by: Wes Hinsley Assisted-by: Rich FitzJohn Ref: https://curl.se/mail/lib-2021-02/0066.html Reported-by: Morten Minde Neergaard Closes https://github.com/curl/curl/pull/6673
165 lines
6.2 KiB
C
165 lines
6.2 KiB
C
#ifndef HEADER_CURL_TOOL_SETOPT_H
|
|
#define HEADER_CURL_TOOL_SETOPT_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2020, 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.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 "tool_setup.h"
|
|
|
|
#include "tool_formparse.h"
|
|
|
|
/*
|
|
* Macros used in operate()
|
|
*/
|
|
|
|
#define SETOPT_CHECK(v,opt) do { \
|
|
if(!tool_setopt_skip(opt)) { \
|
|
result = (v); \
|
|
if(result) \
|
|
break; \
|
|
} \
|
|
} while(0)
|
|
|
|
/* allow removed features to simulate success: */
|
|
bool tool_setopt_skip(CURLoption tag);
|
|
|
|
#ifndef CURL_DISABLE_LIBCURL_OPTION
|
|
|
|
/* Associate symbolic names with option values */
|
|
struct NameValue {
|
|
const char *name;
|
|
long value;
|
|
};
|
|
|
|
struct NameValueUnsigned {
|
|
const char *name;
|
|
unsigned long value;
|
|
};
|
|
|
|
extern const struct NameValue setopt_nv_CURLPROXY[];
|
|
extern const struct NameValue setopt_nv_CURL_SOCKS_PROXY[];
|
|
extern const struct NameValue setopt_nv_CURL_HTTP_VERSION[];
|
|
extern const struct NameValue setopt_nv_CURL_SSLVERSION[];
|
|
extern const struct NameValue setopt_nv_CURL_TIMECOND[];
|
|
extern const struct NameValue setopt_nv_CURLFTPSSL_CCC[];
|
|
extern const struct NameValue setopt_nv_CURLUSESSL[];
|
|
extern const struct NameValueUnsigned setopt_nv_CURLSSLOPT[];
|
|
extern const struct NameValue setopt_nv_CURL_NETRC[];
|
|
extern const struct NameValue setopt_nv_CURLPROTO[];
|
|
extern const struct NameValueUnsigned setopt_nv_CURLAUTH[];
|
|
extern const struct NameValueUnsigned setopt_nv_CURLHSTS[];
|
|
|
|
/* Map options to NameValue sets */
|
|
#define setopt_nv_CURLOPT_HSTS_CTRL setopt_nv_CURLHSTS
|
|
#define setopt_nv_CURLOPT_HTTP_VERSION setopt_nv_CURL_HTTP_VERSION
|
|
#define setopt_nv_CURLOPT_HTTPAUTH setopt_nv_CURLAUTH
|
|
#define setopt_nv_CURLOPT_SSLVERSION setopt_nv_CURL_SSLVERSION
|
|
#define setopt_nv_CURLOPT_PROXY_SSLVERSION setopt_nv_CURL_SSLVERSION
|
|
#define setopt_nv_CURLOPT_TIMECONDITION setopt_nv_CURL_TIMECOND
|
|
#define setopt_nv_CURLOPT_FTP_SSL_CCC setopt_nv_CURLFTPSSL_CCC
|
|
#define setopt_nv_CURLOPT_USE_SSL setopt_nv_CURLUSESSL
|
|
#define setopt_nv_CURLOPT_SSL_OPTIONS setopt_nv_CURLSSLOPT
|
|
#define setopt_nv_CURLOPT_PROXY_SSL_OPTIONS setopt_nv_CURLSSLOPT
|
|
#define setopt_nv_CURLOPT_NETRC setopt_nv_CURL_NETRC
|
|
#define setopt_nv_CURLOPT_PROTOCOLS setopt_nv_CURLPROTO
|
|
#define setopt_nv_CURLOPT_REDIR_PROTOCOLS setopt_nv_CURLPROTO
|
|
#define setopt_nv_CURLOPT_PROXYTYPE setopt_nv_CURLPROXY
|
|
#define setopt_nv_CURLOPT_PROXYAUTH setopt_nv_CURLAUTH
|
|
#define setopt_nv_CURLOPT_SOCKS5_AUTH setopt_nv_CURLAUTH
|
|
|
|
/* Intercept setopt calls for --libcurl */
|
|
|
|
CURLcode tool_setopt_enum(CURL *curl, struct GlobalConfig *config,
|
|
const char *name, CURLoption tag,
|
|
const struct NameValue *nv, long lval);
|
|
CURLcode tool_setopt_flags(CURL *curl, struct GlobalConfig *config,
|
|
const char *name, CURLoption tag,
|
|
const struct NameValue *nv, long lval);
|
|
CURLcode tool_setopt_bitmask(CURL *curl, struct GlobalConfig *config,
|
|
const char *name, CURLoption tag,
|
|
const struct NameValueUnsigned *nv, long lval);
|
|
CURLcode tool_setopt_mimepost(CURL *curl, struct GlobalConfig *config,
|
|
const char *name, CURLoption tag,
|
|
curl_mime *mimepost);
|
|
CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *config,
|
|
const char *name, CURLoption tag,
|
|
struct curl_slist *list);
|
|
CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global,
|
|
struct OperationConfig *config,
|
|
const char *name, CURLoption tag, ...);
|
|
|
|
#define my_setopt(x,y,z) \
|
|
SETOPT_CHECK(tool_setopt(x, FALSE, global, config, #y, y, z), y)
|
|
|
|
#define my_setopt_str(x,y,z) \
|
|
SETOPT_CHECK(tool_setopt(x, TRUE, global, config, #y, y, z), y)
|
|
|
|
#define my_setopt_enum(x,y,z) \
|
|
SETOPT_CHECK(tool_setopt_enum(x, global, #y, y, setopt_nv_ ## y, z), y)
|
|
|
|
#define my_setopt_flags(x,y,z) \
|
|
SETOPT_CHECK(tool_setopt_flags(x, global, #y, y, setopt_nv_ ## y, z), y)
|
|
|
|
#define my_setopt_bitmask(x,y,z) \
|
|
SETOPT_CHECK(tool_setopt_bitmask(x, global, #y, y, setopt_nv_ ## y, z), y)
|
|
|
|
#define my_setopt_mimepost(x,y,z) \
|
|
SETOPT_CHECK(tool_setopt_mimepost(x, global, #y, y, z), y)
|
|
|
|
#define my_setopt_slist(x,y,z) \
|
|
SETOPT_CHECK(tool_setopt_slist(x, global, #y, y, z), y)
|
|
|
|
#define res_setopt(x,y,z) tool_setopt(x, FALSE, global, config, #y, y, z)
|
|
|
|
#define res_setopt_str(x,y,z) tool_setopt(x, TRUE, global, config, #y, y, z)
|
|
|
|
#else /* CURL_DISABLE_LIBCURL_OPTION */
|
|
|
|
/* No --libcurl, so pass options directly to library */
|
|
|
|
#define my_setopt(x,y,z) \
|
|
SETOPT_CHECK(curl_easy_setopt(x, y, z), y)
|
|
|
|
#define my_setopt_str(x,y,z) \
|
|
SETOPT_CHECK(curl_easy_setopt(x, y, z), y)
|
|
|
|
#define my_setopt_enum(x,y,z) \
|
|
SETOPT_CHECK(curl_easy_setopt(x, y, z), y)
|
|
|
|
#define my_setopt_flags(x,y,z) \
|
|
SETOPT_CHECK(curl_easy_setopt(x, y, z), y)
|
|
|
|
#define my_setopt_bitmask(x,y,z) \
|
|
SETOPT_CHECK(curl_easy_setopt(x, y, z), y)
|
|
|
|
#define my_setopt_mimepost(x,y,z) \
|
|
SETOPT_CHECK(curl_easy_setopt(x, y, z), y)
|
|
|
|
#define my_setopt_slist(x,y,z) \
|
|
SETOPT_CHECK(curl_easy_setopt(x, y, z), y)
|
|
|
|
#define res_setopt(x,y,z) curl_easy_setopt(x,y,z)
|
|
|
|
#define res_setopt_str(x,y,z) curl_easy_setopt(x,y,z)
|
|
|
|
#endif /* CURL_DISABLE_LIBCURL_OPTION */
|
|
|
|
#endif /* HEADER_CURL_TOOL_SETOPT_H */
|