romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-16 20:56:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl tool: erase some more sensitive command line arguments

Browse source 
As the ps command may reveal sensitive command line info, obfuscate
options --tlsuser, --tlspasswd, --proxy-tlsuser, --proxy-tlspassword and
--oauth2-bearer arguments.

Reported-by: Stephen Boost <s.booth@epcc.ed.ac.uk>

Closes #7964
This commit is contained in:
Patrick Monnerat 2022-01-10 11:51:16 +01:00 • committed by Daniel Stenberg
parent 223f26c28a
commit b6acbdeb63
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/tool_getparam.c
View file

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1998 - 2022, 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
@ -669,6 +669,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
break;
case 'B': /* OAuth 2.0 bearer token */
GetStr(&config->oauth_bearer, nextarg);
cleanarg(nextarg);
config->authtype |= CURLAUTH_BEARER;
break;
case 'c': /* connect-timeout */
@ -1617,16 +1618,20 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
GetStr(&config->crlfile, nextarg);
break;
case 'k': /* TLS username */
if(curlinfo->features & CURL_VERSION_TLSAUTH_SRP)
GetStr(&config->tls_username, nextarg);
else
if(!(curlinfo->features & CURL_VERSION_TLSAUTH_SRP)) {
cleanarg(nextarg);
return PARAM_LIBCURL_DOESNT_SUPPORT;
}
GetStr(&config->tls_username, nextarg);
cleanarg(nextarg);
break;
case 'l': /* TLS password */
if(curlinfo->features & CURL_VERSION_TLSAUTH_SRP)
GetStr(&config->tls_password, nextarg);
else
if(!(curlinfo->features & CURL_VERSION_TLSAUTH_SRP)) {
cleanarg(nextarg);
return PARAM_LIBCURL_DOESNT_SUPPORT;
}
GetStr(&config->tls_password, nextarg);
cleanarg(nextarg);
break;
case 'm': /* TLS authentication type */
if(curlinfo->features & CURL_VERSION_TLSAUTH_SRP) {
@ -1687,17 +1692,21 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
break;
case 'u': /* TLS username for proxy */
if(curlinfo->features & CURL_VERSION_TLSAUTH_SRP)
GetStr(&config->proxy_tls_username, nextarg);
else
if(!(curlinfo->features & CURL_VERSION_TLSAUTH_SRP)) {
cleanarg(nextarg);
return PARAM_LIBCURL_DOESNT_SUPPORT;
}
GetStr(&config->proxy_tls_username, nextarg);
cleanarg(nextarg);
break;
case 'v': /* TLS password for proxy */
if(curlinfo->features & CURL_VERSION_TLSAUTH_SRP)
GetStr(&config->proxy_tls_password, nextarg);
else
if(!(curlinfo->features & CURL_VERSION_TLSAUTH_SRP)) {
cleanarg(nextarg);
return PARAM_LIBCURL_DOESNT_SUPPORT;
}
GetStr(&config->proxy_tls_password, nextarg);
cleanarg(nextarg);
break;
case 'w': /* TLS authentication type for proxy */