From 2e160c9c652504e147f474ed920ae891481e299c Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 31 Jul 2023 11:50:28 +0200 Subject: [PATCH] tool: add "variable" support Add support for command line variables. Set variables with --variable name=content or --variable name@file (where "file" can be stdin if set to a single dash (-)). Variable content is expanded in option parameters using "{{name}}" (without the quotes) if the option name is prefixed with "--expand-". This gets the contents of the variable "name" inserted, or a blank if the name does not exist as a variable. Insert "{{" verbatim in the string by prefixing it with a backslash, like "\\{{". Import an environment variable with --variable %name. It makes curl exit with an error if the environment variable is not set. It can also rather get a default value if the variable does not exist, using =content or @file like shown above. Example: get the USER environment variable into the URL: --variable %USER --expand-url = "https://example.com/api/{{USER}}/method" When expanding variables, curl supports a set of functions that can make the variable contents more convenient to use. It can trim leading and trailing white space with "trim", output the contents as a JSON quoted string with "json", URL encode it with "url" and base 64 encode it with "b64". To apply functions to a variable expansion, add them colon separated to the right side of the variable. They are then performed in a left to right order. Example: get the contents of a file called $HOME/.secret into a variable called "fix". Make sure that the content is trimmed and percent-encoded sent as POST data: --variable %HOME=/home/default --expand-variable fix@{{HOME}}/.secret --expand-data "{{fix:trim:url}}" https://example.com/ Documented. Many new test cases. Co-brainstormed-by: Emanuele Torre Assisted-by: Jat Satiro Closes #11346 --- docs/cmdline-opts/Makefile.inc | 1 + docs/cmdline-opts/config.d | 10 +- docs/cmdline-opts/page-header | 42 +++ docs/cmdline-opts/variable.d | 50 ++++ docs/options-in-versions | 1 + lib/base64.c | 5 +- lib/curl_base64.h | 9 +- projects/generate.bat | 2 + src/CMakeLists.txt | 2 +- src/Makefile.inc | 15 +- src/tool_cfgable.h | 2 + src/tool_getparam.c | 497 ++++++++++++++++++++------------- src/tool_getparam.h | 1 + src/tool_helpers.c | 2 + src/tool_listhelp.c | 11 +- src/tool_operate.c | 49 ++-- src/tool_writeout_json.c | 61 ++-- src/tool_writeout_json.h | 3 + src/var.c | 462 ++++++++++++++++++++++++++++++ src/var.h | 48 ++++ tests/data/Makefile.inc | 7 +- tests/data/test428 | 68 +++++ tests/data/test429 | 63 +++++ tests/data/test448 | 67 +++++ tests/data/test449 | 65 +++++ tests/data/test450 | 60 ++++ tests/data/test451 | 59 ++++ tests/data/test452 | 34 +++ tests/data/test453 | 33 +++ tests/data/test454 | 34 +++ tests/data/test455 | 52 ++++ winbuild/MakefileBuild.vc | 5 +- 32 files changed, 1562 insertions(+), 258 deletions(-) create mode 100644 docs/cmdline-opts/variable.d create mode 100644 src/var.c create mode 100644 src/var.h create mode 100644 tests/data/test428 create mode 100644 tests/data/test429 create mode 100644 tests/data/test448 create mode 100644 tests/data/test449 create mode 100644 tests/data/test450 create mode 100644 tests/data/test451 create mode 100644 tests/data/test452 create mode 100644 tests/data/test453 create mode 100644 tests/data/test454 create mode 100644 tests/data/test455 diff --git a/docs/cmdline-opts/Makefile.inc b/docs/cmdline-opts/Makefile.inc index d265e53744..6f9caea07e 100644 --- a/docs/cmdline-opts/Makefile.inc +++ b/docs/cmdline-opts/Makefile.inc @@ -275,6 +275,7 @@ DPAGES = \ use-ascii.d \ user-agent.d \ user.d \ + variable.d \ verbose.d \ version.d \ write-out.d \ diff --git a/docs/cmdline-opts/config.d b/docs/cmdline-opts/config.d index d57579ce50..7a6e6d6eb0 100644 --- a/docs/cmdline-opts/config.d +++ b/docs/cmdline-opts/config.d @@ -21,12 +21,12 @@ if so, the colon or equals characters can be used as separators. If the option is specified with one or two dashes, there can be no colon or equals character between the option and its parameter. -If the parameter contains whitespace (or starts with : or =), the parameter -must be enclosed within quotes. Within double quotes, the following escape -sequences are available: \\\\, \\", \\t, \\n, \\r and \\v. A backslash -preceding any other letter is ignored. +If the parameter contains whitespace or starts with a colon (:) or equals sign +(=), it must be specified enclosed within double quotes (\&"). Within double +quotes the following escape sequences are available: \\\\, \\", \\t, \\n, \\r +and \\v. A backslash preceding any other letter is ignored. -If the first column of a config line is a '#' character, the rest of the line +If the first non-blank column of a config line is a '#' character, that line will be treated as a comment. Only write one option per physical line in the config file. A single line is diff --git a/docs/cmdline-opts/page-header b/docs/cmdline-opts/page-header index 566fe77387..2d15a8eef7 100644 --- a/docs/cmdline-opts/page-header +++ b/docs/cmdline-opts/page-header @@ -97,6 +97,48 @@ that getting many files from the same server do not use multiple connects / handshakes. This improves speed. Connection re-use can only be done for URLs specified for a single command line invocation and cannot be performed between separate curl runs. +.SH VARIABLES +Starting in curl 8.3.0, curl supports command line variables. Set variables +with --variable name=content or --variable name@file (where "file" can be +stdin if set to a single dash (-)). + +Variable contents can expanded in option parameters using "{{name}}" (without +the quotes) if the option name is prefixed with "--expand-". This gets the +contents of the variable "name" inserted, or a blank if the name does not +exist as a variable. Insert "{{" verbatim in the string by prefixing it with a +backslash, like "\\{{". + +You an access and expand environment variables by first importing them. You +can select to either require the environment variable to be set or you can +provide a default value in case it is not already set. Plain --variable %name +imports the variable called 'name' but exits with an error if that environment +variable is not alreadty set. To provide a default value if it is not set, use +--variable %name=content or --variable %name@content. + +Example. Get the USER environment variable into the URL, fail if USER is not +set: + + --variable '%USER' + --expand-url = "https://example.com/api/{{USER}}/method" + +When expanding variables, curl supports a set of functions that can make the +variable contents more convenient to use. It can trim leading and trailing +white space with "trim", it can output the contents as a JSON quoted string +with "json" and it can URL encode the string with "urlencode". You apply +function to a variable expansion, add them colon separated to the right side +of the variable. Variable content holding null bytes that are not encoded when +expanded, will cause error. + +Exmaple: get the contents of a file called $HOME/.secret into a variable +called "fix". Make sure that the content is trimmed and percent-encoded sent +as POST data: + + --variable %HOME + --expand-variable fix@{{HOME}}/.secret + --expand-data "{{fix:trim:urlencode}}" + https://example.com/ + +Command line variables and expansions were added in in 8.3.0. .SH OUTPUT If not told otherwise, curl writes the received data to stdout. It can be instructed to instead save that data into a local file, using the --output or diff --git a/docs/cmdline-opts/variable.d b/docs/cmdline-opts/variable.d new file mode 100644 index 0000000000..27cd67aeb0 --- /dev/null +++ b/docs/cmdline-opts/variable.d @@ -0,0 +1,50 @@ +c: Copyright (C) Daniel Stenberg, , et al. +SPDX-License-Identifier: curl +Long: variable +Arg: <[%]name=text/@file> +Help: Set variable +Category: curl +Example: --variable name=smith $URL +Added: 8.3.0 +See-also: config +Multi: append +--- +Set a variable with "name=content" or "name@file" (where "file" can be stdin +if set to a single dash (-)). The name is a case sensitive identifier that +must consist of no other letters than a-z, A-Z, 0-9 or underscore. The +specified content is then associated with this identifier. + +The name must be unique within a command line invoke, setting the same +variable name again will be ignored. + +The contents of a variable can be referenced in a later command line option +when that option name is prefixed with "--expand-", and the name is used as +"{{name}}" (without the quotes). + +--variable can import environment variables into the name space. Opt to either +require the environment variable to be set or provide a default value for the +variable in case it is not already set. + +--variable %name imports the variable called 'name' but exits with an error if +that environment variable is not alreadty set. To provide a default value if +the environment variable is not set, use --variable %name=content or +--variable %name@content. Note that on some systems - but not all - +environment variables are case insensitive. + +When expanding variables, curl supports a set of functions that can make the +variable contents more convenient to use. You apply a function to a variable +expansion by adding a colon and then list the desired functions in a +comma-separted list that is evaluated in a left-to-right order. Variable +content holding null bytes that are not encoded when expanded, will cause +error. + +These are functions that can help you get the value inserted more +conveniently. + +"trim" removes all leading and trailing white space. + +"json" outputs the content using JSON string quoting rules. + +"url" shows the content URL (percent) encoded. + +"b64" expands the variable base64 encoded diff --git a/docs/options-in-versions b/docs/options-in-versions index 885d4c0917..8e6e17569a 100644 --- a/docs/options-in-versions +++ b/docs/options-in-versions @@ -261,6 +261,7 @@ --use-ascii (-B) 5.0 --user (-u) 4.0 --user-agent (-A) 4.5.1 +--variable 8.3.0 --verbose (-v) 4.0 --version (-V) 4.0 --write-out (-w) 6.5 diff --git a/lib/base64.c b/lib/base64.c index 9d495d4612..30db7e5889 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -32,13 +32,14 @@ !defined(CURL_DISABLE_POP3) || \ !defined(CURL_DISABLE_IMAP) || \ !defined(CURL_DISABLE_DOH) || defined(USE_SSL) - -#include "urldata.h" /* for the Curl_easy definition */ +#include "curl/curl.h" #include "warnless.h" #include "curl_base64.h" /* The last 2 #include files should be in this order */ +#ifdef BUILDING_LIBCURL #include "curl_memory.h" +#endif #include "memdebug.h" /* ---- Base64 Encoding/Decoding Table --- */ diff --git a/lib/curl_base64.h b/lib/curl_base64.h index 806d4431cf..7f7cd1d98a 100644 --- a/lib/curl_base64.h +++ b/lib/curl_base64.h @@ -24,11 +24,18 @@ * ***************************************************************************/ +#ifndef BUILDING_LIBCURL +/* this renames functions so that the tool code can use the same code + without getting symbol collisions */ +#define Curl_base64_encode(a,b,c,d) curlx_base64_encode(a,b,c,d) +#define Curl_base64url_encode(a,b,c,d) curlx_base64url_encode(a,b,c,d) +#define Curl_base64_decode(a,b,c) curlx_base64_decode(a,b,c) +#endif + CURLcode Curl_base64_encode(const char *inputbuff, size_t insize, char **outptr, size_t *outlen); CURLcode Curl_base64url_encode(const char *inputbuff, size_t insize, char **outptr, size_t *outlen); CURLcode Curl_base64_decode(const char *src, unsigned char **outptr, size_t *outlen); - #endif /* HEADER_CURL_BASE64_H */ diff --git a/projects/generate.bat b/projects/generate.bat index a9ee6d0f14..d57d4ebb91 100644 --- a/projects/generate.bat +++ b/projects/generate.bat @@ -217,6 +217,7 @@ rem call :element %1 lib "curl_multibyte.c" %3 call :element %1 lib "version_win32.c" %3 call :element %1 lib "dynbuf.c" %3 + call :element %1 lib "base64.c" %3 ) else if "!var!" == "CURL_SRC_X_H_FILES" ( call :element %1 lib "config-win32.h" %3 call :element %1 lib "curl_setup.h" %3 @@ -228,6 +229,7 @@ rem call :element %1 lib "curl_multibyte.h" %3 call :element %1 lib "version_win32.h" %3 call :element %1 lib "dynbuf.h" %3 + call :element %1 lib "curl_base64.h" %3 ) else if "!var!" == "CURL_LIB_C_FILES" ( for /f "delims=" %%c in ('dir /b ..\lib\*.c') do call :element %1 lib "%%c" %3 ) else if "!var!" == "CURL_LIB_H_FILES" ( diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 38abf3575c..3a0452b327 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -63,7 +63,7 @@ endif() # CURL_CFILES, CURLX_CFILES, CURL_HFILES come from Makefile.inc if(BUILD_STATIC_CURL) - set(CURLX_CFILES ../lib/dynbuf.c) + set(CURLX_CFILES ../lib/dynbuf.c ../lib/base64.c) endif() add_executable( diff --git a/src/Makefile.inc b/src/Makefile.inc index ec822c896d..d5c207e43a 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -32,13 +32,14 @@ # libcurl has sources that provide functions named curlx_* that aren't part of # the official API, but we re-use the code here to avoid duplication. CURLX_CFILES = \ + ../lib/base64.c \ + ../lib/curl_multibyte.c \ + ../lib/dynbuf.c \ + ../lib/nonblock.c \ ../lib/strtoofft.c \ ../lib/timediff.c \ - ../lib/nonblock.c \ - ../lib/warnless.c \ - ../lib/curl_multibyte.c \ ../lib/version_win32.c \ - ../lib/dynbuf.c + ../lib/warnless.c CURLX_HFILES = \ ../lib/curl_setup.h \ @@ -91,7 +92,8 @@ CURL_CFILES = \ tool_vms.c \ tool_writeout.c \ tool_writeout_json.c \ - tool_xattr.c + tool_xattr.c \ + var.c CURL_HFILES = \ slist_wc.h \ @@ -135,7 +137,8 @@ CURL_HFILES = \ tool_vms.h \ tool_writeout.h \ tool_writeout_json.h \ - tool_xattr.h + tool_xattr.h \ + var.h CURL_RCFILES = curl.rc diff --git a/src/tool_cfgable.h b/src/tool_cfgable.h index b35abaf7a7..ca7d1a78d4 100644 --- a/src/tool_cfgable.h +++ b/src/tool_cfgable.h @@ -26,6 +26,7 @@ #include "tool_setup.h" #include "tool_sdecls.h" #include "tool_urlglob.h" +#include "var.h" struct GlobalConfig; @@ -322,6 +323,7 @@ struct GlobalConfig { unsigned short parallel_max; /* MAX_PARALLEL is the maximum */ bool parallel_connect; char *help_category; /* The help category, if set */ + struct var *variables; struct OperationConfig *first; struct OperationConfig *current; struct OperationConfig *last; /* Always last in the struct */ diff --git a/src/tool_getparam.c b/src/tool_getparam.c index ac1a98cc7a..bf81fb8c7c 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -43,6 +43,7 @@ #include "tool_main.h" #include "dynbuf.h" #include "tool_stderr.h" +#include "var.h" #include "memdebug.h" /* keep this as LAST include */ @@ -50,17 +51,19 @@ # define USE_WATT32 #endif -#define GetStr(str,val) do { \ - if(*(str)) { \ - free(*(str)); \ - *(str) = NULL; \ - } \ - if((val)) { \ - *(str) = strdup((val)); \ - if(!(*(str))) \ - return PARAM_NO_MEM; \ - } \ -} while(0) +#define GetStr(str,val) do { \ + if(*(str)) { \ + free(*(str)); \ + *(str) = NULL; \ + } \ + if((val)) { \ + *(str) = strdup((val)); \ + if(!(*(str))) { \ + err = PARAM_NO_MEM; \ + goto error; \ + } \ + } \ + } while(0) struct LongShort { const char *letter; /* short name option */ @@ -354,6 +357,7 @@ static const struct LongShort aliases[]= { {"#", "progress-bar", ARG_BOOL}, {"#m", "progress-meter", ARG_BOOL}, {":", "next", ARG_NONE}, + {":a", "variable", ARG_STRING}, }; /* Split the argument of -E to 'certname' and 'passphrase' separated by colon. @@ -662,6 +666,8 @@ static ParameterError data_urlencode(struct GlobalConfig *global, *postp = postdata; *lenp = size; return PARAM_OK; +error: + return err; } static void sethttpver(struct GlobalConfig *global, @@ -692,9 +698,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ int hit = -1; bool longopt = FALSE; bool singleopt = FALSE; /* when true means '-o foo' used '-ofoo' */ - ParameterError err; + ParameterError err = PARAM_OK; bool toggle = TRUE; /* how to switch boolean options, on or off. Controlled by using --OPTION or --no-OPTION */ + bool nextalloc = FALSE; /* if nextarg is allocated */ static const char *redir_protos[] = { "http", "https", @@ -716,6 +723,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ size_t fnam = strlen(word); int numhits = 0; bool noflagged = FALSE; + bool expand = FALSE; if(!strncmp(word, "no-", 3)) { /* disable this option but ignore the "no-" part when looking for it */ @@ -723,6 +731,11 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ toggle = FALSE; noflagged = TRUE; } + else if(!strncmp(word, "expand-", 7)) { + /* variable expansions is to be done on the argument */ + word += 7; + expand = TRUE; + } for(j = 0; j < sizeof(aliases)/sizeof(aliases[0]); j++) { if(curl_strnequal(aliases[j].lname, word, fnam)) { @@ -740,14 +753,37 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ } if(numhits > 1) { /* this is at least the second match! */ - return PARAM_OPTION_AMBIGUOUS; + err = PARAM_OPTION_AMBIGUOUS; + goto error; } - if(hit < 0) { - return PARAM_OPTION_UNKNOWN; + else if(hit < 0) { + err = PARAM_OPTION_UNKNOWN; + goto error; } - if(noflagged && (aliases[hit].desc != ARG_BOOL)) + else if(noflagged && (aliases[hit].desc != ARG_BOOL)) { /* --no- prefixed an option that isn't boolean! */ - return PARAM_NO_NOT_BOOLEAN; + err = PARAM_NO_NOT_BOOLEAN; + goto error; + } + else if(expand) { + struct curlx_dynbuf nbuf; + bool replaced; + + if(aliases[hit].desc != ARG_STRING) { + /* --expand on an option that isn't a string */ + err = PARAM_EXPAND_ERROR; + goto error; + } + err = varexpand(global, nextarg, &nbuf, &replaced); + if(err) { + curlx_dyn_free(&nbuf); + goto error; + } + if(replaced) { + nextarg = curlx_dyn_ptr(&nbuf); + nextalloc = TRUE; + } + } } else { flag++; /* prefixed with one dash, pass it */ @@ -775,7 +811,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ } } if(hit < 0) { - return PARAM_OPTION_UNKNOWN; + err = PARAM_OPTION_UNKNOWN; + break; } } @@ -785,8 +822,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ nextarg = (char *)&parse[1]; /* this is the actual extra parameter */ singleopt = TRUE; /* don't loop anymore after this */ } - else if(!nextarg) - return PARAM_REQUIRES_PARAMETER; + else if(!nextarg) { + err = PARAM_REQUIRES_PARAMETER; + break; + } else { #ifdef HAVE_WRITABLE_ARGV clearthis = cleararg; @@ -801,21 +840,27 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ nextarg); } } - else if((aliases[hit].desc == ARG_NONE) && !toggle) - return PARAM_NO_PREFIX; + else if((aliases[hit].desc == ARG_NONE) && !toggle) { + err = PARAM_NO_PREFIX; + break; + } switch(letter) { case '*': /* options without a short option */ switch(subletter) { case '4': /* --dns-ipv4-addr */ - if(!curlinfo->ares_num) /* c-ares is needed for this */ - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!curlinfo->ares_num) { /* c-ares is needed for this */ + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } /* addr in dot notation */ GetStr(&config->dns_ipv4_addr, nextarg); break; case '6': /* --dns-ipv6-addr */ - if(!curlinfo->ares_num) /* c-ares is needed for this */ - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!curlinfo->ares_num) { /* c-ares is needed for this */ + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } /* addr in dot notation */ GetStr(&config->dns_ipv6_addr, nextarg); break; @@ -830,8 +875,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'c': /* connect-timeout */ err = secs2ms(&config->connecttimeout_ms, nextarg); - if(err) - return err; break; case 'C': /* doh-url */ GetStr(&config->doh_url, nextarg); @@ -844,9 +887,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'D': /* --dns-interface */ if(!curlinfo->ares_num) /* c-ares is needed for this */ - return PARAM_LIBCURL_DOESNT_SUPPORT; - /* interface name */ - GetStr(&config->dns_interface, nextarg); + err = PARAM_LIBCURL_DOESNT_SUPPORT; + else + /* interface name */ + GetStr(&config->dns_interface, nextarg); break; case 'e': /* --disable-epsv */ config->disable_epsv = toggle; @@ -859,9 +903,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'F': /* --dns-servers */ if(!curlinfo->ares_num) /* c-ares is needed for this */ - return PARAM_LIBCURL_DOESNT_SUPPORT; - /* IP addrs of DNS servers */ - GetStr(&config->dns_servers, nextarg); + err = PARAM_LIBCURL_DOESNT_SUPPORT; + else + /* IP addrs of DNS servers */ + GetStr(&config->dns_servers, nextarg); break; case 'g': /* --trace */ GetStr(&global->trace_dump, nextarg); @@ -885,10 +930,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'i': /* --limit-rate */ { curl_off_t value; - ParameterError pe = GetSizeParameter(global, nextarg, "rate", &value); - - if(pe != PARAM_OK) - return pe; + err = GetSizeParameter(global, nextarg, "rate", &value); + if(err) + break; config->recvpersecond = value; config->sendpersecond = value; } @@ -907,15 +951,20 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ long denominator; long numerator = 60*60*1000; /* default per hour */ size_t numlen = div ? (size_t)(div - nextarg) : strlen(nextarg); - if(numlen > sizeof(number)-1) - return PARAM_NUMBER_TOO_LARGE; + if(numlen > sizeof(number)-1) { + err = PARAM_NUMBER_TOO_LARGE; + break; + } strncpy(number, nextarg, numlen); number[numlen] = 0; err = str2unum(&denominator, number); if(err) - return err; - if(denominator < 1) - return PARAM_BAD_USE; + break; + + if(denominator < 1) { + err = PARAM_BAD_USE; + break; + } if(div) { char unit = div[1]; switch(unit) { @@ -932,7 +981,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; default: errorf(global, "unsupported --rate unit"); - return PARAM_BAD_USE; + err = PARAM_BAD_USE; + break; } } global->ms_per_transfer = numerator/denominator; @@ -940,8 +990,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'j': /* --compressed */ - if(toggle && !(feature_libz || feature_brotli || feature_zstd)) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(toggle && !(feature_libz || feature_brotli || feature_zstd)) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } config->encoding = toggle; break; @@ -961,8 +1013,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ config->authtype &= ~CURLAUTH_NEGOTIATE; else if(feature_spnego) config->authtype |= CURLAUTH_NEGOTIATE; - else - return PARAM_LIBCURL_DOESNT_SUPPORT; + else { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } break; case 'm': /* --ntlm */ @@ -970,8 +1024,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ config->authtype &= ~CURLAUTH_NTLM; else if(feature_ntlm) config->authtype |= CURLAUTH_NTLM; - else - return PARAM_LIBCURL_DOESNT_SUPPORT; + else { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } break; case 'M': /* --ntlm-wb */ @@ -979,8 +1035,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ config->authtype &= ~CURLAUTH_NTLM_WB; else if(feature_ntlm_wb) config->authtype |= CURLAUTH_NTLM_WB; - else - return PARAM_LIBCURL_DOESNT_SUPPORT; + else { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } break; case 'n': /* --basic for completeness */ @@ -1011,8 +1069,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'R': /* --create-file-mode */ err = oct2nummax(&config->create_file_mode, nextarg, 0777); - if(err) - return err; break; case 's': /* --max-redirs */ @@ -1020,14 +1076,16 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ special condition */ err = str2num(&config->maxredirs, nextarg); if(err) - return err; + break; if(config->maxredirs < -1) - return PARAM_BAD_NUMERIC; + err = PARAM_BAD_NUMERIC; break; case 't': /* --proxy-ntlm */ - if(!feature_ntlm) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!feature_ntlm) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } config->proxyntlm = toggle; break; @@ -1050,8 +1108,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'x': /* --krb */ /* kerberos level string */ - if(!feature_spnego) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!feature_spnego) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } GetStr(&config->krblevel, nextarg); break; case 'X': /* --haproxy-protocol */ @@ -1063,11 +1123,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'y': /* --max-filesize */ { curl_off_t value; - ParameterError pe = + err = GetSizeParameter(global, nextarg, "max-filesize", &value); - - if(pe != PARAM_OK) - return pe; + if(err) + break; config->max_filesize = value; } break; @@ -1103,8 +1162,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ /* there was no free node, create one! */ config->url_get = url = new_getout(config); - if(!url) - return PARAM_NO_MEM; + if(!url) { + err = PARAM_NO_MEM; + break; + } /* fill in the URL */ GetStr(&url->url, nextarg); @@ -1115,8 +1176,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case '$': /* more options without a short option */ switch(subletter) { case 'a': /* --ssl */ - if(toggle && !feature_ssl) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(toggle && !feature_ssl) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } config->ftp_ssl = toggle; if(config->ftp_ssl) warnf(global, @@ -1154,29 +1217,25 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'g': /* --retry */ err = str2unum(&config->req_retry, nextarg); - if(err) - return err; break; case 'V': /* --retry-connrefused */ config->retry_connrefused = toggle; break; case 'h': /* --retry-delay */ err = str2unummax(&config->retry_delay, nextarg, LONG_MAX/1000); - if(err) - return err; break; case 'i': /* --retry-max-time */ err = str2unummax(&config->retry_maxtime, nextarg, LONG_MAX/1000); - if(err) - return err; break; case '!': /* --retry-all-errors */ config->retry_all_errors = toggle; break; case 'k': /* --proxy-negotiate */ - if(!feature_spnego) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!feature_spnego) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } config->proxynegotiate = toggle; break; @@ -1220,17 +1279,21 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ rc = 0; err = str2unum(&config->localport, nextarg); - if(err || (config->localport > 65535)) - return PARAM_BAD_USE; + if(err || (config->localport > 65535)) { + err = PARAM_BAD_USE; + break; + } if(!rc) config->localportrange = 1; /* default number of ports to try */ else { err = str2unum(&config->localportrange, lrange); if(err || (config->localportrange > 65535)) - return PARAM_BAD_USE; - config->localportrange -= (config->localport-1); - if(config->localportrange < 1) - return PARAM_BAD_USE; + err = PARAM_BAD_USE; + else { + config->localportrange -= (config->localport-1); + if(config->localportrange < 1) + err = PARAM_BAD_USE; + } } break; } @@ -1238,16 +1301,20 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ GetStr(&config->ftp_alternative_to_user, nextarg); break; case 'v': /* --ssl-reqd */ - if(toggle && !feature_ssl) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(toggle && !feature_ssl) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } config->ftp_ssl_reqd = toggle; break; case 'w': /* --no-sessionid */ config->disable_sessionid = (!toggle)?TRUE:FALSE; break; case 'x': /* --ftp-ssl-control */ - if(toggle && !feature_ssl) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(toggle && !feature_ssl) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } config->ftp_ssl_control = toggle; break; case 'y': /* --ftp-ssl-ccc */ @@ -1263,7 +1330,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ #ifdef CURL_DISABLE_LIBCURL_OPTION warnf(global, "--libcurl option was disabled at build-time"); - return PARAM_OPTION_UNKNOWN; + err = PARAM_OPTION_UNKNOWN; + break; #else GetStr(&global->libcurl, nextarg); break; @@ -1279,8 +1347,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case '3': /* --keepalive-time */ err = str2unum(&config->alivetime, nextarg); - if(err) - return err; break; case '4': /* --post302 */ config->post302 = toggle; @@ -1302,8 +1368,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case '9': /* --tftp-blksize */ err = str2unum(&config->tftp_blksize, nextarg); - if(err) - return err; break; case 'A': /* --mail-from */ GetStr(&config->mail_from, nextarg); @@ -1311,8 +1375,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'B': /* --mail-rcpt */ /* append receiver to a list */ err = add2list(&config->mail_rcpt, nextarg); - if(err) - return err; break; case 'C': /* --ftp-pret */ config->ftp_pret = toggle; @@ -1320,18 +1382,17 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'D': /* --proto */ config->proto_present = TRUE; err = proto2num(config, built_in_protos, &config->proto_str, nextarg); - if(err) - return err; break; case 'E': /* --proto-redir */ config->proto_redir_present = TRUE; - if(proto2num(config, redir_protos, &config->proto_redir_str, nextarg)) - return PARAM_BAD_USE; + if(proto2num(config, redir_protos, &config->proto_redir_str, + nextarg)) { + err = PARAM_BAD_USE; + break; + } break; case 'F': /* --resolve */ err = add2list(&config->resolve, nextarg); - if(err) - return err; break; case 'G': /* --delegation LEVEL */ config->gssapi_delegation = delegation(config, nextarg); @@ -1341,7 +1402,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'J': /* --metalink */ errorf(global, "--metalink is disabled"); - return PARAM_BAD_USE; + err = PARAM_BAD_USE; + break; case '6': /* --sasl-authzid */ GetStr(&config->sasl_authzid, nextarg); break; @@ -1371,21 +1433,15 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'Q': /* --proto-default */ GetStr(&config->proto_default, nextarg); err = check_protocol(config->proto_default); - if(err) - return err; break; case 'R': /* --expect100-timeout */ err = secs2ms(&config->expect100timeout_ms, nextarg); - if(err) - return err; break; case 'S': /* --tftp-no-options */ config->tftp_no_options = toggle; break; case 'U': /* --connect-to */ err = add2list(&config->connect_to, nextarg); - if(err) - return err; break; case 'W': /* --abstract-unix-socket */ config->abstract_unix_socket = TRUE; @@ -1393,8 +1449,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'X': /* --tls-max */ err = str2tls_max(&config->ssl_version_max, nextarg); - if(err) - return err; break; case 'Y': /* --suppress-connect-headers */ config->suppress_connect_headers = toggle; @@ -1404,8 +1458,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case '~': /* --happy-eyeballs-timeout-ms */ err = str2unum(&config->happy_eyeballs_timeout_ms, nextarg); - if(err) - return err; /* 0 is a valid value for this timeout */ break; case '%': /* --trace-ids */ @@ -1424,8 +1476,16 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; } break; - case ':': /* --next */ - return PARAM_NEXT_OPERATION; + case ':': + switch(subletter) { + case 'a': /* --variable */ + err = setvariable(global, nextarg); + break; + default: /* --next */ + err = PARAM_NEXT_OPERATION; + break; + } + break; case '0': /* --http* options */ switch(subletter) { case '\0': @@ -1450,14 +1510,18 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case '4': /* --http3 */ /* Try HTTP/3, allow fallback */ - if(!feature_http3) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!feature_http3) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } sethttpver(global, config, CURL_HTTP_VERSION_3); break; case '5': /* --http3-only */ /* Try HTTP/3 without fallback */ - if(!feature_http3) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!feature_http3) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } sethttpver(global, config, CURL_HTTP_VERSION_3ONLY); break; case '9': @@ -1530,13 +1594,15 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ switch(subletter) { case 'a': /* --alt-svc */ if(!feature_altsvc) - return PARAM_LIBCURL_DOESNT_SUPPORT; - GetStr(&config->altsvc, nextarg); + err = PARAM_LIBCURL_DOESNT_SUPPORT; + else + GetStr(&config->altsvc, nextarg); break; case 'b': /* --hsts */ if(!feature_hsts) - return PARAM_LIBCURL_DOESNT_SUPPORT; - GetStr(&config->hsts, nextarg); + err = PARAM_LIBCURL_DOESNT_SUPPORT; + else + GetStr(&config->hsts, nextarg); break; default: /* --cookie string coming up: */ if(nextarg[0] == '@') { @@ -1545,14 +1611,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ else if(strchr(nextarg, '=')) { /* A cookie string must have a =-letter */ err = add2list(&config->cookies, nextarg); - if(err) - return err; break; } /* We have a cookie file to read from! */ err = add2list(&config->cookiefiles, nextarg); - if(err) - return err; } break; case 'B': @@ -1568,7 +1630,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ if(strcmp(nextarg, "-")) { err = str2offset(&config->resume_from, nextarg); if(err) - return err; + break; config->resume_from_current = FALSE; } else { @@ -1594,21 +1656,25 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ if(*nextarg == '+') { /* use without encoding */ query = strdup(&nextarg[1]); - if(!query) - return PARAM_NO_MEM; + if(!query) { + err = PARAM_NO_MEM; + break; + } } else { err = data_urlencode(global, nextarg, &query, &size); if(err) - return err; + break; } if(config->query) { CURLcode result = curlx_dyn_addf(&dyn, "%s&%s", config->query, query); free(query); - if(result) - return PARAM_NO_MEM; + if(result) { + err = PARAM_NO_MEM; + break; + } free(config->query); config->query = curlx_dyn_ptr(&dyn); } @@ -1620,7 +1686,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ else if(subletter == 'e') { /* --data-urlencode */ err = data_urlencode(global, nextarg, &postdata, &size); if(err) - return err; + break; } else if('@' == *nextarg && !raw_mode) { /* the data begins with a '@' letter, it means that a file name @@ -1652,14 +1718,16 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ if(file && (file != stdin)) fclose(file); if(err) - return err; + break; if(!postdata) { /* no data from the file, point to a zero byte string to make this get sent as a POST anyway */ postdata = strdup(""); - if(!postdata) - return PARAM_NO_MEM; + if(!postdata) { + err = PARAM_NO_MEM; + break; + } } } else { @@ -1680,7 +1748,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ if(!config->postfields) { Curl_safefree(oldpost); Curl_safefree(postdata); - return PARAM_NO_MEM; + err = PARAM_NO_MEM; + break; } memcpy(config->postfields, oldpost, (size_t)oldlen); if(subletter != 'f') { @@ -1763,8 +1832,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'f': /* crypto engine */ GetStr(&config->engine, nextarg); - if(config->engine && curl_strequal(config->engine, "list")) - return PARAM_ENGINES_REQUESTED; + if(config->engine && curl_strequal(config->engine, "list")) { + err = PARAM_ENGINES_REQUESTED; + break; + } break; case 'g': /* CA cert directory */ GetStr(&config->capath, nextarg); @@ -1774,8 +1845,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; case 'i': /* --hostpubmd5 md5 of the host public key */ GetStr(&config->hostpubmd5, nextarg); - if(!config->hostpubmd5 || strlen(config->hostpubmd5) != 32) - return PARAM_BAD_USE; + if(!config->hostpubmd5 || strlen(config->hostpubmd5) != 32) { + err = PARAM_BAD_USE; + break; + } break; case 'F': /* --hostpubsha256 sha256 of the host public key */ GetStr(&config->hostpubsha256, nextarg); @@ -1786,7 +1859,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'k': /* TLS username */ if(!feature_tls_srp) { cleanarg(clearthis); - return PARAM_LIBCURL_DOESNT_SUPPORT; + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; } GetStr(&config->tls_username, nextarg); cleanarg(clearthis); @@ -1794,17 +1868,22 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'l': /* TLS password */ if(!feature_tls_srp) { cleanarg(clearthis); - return PARAM_LIBCURL_DOESNT_SUPPORT; + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; } GetStr(&config->tls_password, nextarg); cleanarg(clearthis); break; case 'm': /* TLS authentication type */ - if(!feature_tls_srp) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!feature_tls_srp) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } GetStr(&config->tls_authtype, nextarg); - if(!curl_strequal(config->tls_authtype, "SRP")) - return PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */ + if(!curl_strequal(config->tls_authtype, "SRP")) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */ + break; + } break; case 'n': /* no empty SSL fragments, --ssl-allow-beast */ if(feature_ssl) @@ -1857,24 +1936,32 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'u': /* TLS username for proxy */ cleanarg(clearthis); - if(!feature_tls_srp) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!feature_tls_srp) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } GetStr(&config->proxy_tls_username, nextarg); break; case 'v': /* TLS password for proxy */ cleanarg(clearthis); - if(!feature_tls_srp) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!feature_tls_srp) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } GetStr(&config->proxy_tls_password, nextarg); break; case 'w': /* TLS authentication type for proxy */ - if(!feature_tls_srp) - return PARAM_LIBCURL_DOESNT_SUPPORT; + if(!feature_tls_srp) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; + break; + } GetStr(&config->proxy_tls_authtype, nextarg); - if(!curl_strequal(config->proxy_tls_authtype, "SRP")) - return PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */ + if(!curl_strequal(config->proxy_tls_authtype, "SRP")) { + err = PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */ + break; + } break; case 'x': /* certificate file for proxy */ @@ -1963,7 +2050,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ break; default: /* unknown flag */ - return PARAM_OPTION_UNKNOWN; + err = PARAM_OPTION_UNKNOWN; + break; } break; case 'f': @@ -1990,7 +2078,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ if(config->failonerror && config->failwithbody) { errorf(config->global, "You must select either --fail or " "--fail-with-body, not both."); - return PARAM_BAD_USE; + err = PARAM_BAD_USE; + break; } break; case 'F': @@ -2000,10 +2089,15 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ nextarg, &config->mimeroot, &config->mimecurrent, - (subletter == 's')?TRUE:FALSE)) /* 's' is literal string */ - return PARAM_BAD_USE; - if(SetHTTPrequest(config, HTTPREQ_MIMEPOST, &config->httpreq)) - return PARAM_BAD_USE; + (subletter == 's')?TRUE:FALSE)) { /* 's' is literal + string */ + err = PARAM_BAD_USE; + break; + } + if(SetHTTPrequest(config, HTTPREQ_MIMEPOST, &config->httpreq)) { + err = PARAM_BAD_USE; + break; + } break; case 'g': /* g disables URLglobbing */ @@ -2022,10 +2116,13 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ if(toggle) { if(nextarg) { global->help_category = strdup(nextarg); - if(!global->help_category) - return PARAM_NO_MEM; + if(!global->help_category) { + err = PARAM_NO_MEM; + break; + } } - return PARAM_HELP_REQUESTED; + err = PARAM_HELP_REQUESTED; + break; } /* we now actually support --no-help too! */ break; @@ -2059,7 +2156,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ if(!use_stdin) fclose(file); if(err) - return err; + break; } } else { @@ -2067,8 +2164,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ err = add2list(&config->proxyheaders, nextarg); else err = add2list(&config->headers, nextarg); - if(err) - return err; } break; case 'i': @@ -2083,8 +2178,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ config->show_headers = toggle; if(SetHTTPrequest(config, (config->no_body)?HTTPREQ_HEAD:HTTPREQ_GET, - &config->httpreq)) - return PARAM_BAD_USE; + &config->httpreq)) { + err = PARAM_BAD_USE; + break; + } break; case 'J': /* --remote-header-name */ config->content_disposition = toggle; @@ -2098,7 +2195,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'K': /* parse config file */ if(parseconfig(nextarg, global)) { errorf(global, "cannot read config from '%s'", nextarg); - return PARAM_READ_ERROR; + err = PARAM_READ_ERROR; + break; } break; case 'l': @@ -2117,8 +2215,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 'm': /* specified max time */ err = secs2ms(&config->timeout_ms, nextarg); - if(err) - return err; break; case 'M': /* M for manual, huge help */ if(toggle) { /* --no-manual shows no manual... */ @@ -2126,7 +2222,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ warnf(global, "built-in manual was disabled at build-time"); #endif - return PARAM_MANUAL_REQUESTED; + err = PARAM_MANUAL_REQUESTED; + break; } break; case 'n': @@ -2188,14 +2285,17 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ config->url_out = url = new_getout(config); } - if(!url) - return PARAM_NO_MEM; + if(!url) { + err = PARAM_NO_MEM; + break; + } /* fill in the outfile */ if('o' == letter) { if(!*nextarg) { warnf(global, "output file name has no length"); - return PARAM_BAD_USE; + err = PARAM_BAD_USE; + break; } GetStr(&url->outfile, nextarg); url->flags &= ~GETOUT_USEREMOTE; /* switch off */ @@ -2243,8 +2343,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ err = add2list(&config->quote, nextarg); break; } - if(err) - return err; break; case 'r': /* Specifying a range WITHOUT A DASH will create an illegal HTTP range @@ -2256,7 +2354,8 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ curl_off_t off; if(curlx_strtoofft(nextarg, NULL, 10, &off)) { warnf(global, "unsupported range point"); - return PARAM_BAD_USE; + err = PARAM_BAD_USE; + break; } warnf(global, "A specified range MUST include at least one dash (-). " @@ -2264,8 +2363,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-", off); Curl_safefree(config->range); config->range = strdup(buffer); - if(!config->range) - return PARAM_NO_MEM; + if(!config->range) { + err = PARAM_NO_MEM; + break; + } } else { /* byte range requested */ @@ -2296,8 +2397,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ case 't': /* Telnet options */ err = add2list(&config->telnet_options, nextarg); - if(err) - return err; break; case 'T': /* we are uploading */ @@ -2321,8 +2420,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ /* there was no free node, create one! */ config->url_ul = url = new_getout(config); - if(!url) - return PARAM_NO_MEM; + if(!url) { + err = PARAM_NO_MEM; + break; + } url->flags |= GETOUT_UPLOAD; /* mark -T used */ if(!*nextarg) @@ -2348,8 +2449,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ /* the '%' thing here will cause the trace get sent to stderr */ Curl_safefree(global->trace_dump); global->trace_dump = strdup("%"); - if(!global->trace_dump) - return PARAM_NO_MEM; + if(!global->trace_dump) { + err = PARAM_NO_MEM; + break; + } if(global->tracetype && (global->tracetype != TRACE_PLAIN)) warnf(global, "-v, --verbose overrides an earlier trace/verbose option"); @@ -2360,8 +2463,10 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ global->tracetype = TRACE_NONE; break; case 'V': - if(toggle) /* --no-version yields no output! */ - return PARAM_VERSION_INFO_REQUESTED; + if(toggle) { /* --no-version yields no output! */ + err = PARAM_VERSION_INFO_REQUESTED; + break; + } break; case 'w': @@ -2385,7 +2490,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ if(file && (file != stdin)) fclose(file); if(err) - return err; + break; if(!config->writeout) warnf(global, "Failed to read %s", fname); } @@ -2413,7 +2518,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ /* low speed time */ err = str2unum(&config->low_speed_time, nextarg); if(err) - return err; + break; if(!config->low_speed_limit) config->low_speed_limit = 1; break; @@ -2421,7 +2526,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ /* low speed limit */ err = str2unum(&config->low_speed_limit, nextarg); if(err) - return err; + break; if(!config->low_speed_time) config->low_speed_time = 30; break; @@ -2434,7 +2539,7 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ long val; err = str2unum(&val, nextarg); if(err) - return err; + break; if(val > MAX_PARALLEL) global->parallel_max = MAX_PARALLEL; else if(val < 1) @@ -2488,13 +2593,17 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */ } break; default: /* unknown flag */ - return PARAM_OPTION_UNKNOWN; + err = PARAM_OPTION_UNKNOWN; + break; } hit = -1; - } while(!longopt && !singleopt && *++parse && !*usedarg); + } while(!longopt && !singleopt && *++parse && !*usedarg && !err); - return PARAM_OK; +error: + if(nextalloc) + free(nextarg); + return err; } ParameterError parse_args(struct GlobalConfig *global, int argc, diff --git a/src/tool_getparam.h b/src/tool_getparam.h index 827a04e81a..a8a9d45975 100644 --- a/src/tool_getparam.h +++ b/src/tool_getparam.h @@ -48,6 +48,7 @@ typedef enum { PARAM_CONTDISP_SHOW_HEADER, /* --include and --remote-header-name */ PARAM_CONTDISP_RESUME_FROM, /* --continue-at and --remote-header-name */ PARAM_READ_ERROR, + PARAM_EXPAND_ERROR, /* --expand problem */ PARAM_LAST } ParameterError; diff --git a/src/tool_helpers.c b/src/tool_helpers.c index 1e36f0613a..854bf777a0 100644 --- a/src/tool_helpers.c +++ b/src/tool_helpers.c @@ -76,6 +76,8 @@ const char *param2text(int res) return "--continue-at and --remote-header-name cannot be combined"; case PARAM_READ_ERROR: return "error encountered when reading a file"; + case PARAM_EXPAND_ERROR: + return "variable expansion failure"; default: return "unknown error"; } diff --git a/src/tool_listhelp.c b/src/tool_listhelp.c index b1eaf60eb6..f541c22b35 100644 --- a/src/tool_listhelp.c +++ b/src/tool_listhelp.c @@ -246,12 +246,12 @@ const struct helptxt helptext[] = { {" --happy-eyeballs-timeout-ms ", "Time for IPv6 before trying IPv4", CURLHELP_CONNECTION}, + {" --haproxy-clientip", + "Sets client IP in HAProxy PROXY protocol v1 header", + CURLHELP_HTTP | CURLHELP_PROXY}, {" --haproxy-protocol", "Send HAProxy PROXY protocol v1 header", CURLHELP_HTTP | CURLHELP_PROXY}, - {" --haproxy-clientip", - "Sets the HAProxy PROXY protocol v1 client IP", - CURLHELP_HTTP | CURLHELP_PROXY}, {"-I, --head", "Show document info only", CURLHELP_HTTP | CURLHELP_FTP | CURLHELP_FILE}, @@ -760,7 +760,7 @@ const struct helptxt helptext[] = { "Like --trace, but without hex output", CURLHELP_VERBOSE}, {" --trace-ids", - "Add transfer/connection identifiers to trace/verbose output", + "Add transfer and connection identifiers to trace/verbose output", CURLHELP_VERBOSE}, {" --trace-time", "Add time stamps to trace/verbose output", @@ -786,6 +786,9 @@ const struct helptxt helptext[] = { {"-A, --user-agent ", "Send User-Agent to server", CURLHELP_IMPORTANT | CURLHELP_HTTP}, + {" --variable ", + "Set variable", + CURLHELP_CURL}, {"-v, --verbose", "Make the operation more talkative", CURLHELP_IMPORTANT | CURLHELP_VERBOSE}, diff --git a/src/tool_operate.c b/src/tool_operate.c index 2745ceaba3..c93888b18d 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -2756,36 +2756,39 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[]) /* Cleanup the libcurl source output */ easysrc_cleanup(); } - return CURLE_OUT_OF_MEMORY; + result = CURLE_OUT_OF_MEMORY; } - curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE); - curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS); - curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION); - curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_CONNECT); - curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_PSL); - curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_HSTS); + if(!result) { + curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE); + curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS); + curl_share_setopt(share, CURLSHOPT_SHARE, + CURL_LOCK_DATA_SSL_SESSION); + curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_CONNECT); + curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_PSL); + curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_HSTS); - /* Get the required arguments for each operation */ - do { - result = get_args(operation, count++); + /* Get the required arguments for each operation */ + do { + result = get_args(operation, count++); - operation = operation->next; - } while(!result && operation); + operation = operation->next; + } while(!result && operation); - /* Set the current operation pointer */ - global->current = global->first; + /* Set the current operation pointer */ + global->current = global->first; - /* now run! */ - result = run_all_transfers(global, share, result); + /* now run! */ + result = run_all_transfers(global, share, result); - curl_share_cleanup(share); - if(global->libcurl) { - /* Cleanup the libcurl source output */ - easysrc_cleanup(); + curl_share_cleanup(share); + if(global->libcurl) { + /* Cleanup the libcurl source output */ + easysrc_cleanup(); - /* Dump the libcurl code if previously enabled */ - dumpeasysrc(global); + /* Dump the libcurl code if previously enabled */ + dumpeasysrc(global); + } } } else @@ -2793,5 +2796,7 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[]) } } + varcleanup(global); + return result; } diff --git a/src/tool_writeout_json.c b/src/tool_writeout_json.c index 0e4623fe86..7bc74a2697 100644 --- a/src/tool_writeout_json.c +++ b/src/tool_writeout_json.c @@ -31,50 +31,73 @@ #include "tool_writeout_json.h" #include "tool_writeout.h" -void jsonWriteString(FILE *stream, const char *in, bool lowercase) +#define MAX_JSON_STRING 100000 + +/* provide the given string in dynbuf as a quoted json string, but without the + outer quotes. The buffer is not inited by this function. + + Return 0 on success, non-zero on error. +*/ +int jsonquoted(const char *in, size_t len, + struct curlx_dynbuf *out, bool lowercase) { const char *i = in; - const char *in_end = in + strlen(in); + const char *in_end = &in[len]; + CURLcode result = CURLE_OK; - fputc('\"', stream); - for(; i < in_end; i++) { + for(; (i < in_end) && !result; i++) { switch(*i) { case '\\': - fputs("\\\\", stream); + result = curlx_dyn_addn(out, "\\\\", 2); break; case '\"': - fputs("\\\"", stream); + result = curlx_dyn_addn(out, "\\\"", 2); break; case '\b': - fputs("\\b", stream); + result = curlx_dyn_addn(out, "\\b", 2); break; case '\f': - fputs("\\f", stream); + result = curlx_dyn_addn(out, "\\f", 2); break; case '\n': - fputs("\\n", stream); + result = curlx_dyn_addn(out, "\\n", 2); break; case '\r': - fputs("\\r", stream); + result = curlx_dyn_addn(out, "\\r", 2); break; case '\t': - fputs("\\t", stream); + result = curlx_dyn_addn(out, "\\t", 2); break; default: - if(*i < 32) { - fprintf(stream, "\\u%04x", *i); - } + if(*i < 32) + result = curlx_dyn_addf(out, "\\u%04x", *i); else { - char out = *i; - if(lowercase && (out >= 'A' && out <= 'Z')) + char o = *i; + if(lowercase && (o >= 'A' && o <= 'Z')) /* do not use tolower() since that's locale specific */ - out |= ('a' - 'A'); - fputc(out, stream); + o |= ('a' - 'A'); + result = curlx_dyn_addn(out, &o, 1); } break; } } - fputc('\"', stream); + if(result) + return (int)result; + return 0; +} + +void jsonWriteString(FILE *stream, const char *in, bool lowercase) +{ + struct curlx_dynbuf out; + curlx_dyn_init(&out, MAX_JSON_STRING); + + if(!jsonquoted(in, strlen(in), &out, lowercase)) { + fputc('\"', stream); + if(curlx_dyn_len(&out)) + fputs(curlx_dyn_ptr(&out), stream); + fputc('\"', stream); + } + curlx_dyn_free(&out); } void ourWriteOutJSON(FILE *stream, const struct writeoutvar mappings[], diff --git a/src/tool_writeout_json.h b/src/tool_writeout_json.h index 6d8f8d0dc0..49a28194ff 100644 --- a/src/tool_writeout_json.h +++ b/src/tool_writeout_json.h @@ -26,6 +26,9 @@ #include "tool_setup.h" #include "tool_writeout.h" +int jsonquoted(const char *in, size_t len, + struct curlx_dynbuf *out, bool lowercase); + void ourWriteOutJSON(FILE *stream, const struct writeoutvar mappings[], struct per_transfer *per, CURLcode per_result); void headerJSON(FILE *stream, struct per_transfer *per); diff --git a/src/var.c b/src/var.c new file mode 100644 index 0000000000..70e864cf60 --- /dev/null +++ b/src/var.c @@ -0,0 +1,462 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) Daniel Stenberg, , 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 "tool_setup.h" + +#define ENABLE_CURLX_PRINTF +/* use our own printf() functions */ +#include "curlx.h" + +#include "tool_cfgable.h" +#include "tool_getparam.h" +#include "tool_helpers.h" +#include "tool_findfile.h" +#include "tool_msgs.h" +#include "tool_parsecfg.h" +#include "dynbuf.h" +#include "curl_base64.h" +#include "tool_paramhlp.h" +#include "tool_writeout_json.h" +#include "var.h" + +#include "memdebug.h" /* keep this as LAST include */ + +#define MAX_EXPAND_CONTENT 10000000 + +static char *Memdup(const char *data, size_t len) +{ + char *p = malloc(len + 1); + if(!p) + return NULL; + if(len) + memcpy(p, data, len); + p[len] = 0; + return p; +} + +/* free everything */ +void varcleanup(struct GlobalConfig *global) +{ + struct var *list = global->variables; + while(list) { + struct var *t = list; + list = list->next; + free((char *)t->content); + free((char *)t->name); + free(t); + } +} + +static const struct var *varcontent(struct GlobalConfig *global, + const char *name, size_t nlen) +{ + struct var *list = global->variables; + while(list) { + if((strlen(list->name) == nlen) && + !strncmp(name, list->name, nlen)) { + return list; + } + list = list->next; + } + return NULL; +} + +#define ENDOFFUNC(x) (((x) == '}') || ((x) == ':')) +#define FUNCMATCH(ptr,name,len) \ + (!strncmp(ptr, name, len) && ENDOFFUNC(ptr[len])) + +#define FUNC_TRIM "trim" +#define FUNC_TRIM_LEN (sizeof(FUNC_TRIM) - 1) +#define FUNC_JSON "json" +#define FUNC_JSON_LEN (sizeof(FUNC_JSON) - 1) +#define FUNC_URL "url" +#define FUNC_URL_LEN (sizeof(FUNC_URL) - 1) +#define FUNC_B64 "b64" +#define FUNC_B64_LEN (sizeof(FUNC_B64) - 1) + +static ParameterError varfunc(struct GlobalConfig *global, + char *c, /* content */ + size_t clen, /* content length */ + char *f, /* functions */ + size_t flen, /* function string length */ + struct curlx_dynbuf *out) +{ + bool alloc = FALSE; + ParameterError err = PARAM_OK; + const char *finput = f; + + /* The functions are independent and runs left to right */ + while(*f && !err) { + if(*f == '}') + /* end of functions */ + break; + /* On entry, this is known to be a colon already. In subsequent laps, it + is also known to be a colon since that is part of the FUNCMATCH() + checks */ + f++; + if(FUNCMATCH(f, FUNC_TRIM, FUNC_TRIM_LEN)) { + size_t len = clen; + f += FUNC_TRIM_LEN; + if(clen) { + /* skip leading white space, including CRLF */ + while(*c && ISSPACE(*c)) { + c++; + len--; + } + while(len && ISSPACE(c[len-1])) + len--; + } + /* put it in the output */ + curlx_dyn_reset(out); + if(curlx_dyn_addn(out, c, len)) { + err = PARAM_NO_MEM; + break; + } + } + else if(FUNCMATCH(f, FUNC_JSON, FUNC_JSON_LEN)) { + f += FUNC_JSON_LEN; + curlx_dyn_reset(out); + if(clen) { + if(jsonquoted(c, clen, out, FALSE)) { + err = PARAM_NO_MEM; + break; + } + } + } + else if(FUNCMATCH(f, FUNC_URL, FUNC_URL_LEN)) { + f += FUNC_URL_LEN; + curlx_dyn_reset(out); + if(clen) { + char *enc = curl_easy_escape(NULL, c, (int)clen); + if(!enc) { + err = PARAM_NO_MEM; + break; + } + + /* put it in the output */ + if(curlx_dyn_add(out, enc)) { + err = PARAM_NO_MEM; + break; + } + curl_free(enc); + } + } + else if(FUNCMATCH(f, FUNC_B64, FUNC_B64_LEN)) { + f += FUNC_B64_LEN; + curlx_dyn_reset(out); + if(clen) { + char *enc; + size_t elen; + CURLcode result = curlx_base64_encode(c, clen, &enc, &elen); + if(result) { + err = PARAM_NO_MEM; + break; + } + + /* put it in the output */ + if(curlx_dyn_addn(out, enc, elen)) + err = PARAM_NO_MEM; + curl_free(enc); + if(err) + break; + } + } + else { + /* unsupported function */ + errorf(global, "unknown variable function in '%.*s'", + (int)flen, finput); + err = PARAM_EXPAND_ERROR; + break; + } + if(alloc) + free(c); + + clen = curlx_dyn_len(out); + c = Memdup(curlx_dyn_ptr(out), clen); + if(!c) { + err = PARAM_NO_MEM; + break; + } + alloc = TRUE; + } + if(alloc) + free(c); + if(err) + curlx_dyn_free(out); + return err; +} + +ParameterError varexpand(struct GlobalConfig *global, + const char *line, struct curlx_dynbuf *out, + bool *replaced) +{ + CURLcode result; + char *envp; + bool added = FALSE; + const char *input = line; + *replaced = FALSE; + curlx_dyn_init(out, MAX_EXPAND_CONTENT); + do { + envp = strstr(line, "{{"); + if((envp > line) && envp[-1] == '\\') { + /* preceding backslash, we want this verbatim */ + + /* insert the text up to this point, minus the backslash */ + result = curlx_dyn_addn(out, line, envp - line - 1); + if(result) + return PARAM_NO_MEM; + + /* output '{{' then continue from here */ + result = curlx_dyn_addn(out, "{{", 2); + if(result) + return PARAM_NO_MEM; + line = &envp[2]; + } + else if(envp) { + char name[128]; + size_t nlen; + size_t i; + char *funcp; + char *clp = strstr(envp, "}}"); + size_t prefix; + + if(!clp) { + /* uneven braces */ + warnf(global, "missing close '}}' in '%s'", input); + break; + } + + prefix = 2; + envp += 2; /* move over the {{ */ + + /* if there is a function, it ends the name with a colon */ + funcp = memchr(envp, ':', clp - envp); + if(funcp) + nlen = funcp - envp; + else + nlen = clp - envp; + if(!nlen || (nlen >= sizeof(name))) { + warnf(global, "bad variable name length '%s'", input); + /* insert the text as-is since this is not an env variable */ + result = curlx_dyn_addn(out, line, clp - line + prefix); + if(result) + return PARAM_NO_MEM; + } + else { + /* insert the text up to this point */ + result = curlx_dyn_addn(out, line, envp - prefix - line); + if(result) + return PARAM_NO_MEM; + + /* copy the name to separate buffer */ + memcpy(name, envp, nlen); + name[nlen] = 0; + + /* verify that the name looks sensible */ + for(i = 0; (i < nlen) && + (ISALNUM(name[i]) || (name[i] == '_')); i++); + if(i != nlen) { + warnf(global, "bad variable name: %s", name); + /* insert the text as-is since this is not an env variable */ + result = curlx_dyn_addn(out, envp - prefix, + clp - envp + prefix + 2); + if(result) + return PARAM_NO_MEM; + } + else { + char *value; + size_t vlen = 0; + struct curlx_dynbuf buf; + const struct var *v = varcontent(global, name, nlen); + if(v) { + value = (char *)v->content; + vlen = v->clen; + } + else + value = NULL; + + curlx_dyn_init(&buf, MAX_EXPAND_CONTENT); + if(funcp) { + /* apply the list of functions on the value */ + size_t flen = clp - funcp; + ParameterError err = varfunc(global, value, vlen, funcp, flen, + &buf); + if(err) + return err; + value = curlx_dyn_ptr(&buf); + vlen = curlx_dyn_len(&buf); + } + + if(value && *value) { + /* A variable might contain null bytes. Such bytes cannot be shown + using normal means, this is an error. */ + char *nb = memchr(value, '\0', vlen); + if(nb) { + errorf(global, "variable contains null byte"); + return PARAM_EXPAND_ERROR; + } + } + /* insert the value */ + result = curlx_dyn_addn(out, value, vlen); + curlx_dyn_free(&buf); + if(result) + return PARAM_NO_MEM; + + added = true; + } + } + line = &clp[2]; + } + + } while(envp); + if(added && *line) { + /* add the "suffix" as well */ + result = curlx_dyn_add(out, line); + if(result) + return PARAM_NO_MEM; + } + *replaced = added; + if(!added) + curlx_dyn_free(out); + return PARAM_OK; +} + +/* + * Created in a way that is not revealing how variables is actually stored so + * that we can improve this if we want better performance when managing many + * at a later point. + */ +static ParameterError addvariable(struct GlobalConfig *global, + const char *name, + size_t nlen, + const char *content, + size_t clen, + bool contalloc) +{ + struct var *p; + const struct var *check = varcontent(global, name, nlen); + if(check) + notef(global, "Overwriting variable '%s'", check->name); + + p = calloc(sizeof(struct var), 1); + if(!p) + return PARAM_NO_MEM; + + p->name = Memdup(name, nlen); + if(!p->name) + goto err; + + p->content = contalloc ? content: Memdup(content, clen); + if(!p->content) + goto err; + p->clen = clen; + + p->next = global->variables; + global->variables = p; + return PARAM_OK; +err: + free((char *)p->content); + free((char *)p->name); + free(p); + return PARAM_NO_MEM; +} + +ParameterError setvariable(struct GlobalConfig *global, + const char *input) +{ + const char *name; + size_t nlen; + char *content = NULL; + size_t clen = 0; + bool contalloc = FALSE; + const char *line = input; + ParameterError err = PARAM_OK; + bool import = FALSE; + char *ge = NULL; + + if(*input == '%') { + import = TRUE; + line++; + } + name = line; + while(*line && (ISALNUM(*line) || (*line == '_'))) + line++; + nlen = line - name; + if(!nlen || (nlen > 128)) { + warnf(global, "Bad variable name length (%zd), skipping", nlen); + return PARAM_OK; + } + if(import) { + ge = curl_getenv(name); + if(!*line && !ge) { + /* no assign, no variable, fail */ + errorf(global, "Variable '%s' import fail, not set", name); + return PARAM_EXPAND_ERROR; + } + else if(ge) { + /* there is a value to use */ + content = ge; + clen = strlen(ge); + } + } + if(content) + ; + else if(*line == '@') { + /* read from file or stdin */ + FILE *file; + bool use_stdin; + line++; + use_stdin = !strcmp(line, "-"); + if(use_stdin) + file = stdin; + else { + file = fopen(line, "rb"); + } + if(file) { + err = file2memory(&content, &clen, file); + /* in case of out of memory, this should fail the entire operation */ + contalloc = TRUE; + } + if(!use_stdin) + fclose(file); + if(err) + return err; + } + else if(*line == '=') { + line++; + /* this is the exact content */ + content = (char *)line; + clen = strlen(line); + } + else { + warnf(global, "Bad --variable syntax, skipping: %s", input); + return PARAM_OK; + } + err = addvariable(global, name, nlen, content, clen, contalloc); + if(err) { + if(contalloc) + free(content); + } + curl_free(ge); + return err; +} diff --git a/src/var.h b/src/var.h new file mode 100644 index 0000000000..9212494594 --- /dev/null +++ b/src/var.h @@ -0,0 +1,48 @@ +#ifndef HEADER_CURL_VAR_H +#define HEADER_CURL_VAR_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) Daniel Stenberg, , 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 "tool_getparam.h" +#include "dynbuf.h" + +struct var { + struct var *next; + const char *name; + const char *content; + size_t clen; /* content length */ +}; + +struct GlobalConfig; + +ParameterError setvariable(struct GlobalConfig *global, const char *input); +ParameterError varexpand(struct GlobalConfig *global, + const char *line, struct curlx_dynbuf *out, + bool *replaced); + +/* free everything */ +void varcleanup(struct GlobalConfig *global); + +#endif /* HEADER_CURL_VAR_H */ + diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index a253b5c6ee..6dab156c0e 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -69,10 +69,11 @@ test390 test391 test392 test393 test394 test395 test396 test397 test398 \ test399 test400 test401 test402 test403 test404 test405 test406 test407 \ test408 test409 test410 test411 test412 test413 test414 test415 test416 \ test417 test418 test419 test420 test421 test422 test423 test424 test425 \ -test426 test427 \ -test430 test431 test432 test433 test434 test435 test436 \ +test426 test427 test428 test429 test430 test431 test432 test433 test434 \ +test435 test436 \ \ -test440 test441 test442 test443 test444 test445 test446 test447 \ +test440 test441 test442 test443 test444 test445 test446 test447 test448 \ +test449 test450 test451 test452 test453 test454 test455 \ \ test490 test491 test492 test493 test494 test495 test496 \ \ diff --git a/tests/data/test428 b/tests/data/test428 new file mode 100644 index 0000000000..c06f2f9dff --- /dev/null +++ b/tests/data/test428 @@ -0,0 +1,68 @@ + + + +HTTP +variables + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- + + + +# +# Client-side + + +http + + +FUNVALUE=contents +VALUE2=curl +BLANK= + + +Expand environment variables within config file + + +--variable %FUNVALUE +--variable %VALUE2 +--variable %BLANK +--variable %curl_NOT_SET=default +--expand-data 1{{FUNVALUE}}2{{VALUE2}}3{{curl_NOT_SET}}4{{BLANK}}5\{{verbatim}}6{{not.good}}7{{}} + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd + + + +# +# Verify data after the test has been "shot" + + +POST /%TESTNUMBER HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION +Accept: */* +Content-Length: 54 +Content-Type: application/x-www-form-urlencoded + +1contents2curl3default45{{verbatim}}6{{not.good}}7{{}} + + + diff --git a/tests/data/test429 b/tests/data/test429 new file mode 100644 index 0000000000..4091d1be0d --- /dev/null +++ b/tests/data/test429 @@ -0,0 +1,63 @@ + + + +HTTP +HTTP POST +variables + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- + + + +# +# Client-side + + +http + + +FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF=contents2023 + + +Expand environment variable in config file - too long name + + +--expand-data {{FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}} + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd + + + +# +# Verify data after the test has been "shot" + + +POST /%TESTNUMBER HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION +Accept: */* +Content-Length: 133 +Content-Type: application/x-www-form-urlencoded + +{{FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}} + + + diff --git a/tests/data/test448 b/tests/data/test448 new file mode 100644 index 0000000000..0e257e7049 --- /dev/null +++ b/tests/data/test448 @@ -0,0 +1,67 @@ + + + +HTTP +variables +--config + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- + + + +# +# Client-side + + +http + + +FUNVALUE=contents +VALUE2=curl +BLANK= + + +Environment variables within config file, unbalanced braces + + +--variable %FUNVALUE +--variable %VALUE2 +--expand-data 1{{FUNVALUE}}2{{VALUE2}}3{{curl_NOT_SET}}4{{AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA}}5{{broken + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd + + + +# +# Verify data after the test has been "shot" + + +POST /%TESTNUMBER HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION +Accept: */* +Content-Length: 157 +Content-Type: application/x-www-form-urlencoded + +1contents2curl34{{AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA}}5{{broken + + + diff --git a/tests/data/test449 b/tests/data/test449 new file mode 100644 index 0000000000..5981996025 --- /dev/null +++ b/tests/data/test449 @@ -0,0 +1,65 @@ + + + +HTTP +variables +--config + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- + + + +# +# Client-side + + +http + + +FUNVALUE=contents +VALUE2=curl +BLANK= + + +Environment variables in config file w/o [expand] + + +-d 1{{FUNVALUE}}2{{VALUE2}}3{{CURL_NOT_SET}}4{{BLANK}}5\{{verbatim}}6{{not.good}}7{{}} + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd + + + +# +# Verify data after the test has been "shot" + + +POST /%TESTNUMBER HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION +Accept: */* +Content-Length: 83 +Content-Type: application/x-www-form-urlencoded + +1{{FUNVALUE}}2{{VALUE2}}3{{CURL_NOT_SET}}4{{BLANK}}5\{{verbatim}}6{{not.good}}7{{}} + + + diff --git a/tests/data/test450 b/tests/data/test450 new file mode 100644 index 0000000000..a6fa641036 --- /dev/null +++ b/tests/data/test450 @@ -0,0 +1,60 @@ + + + +HTTP +--config +variables + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- + + + +# +# Client-side + + +http + + +Variable from file that is trimmed and URL encoded + + + space with space + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --expand-data "{{what:trim:url}}" + + + +# +# Verify data after the test has been "shot" + + +POST /%TESTNUMBER HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION +Accept: */* +Content-Length: 20 +Content-Type: application/x-www-form-urlencoded + +space%20with%20space + + + diff --git a/tests/data/test451 b/tests/data/test451 new file mode 100644 index 0000000000..7c8fe7d93b --- /dev/null +++ b/tests/data/test451 @@ -0,0 +1,59 @@ + + + +HTTP +variables + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- + + + +# +# Client-side + + +http + + +Variable from file that is JSON and URL encoded (with null byte) + + +%hex[%01%02%03%00%04%05%06]hex% + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --variable second=hello --variable second=again --expand-data "--{{what:trim:json}}22{{none}}--{{second}}{{what:trim:url}}" + + + +# +# Verify data after the test has been "shot" + + +POST /%TESTNUMBER HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION +Accept: */* +Content-Length: 74 +Content-Type: application/x-www-form-urlencoded + +--\u0001\u0002\u0003\u0000\u0004\u0005\u000622--again%01%02%03%00%04%05%06 + + + diff --git a/tests/data/test452 b/tests/data/test452 new file mode 100644 index 0000000000..39f0460dab --- /dev/null +++ b/tests/data/test452 @@ -0,0 +1,34 @@ + + + +variables + + + +# +# Server-side + + + +# +# Client-side + + +http + + +Variable using illegal function in expansion + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what=hello --expand-data "--{{what:trim:super}}" + + + +# +# Verify data after the test has been "shot" + + +2 + + + diff --git a/tests/data/test453 b/tests/data/test453 new file mode 100644 index 0000000000..c1b27d03e2 --- /dev/null +++ b/tests/data/test453 @@ -0,0 +1,33 @@ + + + +HTTP +variables + + + +# +# Client-side + + +http + + +Variable output containing null byte + + +%hex[%01%02%03%00%04%05%06]hex% + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --expand-data "{{what}}" + + + +# +# Verify data after the test has been "shot" + + +2 + + + diff --git a/tests/data/test454 b/tests/data/test454 new file mode 100644 index 0000000000..85fc779bf1 --- /dev/null +++ b/tests/data/test454 @@ -0,0 +1,34 @@ + + + +variables + + + +# +# Server-side + + + +# +# Client-side + + +http + + +Variable using illegal function separator + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what=hello --expand-data "--{{what:trim,url}}" + + + +# +# Verify data after the test has been "shot" + + +2 + + + diff --git a/tests/data/test455 b/tests/data/test455 new file mode 100644 index 0000000000..ffe6bd14c1 --- /dev/null +++ b/tests/data/test455 @@ -0,0 +1,52 @@ + + + +variables + + + +# +# Server-side + + +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Content-Type: text/html +Funny-head: yesyes + +-foo- + + + +# +# Client-side + + +http + + +Variable using base64 + + +--variable moby="Call me Ishmael" --expand-url "http://%HOSTIP:%HTTPPORT/{{moby:b64}}/%TESTNUMBER" + + + +# +# Verify data after the test has been "shot" + + +GET /%b64[Call me Ishmael]b64%/%TESTNUMBER HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +User-Agent: curl/%VERSION +Accept: */* + + + + diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 035ed125c5..b6049e832f 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -666,7 +666,8 @@ CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \ $(CURL_DIROBJ)\warnless.obj \ $(CURL_DIROBJ)\curl_multibyte.obj \ $(CURL_DIROBJ)\version_win32.obj \ - $(CURL_DIROBJ)\dynbuf.obj + $(CURL_DIROBJ)\dynbuf.obj \ + $(CURL_DIROBJ)\base64.obj $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS) $(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS) @@ -689,6 +690,8 @@ $(CURL_DIROBJ)\version_win32.obj: ../lib/version_win32.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/version_win32.c $(CURL_DIROBJ)\dynbuf.obj: ../lib/dynbuf.c $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/dynbuf.c +$(CURL_DIROBJ)\base64.obj: ../lib/base64.c + $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/base64.c $(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc rc $(CURL_RC_FLAGS) -- 2.47.2