From 3620e569b312476f1e63b298106f942079b5afe8 Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Thu, 7 Sep 2017 19:11:02 +0100 Subject: form API: add new test 650. Now that the form API is deprecated and not used anymore in curl tool, a lot of its features left untested. Test 650 attempts to check all these features not tested elsewhere. --- tests/libtest/Makefile.inc | 5 +- tests/libtest/lib650.c | 189 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 tests/libtest/lib650.c (limited to 'tests/libtest') diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index b372dfbd6..065899276 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -20,7 +20,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib559 lib560 lib562 lib564 lib565 lib566 lib567 lib568 lib569 lib570 \ lib571 lib572 lib573 lib574 lib575 lib576 lib578 lib579 lib582 \ lib583 lib585 lib586 lib587 lib589 lib590 lib591 lib597 lib598 lib599 \ - lib643 lib644 lib645 \ + lib643 lib644 lib645 lib650 \ lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \ lib1509 lib1510 lib1511 lib1512 lib1513 lib1514 lib1515 lib1517 \ lib1520 lib1521 \ @@ -312,6 +312,9 @@ lib644_CPPFLAGS = $(AM_CPPFLAGS) -DLIB644 lib645_SOURCES = lib643.c $(SUPPORTFILES) lib645_CPPFLAGS = $(AM_CPPFLAGS) -DLIB645 +lib650_SOURCES = lib650.c $(SUPPORTFILES) +lib650_CPPFLAGS = $(AM_CPPFLAGS) + lib1500_SOURCES = lib1500.c $(SUPPORTFILES) $(TESTUTIL) lib1500_LDADD = $(TESTUTIL_LIBS) lib1500_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib650.c b/tests/libtest/lib650.c new file mode 100644 index 000000000..130ef1e77 --- /dev/null +++ b/tests/libtest/lib650.c @@ -0,0 +1,189 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2017, 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.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ +#include "test.h" + +#include "memdebug.h" + +static char data[] = +#ifdef CURL_DOES_CONVERSIONS + /* ASCII representation with escape sequences for non-ASCII platforms */ + "\x74\x68\x69\x73\x20\x69\x73\x20\x77\x68\x61\x74\x20\x77\x65\x20\x70" + "\x6f\x73\x74\x20\x74\x6f\x20\x74\x68\x65\x20\x73\x69\x6c\x6c\x79\x20" + "\x77\x65\x62\x20\x73\x65\x72\x76\x65\x72"; +#else + "this is what we post to the silly web server"; +#endif + +static char name[] = "fieldname"; + + +/* This test attempts to use all form API features that are not + * used elsewhere. + */ + +/* curl_formget callback to count characters. */ +static size_t count_chars(void *userp, const char *buf, size_t len) +{ + size_t *pcounter = (size_t *) userp; + + (void) buf; + *pcounter += len; + return len; +} + + +int test(char *URL) +{ + CURL *curl; + CURLcode res = CURLE_OK; + CURLFORMcode formrc; + struct curl_slist *headers = NULL; + struct curl_httppost *formpost = NULL; + struct curl_httppost *lastptr = NULL; + struct curl_forms formarray[3]; + size_t formlength = 0; + char flbuf[32]; + + if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + /* Check proper name and data copying. */ + formrc = curl_formadd(&formpost, &lastptr, + CURLFORM_COPYNAME, &name, + CURLFORM_COPYCONTENTS, &data, + CURLFORM_END); + + if(formrc) + printf("curl_formadd(1) = %d\n", (int) formrc); + + /* Use a form array for the non-copy test. */ + formarray[0].option = CURLFORM_PTRCONTENTS; + formarray[0].value = data; + formarray[1].option = CURLFORM_CONTENTSLENGTH; + formarray[1].value = (char *) strlen(data) - 1; + formarray[2].option = CURLFORM_END; + formarray[2].value = NULL; + formrc = curl_formadd(&formpost, + &lastptr, + CURLFORM_PTRNAME, name, + CURLFORM_NAMELENGTH, strlen(name) - 1, + CURLFORM_ARRAY, formarray, + CURLFORM_FILENAME, "remotefile.txt", + CURLFORM_END); + + if(formrc) + printf("curl_formadd(2) = %d\n", (int) formrc); + + /* Now change in-memory data to affect CURLOPT_PTRCONTENTS value. + Copied values (first field) must not be affected. + CURLOPT_PTRNAME actually copies the name thus we do not test this here. */ + data[0]++; + + /* Check multi-files and content type propagation. */ + formrc = curl_formadd(&formpost, + &lastptr, + CURLFORM_COPYNAME, "multifile", + CURLFORM_FILE, libtest_arg2, /* Set in first.c. */ + CURLFORM_FILE, libtest_arg2, + CURLFORM_CONTENTTYPE, "text/whatever", + CURLFORM_FILE, libtest_arg2, + CURLFORM_END); + + if(formrc) + printf("curl_formadd(3) = %d\n", (int) formrc); + + /* Check data from file content and headers. */ + headers = curl_slist_append(headers, "X-customheader-1: Header 1 data"); + headers = curl_slist_append(headers, "X-customheader-2: Header 2 data"); + formrc = curl_formadd(&formpost, + &lastptr, + CURLFORM_COPYNAME, "filecontents", + CURLFORM_FILECONTENT, libtest_arg2, + CURLFORM_CONTENTHEADER, headers, + CURLFORM_END); + + if(formrc) + printf("curl_formadd(3) = %d\n", (int) formrc); + + /* Measure the current form length. + * This is done before including stdin data because we want to reuse it + * and stdin cannot be rewound. + */ + curl_formget(formpost, (void *) &formlength, count_chars); + + /* Include length in data for external check. */ + curl_msnprintf(flbuf, sizeof flbuf, "%lu", (unsigned long) formlength); + formrc = curl_formadd(&formpost, + &lastptr, + CURLFORM_COPYNAME, "formlength", + CURLFORM_COPYCONTENTS, &flbuf, + CURLFORM_END); + + /* Check stdin (may be problematic on some platforms). */ + formrc = curl_formadd(&formpost, + &lastptr, + CURLFORM_COPYNAME, "standardinput", + CURLFORM_FILE, "-", + CURLFORM_END); + + if(formrc) + printf("curl_formadd(4) = %d\n", (int) formrc); + + curl = curl_easy_init(); + if(!curl) { + fprintf(stderr, "curl_easy_init() failed\n"); + curl_slist_free_all(headers); + curl_formfree(formpost); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + /* First set the URL that is about to receive our POST. */ + test_setopt(curl, CURLOPT_URL, URL); + + /* send a multi-part formpost */ + test_setopt(curl, CURLOPT_HTTPPOST, formpost); + + /* get verbose debug output please */ + test_setopt(curl, CURLOPT_VERBOSE, 1L); + + /* include headers in the output */ + test_setopt(curl, CURLOPT_HEADER, 1L); + + /* Perform the request, res will get the return code */ + res = curl_easy_perform(curl); + +test_cleanup: + + /* always cleanup */ + curl_easy_cleanup(curl); + + /* now cleanup the formpost chain */ + curl_formfree(formpost); + curl_slist_free_all(headers); + + curl_global_cleanup(); + + return res; +} -- cgit v1.2.3