From 3ebc6026ac3ed5441475f172b2706eac1818375b Mon Sep 17 00:00:00 2001 From: Matthias Gatto Date: Tue, 2 Nov 2021 16:46:35 +0100 Subject: [PATCH] aws-sigv4: test header refacto Signed-off-by: Matthias Gatto --- tests/data/Makefile.inc | 2 +- tests/data/test1938 | Bin 1281 -> 1317 bytes tests/data/test1940 | 75 +++++++++++++++++++++++++++++++++++++ tests/libtest/Makefile.inc | 6 ++- tests/libtest/lib1940.c | 68 +++++++++++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 tests/data/test1940 create mode 100644 tests/libtest/lib1940.c diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 6a12afe385c385..3027756e0dcf36 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -215,7 +215,7 @@ test1800 test1801 \ test1908 test1909 test1910 test1911 test1912 test1913 test1914 test1915 \ test1916 test1917 test1918 \ \ -test1933 test1934 test1935 test1936 test1937 test1938 test1939 \ +test1933 test1934 test1935 test1936 test1937 test1938 test1939 test1940 \ \ test2000 test2001 test2002 test2003 test2004 \ \ diff --git a/tests/data/test1938 b/tests/data/test1938 index 5341de00f3eae5125ee0e81b80fb1c8a82d98994..e842a4825af86b027a552183c568a08aeedbcda4 100644 GIT binary patch delta 47 ycmZqVTFSM-iAl+(IJG1-ugs3iIW)*8-pxPA+10~8IK + + +HTTP +CURLOPT_AWS_SIGV4 + + + +# Server-side + + +HTTP/1.1 302 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Type: text/html +Content-Length: 0 +Location: /%TESTNUMBER0002 + + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Type: text/html +Content-Length: 0 + + + + +# Client-side + + +http + +# this relies on the debug feature which allow to set the time + +SSL +debug +crypto + + +CURL_FORCEHOST=1 + + + +HTTP AWS_SIGV4 with X-Xxx-Content-Sha256 + + +lib%TESTNUMBER + + + +http://%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test + + + +# Verify data after the test has been "shot" + + +^User-Agent:.* +^Content-Type:.* +^Accept:.* + + +GET /%TESTNUMBER/testapi/test HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;tesmixcase;test0;test1;test2;test_space;x-xxx-date, Signature=25a77f729564b33e1cb2f5ab8ab7b02ac6f744f423fb15e3dd8ed09d0d1782b8 +X-Xxx-Date: 19700101T000000Z +test2:1234 +test_space: t s m end +tesMixCase:MixCase + + + + diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 8721d550c1e069..5df58b427ccfdf 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -61,7 +61,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib1591 lib1592 lib1593 lib1594 lib1596 \ lib1905 lib1906 lib1907 lib1908 lib1910 lib1911 lib1912 lib1913 \ lib1915 lib1916 lib1917 lib1918 lib1933 lib1934 lib1935 lib1936 \ - lib1937 lib1938 lib1939 \ + lib1937 lib1938 lib1939 lib1940 \ lib3010 lib3025 chkdecimalpoint_SOURCES = chkdecimalpoint.c ../../lib/mprintf.c \ @@ -724,6 +724,10 @@ lib1939_SOURCES = lib1939.c $(SUPPORTFILES) lib1939_LDADD = $(TESTUTIL_LIBS) lib1939_CPPFLAGS = $(AM_CPPFLAGS) +lib1940_SOURCES = lib1940.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1940_LDADD = $(TESTUTIL_LIBS) +lib1940_CPPFLAGS = $(AM_CPPFLAGS) + lib3010_SOURCES = lib3010.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib3010_LDADD = $(TESTUTIL_LIBS) lib3010_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib1940.c b/tests/libtest/lib1940.c new file mode 100644 index 00000000000000..1c4597ac24d827 --- /dev/null +++ b/tests/libtest/lib1940.c @@ -0,0 +1,68 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2021, 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" + +int test(char *URL) +{ + CURL *curl; + CURLcode res = TEST_ERR_MAJOR_BAD; + struct curl_slist *list = NULL; + + if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { + fprintf(stderr, "curl_global_init() failed\n"); + return TEST_ERR_MAJOR_BAD; + } + + curl = curl_easy_init(); + if(!curl) { + fprintf(stderr, "curl_easy_init() failed\n"); + curl_global_cleanup(); + return TEST_ERR_MAJOR_BAD; + } + + test_setopt(curl, CURLOPT_VERBOSE, 1L); + test_setopt(curl, CURLOPT_AWS_SIGV4, "xxx"); + test_setopt(curl, CURLOPT_USERPWD, "xxx"); + test_setopt(curl, CURLOPT_HEADER, 0L); + test_setopt(curl, CURLOPT_URL, URL); + list = curl_slist_append(list, "test2:1234"); + if(!list) + goto test_cleanup; + curl_slist_append(list, "Content-Type: application/json"); + curl_slist_append(list, "test1:"); + curl_slist_append(list, "test0"); + curl_slist_append(list, "test_space: t\ts m\t end "); + curl_slist_append(list, "tesMixCase:MixCase"); + test_setopt(curl, CURLOPT_HTTPHEADER, list); + + res = curl_easy_perform(curl); + +test_cleanup: + + curl_slist_free_all(list); + curl_easy_cleanup(curl); + curl_global_cleanup(); + + return res; +}