Skip to content

Commit

Permalink
aws-sigv4: test header refacto
Browse files Browse the repository at this point in the history
Signed-off-by: Matthias Gatto <matthias.gatto@outscale.com>
  • Loading branch information
outscale-mgo committed Jan 8, 2022
1 parent 9dd74bc commit 3ebc602
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/data/Makefile.inc
Expand Up @@ -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 \
\
Expand Down
Binary file modified tests/data/test1938
Binary file not shown.
75 changes: 75 additions & 0 deletions tests/data/test1940
@@ -0,0 +1,75 @@
<testcase>
<info>
<keywords>
HTTP
CURLOPT_AWS_SIGV4
</keywords>
</info>

# Server-side
<reply>
<data nocheck="yes">
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

</data>
<data2>
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

</data2>
</reply>

# Client-side
<client>
<server>
http
</server>
# this relies on the debug feature which allow to set the time
<features>
SSL
debug
crypto
</features>
<setenv>
CURL_FORCEHOST=1
</setenv>

<name>
HTTP AWS_SIGV4 with X-Xxx-Content-Sha256
</name>
<tool>
lib%TESTNUMBER
</tool>

<command>
http://%HOSTIP:%HTTPPORT/%TESTNUMBER/testapi/test
</command>
</client>

# Verify data after the test has been "shot"
<verify>
<strip>
^User-Agent:.*
^Content-Type:.*
^Accept:.*
</strip>
<protocol>
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

</protocol>
</verify>
</testcase>
6 changes: 5 additions & 1 deletion tests/libtest/Makefile.inc
Expand Up @@ -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 \
Expand Down Expand Up @@ -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)
Expand Down
68 changes: 68 additions & 0 deletions tests/libtest/lib1940.c
@@ -0,0 +1,68 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at https://curl.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;
}

0 comments on commit 3ebc602

Please sign in to comment.