mirror of
https://github.com/curl/curl.git
synced 2024-12-27 06:59:43 +08:00
3829759bd0
https://best.openssf.org/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C++.html as of 2023-11-29 [1]. Enable new recommended warnings (except `-Wsign-conversion`): - enable `-Wformat=2` for clang (in both cmake and autotools). - add `CURL_PRINTF()` internal attribute and mark functions accepting printf arguments with it. This is a copy of existing `CURL_TEMP_PRINTF()` but using `__printf__` to make it compatible with redefinting the `printf` symbol: https://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_5.html#SEC94 - fix `CURL_PRINTF()` and existing `CURL_TEMP_PRINTF()` for mingw-w64 and enable it on this platform. - enable `-Wimplicit-fallthrough`. - enable `-Wtrampolines`. - add `-Wsign-conversion` commented with a FIXME. - cmake: enable `-pedantic-errors` the way we do it with autotools. Follow-up tod5c0351055
#2747 - lib/curl_trc.h: use `CURL_FORMAT()`, this also fixes it to enable format checks. Previously it was always disabled due to the internal `printf` macro. Fix them: - fix bug where an `set_ipv6_v6only()` call was missed in builds with `--disable-verbose` / `CURL_DISABLE_VERBOSE_STRINGS=ON`. - add internal `FALLTHROUGH()` macro. - replace obsolete fall-through comments with `FALLTHROUGH()`. - fix fallthrough markups: Delete redundant ones (showing up as warnings in most cases). Add missing ones. Fix indentation. - silence `-Wformat-nonliteral` warnings with llvm/clang. - fix one `-Wformat-nonliteral` warning. - fix new `-Wformat` and `-Wformat-security` warnings. - fix `CURL_FORMAT_SOCKET_T` value for mingw-w64. Also move its definition to `lib/curl_setup.h` allowing use in `tests/server`. - lib: fix two wrongly passed string arguments in log outputs. Co-authored-by: Jay Satiro - fix new `-Wformat` warnings on mingw-w64. [1]56c0fde389/docs/Compiler-Hardening-Guides/Compiler-Options-Hardening-Guide-for-C-and-C%2B%2B.md
Closes #12489
265 lines
6.4 KiB
C
265 lines
6.4 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 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.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#include <curl/curl.h>
|
|
|
|
#include "curl_trc.h"
|
|
#include "urldata.h"
|
|
#include "easyif.h"
|
|
#include "cfilters.h"
|
|
#include "timeval.h"
|
|
#include "multiif.h"
|
|
#include "strcase.h"
|
|
|
|
#include "cf-socket.h"
|
|
#include "connect.h"
|
|
#include "http2.h"
|
|
#include "http_proxy.h"
|
|
#include "cf-h1-proxy.h"
|
|
#include "cf-h2-proxy.h"
|
|
#include "cf-haproxy.h"
|
|
#include "cf-https-connect.h"
|
|
#include "socks.h"
|
|
#include "strtok.h"
|
|
#include "vtls/vtls.h"
|
|
#include "vquic/vquic.h"
|
|
|
|
/* The last 3 #include files should be in this order */
|
|
#include "curl_printf.h"
|
|
#include "curl_memory.h"
|
|
#include "memdebug.h"
|
|
|
|
|
|
void Curl_debug(struct Curl_easy *data, curl_infotype type,
|
|
char *ptr, size_t size)
|
|
{
|
|
if(data->set.verbose) {
|
|
static const char s_infotype[CURLINFO_END][3] = {
|
|
"* ", "< ", "> ", "{ ", "} ", "{ ", "} " };
|
|
if(data->set.fdebug) {
|
|
bool inCallback = Curl_is_in_callback(data);
|
|
Curl_set_in_callback(data, true);
|
|
(void)(*data->set.fdebug)(data, type, ptr, size, data->set.debugdata);
|
|
Curl_set_in_callback(data, inCallback);
|
|
}
|
|
else {
|
|
switch(type) {
|
|
case CURLINFO_TEXT:
|
|
case CURLINFO_HEADER_OUT:
|
|
case CURLINFO_HEADER_IN:
|
|
fwrite(s_infotype[type], 2, 1, data->set.err);
|
|
fwrite(ptr, size, 1, data->set.err);
|
|
break;
|
|
default: /* nada */
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/* Curl_failf() is for messages stating why we failed.
|
|
* The message SHALL NOT include any LF or CR.
|
|
*/
|
|
void Curl_failf(struct Curl_easy *data, const char *fmt, ...)
|
|
{
|
|
DEBUGASSERT(!strchr(fmt, '\n'));
|
|
if(data->set.verbose || data->set.errorbuffer) {
|
|
va_list ap;
|
|
int len;
|
|
char error[CURL_ERROR_SIZE + 2];
|
|
va_start(ap, fmt);
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wformat-nonliteral"
|
|
#endif
|
|
len = mvsnprintf(error, CURL_ERROR_SIZE, fmt, ap);
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
|
|
if(data->set.errorbuffer && !data->state.errorbuf) {
|
|
strcpy(data->set.errorbuffer, error);
|
|
data->state.errorbuf = TRUE; /* wrote error string */
|
|
}
|
|
error[len++] = '\n';
|
|
error[len] = '\0';
|
|
Curl_debug(data, CURLINFO_TEXT, error, len);
|
|
va_end(ap);
|
|
}
|
|
}
|
|
|
|
#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
|
|
|
|
/* Curl_infof() is for info message along the way */
|
|
#define MAXINFO 2048
|
|
|
|
void Curl_infof(struct Curl_easy *data, const char *fmt, ...)
|
|
{
|
|
DEBUGASSERT(!strchr(fmt, '\n'));
|
|
if(data && data->set.verbose) {
|
|
va_list ap;
|
|
int len;
|
|
char buffer[MAXINFO + 2];
|
|
va_start(ap, fmt);
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wformat-nonliteral"
|
|
#endif
|
|
len = mvsnprintf(buffer, MAXINFO, fmt, ap);
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
va_end(ap);
|
|
buffer[len++] = '\n';
|
|
buffer[len] = '\0';
|
|
Curl_debug(data, CURLINFO_TEXT, buffer, len);
|
|
}
|
|
}
|
|
|
|
void Curl_trc_cf_infof(struct Curl_easy *data, struct Curl_cfilter *cf,
|
|
const char *fmt, ...)
|
|
{
|
|
DEBUGASSERT(cf);
|
|
if(Curl_trc_cf_is_verbose(cf, data)) {
|
|
va_list ap;
|
|
int len;
|
|
char buffer[MAXINFO + 2];
|
|
len = msnprintf(buffer, MAXINFO, "[%s] ", cf->cft->name);
|
|
va_start(ap, fmt);
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wformat-nonliteral"
|
|
#endif
|
|
len += mvsnprintf(buffer + len, MAXINFO - len, fmt, ap);
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
va_end(ap);
|
|
buffer[len++] = '\n';
|
|
buffer[len] = '\0';
|
|
Curl_debug(data, CURLINFO_TEXT, buffer, len);
|
|
}
|
|
}
|
|
|
|
|
|
static struct Curl_cftype *cf_types[] = {
|
|
&Curl_cft_tcp,
|
|
&Curl_cft_udp,
|
|
&Curl_cft_unix,
|
|
&Curl_cft_tcp_accept,
|
|
&Curl_cft_happy_eyeballs,
|
|
&Curl_cft_setup,
|
|
#ifdef USE_NGHTTP2
|
|
&Curl_cft_nghttp2,
|
|
#endif
|
|
#ifdef USE_SSL
|
|
&Curl_cft_ssl,
|
|
#ifndef CURL_DISABLE_PROXY
|
|
&Curl_cft_ssl_proxy,
|
|
#endif
|
|
#endif
|
|
#if !defined(CURL_DISABLE_PROXY)
|
|
#if !defined(CURL_DISABLE_HTTP)
|
|
&Curl_cft_h1_proxy,
|
|
#ifdef USE_NGHTTP2
|
|
&Curl_cft_h2_proxy,
|
|
#endif
|
|
&Curl_cft_http_proxy,
|
|
#endif /* !CURL_DISABLE_HTTP */
|
|
&Curl_cft_haproxy,
|
|
&Curl_cft_socks_proxy,
|
|
#endif /* !CURL_DISABLE_PROXY */
|
|
#ifdef ENABLE_QUIC
|
|
&Curl_cft_http3,
|
|
#endif
|
|
#if !defined(CURL_DISABLE_HTTP) && !defined(USE_HYPER)
|
|
&Curl_cft_http_connect,
|
|
#endif
|
|
NULL,
|
|
};
|
|
|
|
CURLcode Curl_trc_opt(const char *config)
|
|
{
|
|
char *token, *tok_buf, *tmp;
|
|
size_t i;
|
|
int lvl;
|
|
|
|
tmp = strdup(config);
|
|
if(!tmp)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
|
|
token = strtok_r(tmp, ", ", &tok_buf);
|
|
while(token) {
|
|
switch(*token) {
|
|
case '-':
|
|
lvl = CURL_LOG_LVL_NONE;
|
|
++token;
|
|
break;
|
|
case '+':
|
|
lvl = CURL_LOG_LVL_INFO;
|
|
++token;
|
|
break;
|
|
default:
|
|
lvl = CURL_LOG_LVL_INFO;
|
|
break;
|
|
}
|
|
for(i = 0; cf_types[i]; ++i) {
|
|
if(strcasecompare(token, "all")) {
|
|
cf_types[i]->log_level = lvl;
|
|
}
|
|
else if(strcasecompare(token, cf_types[i]->name)) {
|
|
cf_types[i]->log_level = lvl;
|
|
break;
|
|
}
|
|
}
|
|
token = strtok_r(NULL, ", ", &tok_buf);
|
|
}
|
|
free(tmp);
|
|
return CURLE_OK;
|
|
}
|
|
|
|
CURLcode Curl_trc_init(void)
|
|
{
|
|
#ifdef DEBUGBUILD
|
|
/* WIP: we use the auto-init from an env var only in DEBUG builds for
|
|
* convenience. */
|
|
const char *config = getenv("CURL_DEBUG");
|
|
if(config) {
|
|
return Curl_trc_opt(config);
|
|
}
|
|
#endif /* DEBUGBUILD */
|
|
return CURLE_OK;
|
|
}
|
|
#else /* defined(CURL_DISABLE_VERBOSE_STRINGS) */
|
|
|
|
CURLcode Curl_trc_init(void)
|
|
{
|
|
return CURLE_OK;
|
|
}
|
|
|
|
#endif /* !defined(CURL_DISABLE_VERBOSE_STRINGS) */
|