|
 |
ecf709 |
From f63d4b3749fd76796a26f1c1f07bdddcb681a768 Mon Sep 17 00:00:00 2001
|
|
|
ecf709 |
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
|
|
|
ecf709 |
Date: Mon, 13 Mar 2017 13:30:48 +0100
|
|
|
ecf709 |
Subject: [PATCH 80/90] tcurl test: add support for client certificate
|
|
|
ecf709 |
|
|
|
ecf709 |
Reviewed-by: Simo Sorce <simo@redhat.com>
|
|
|
ecf709 |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
ecf709 |
(cherry picked from commit ae6b11229d9961e26922918183c7c1de7780b8d6)
|
|
|
ecf709 |
---
|
|
|
ecf709 |
src/tests/tcurl_test_tool.c | 13 +++++++++++++
|
|
|
ecf709 |
1 file changed, 13 insertions(+)
|
|
|
ecf709 |
|
|
|
ecf709 |
diff --git a/src/tests/tcurl_test_tool.c b/src/tests/tcurl_test_tool.c
|
|
|
ecf709 |
index 63a3e26b561781795873c2a4d72ac071a4da9939..fbc2790357b131ebb21b4be041688e5f699d73e7 100644
|
|
|
ecf709 |
--- a/src/tests/tcurl_test_tool.c
|
|
|
ecf709 |
+++ b/src/tests/tcurl_test_tool.c
|
|
|
ecf709 |
@@ -47,6 +47,9 @@ struct tool_options {
|
|
|
ecf709 |
const char *capath;
|
|
|
ecf709 |
const char *cacert;
|
|
|
ecf709 |
|
|
|
ecf709 |
+ const char *clientcert;
|
|
|
ecf709 |
+ const char *clientkey;
|
|
|
ecf709 |
+
|
|
|
ecf709 |
const char *username;
|
|
|
ecf709 |
const char *password;
|
|
|
ecf709 |
};
|
|
|
ecf709 |
@@ -201,6 +204,14 @@ prepare_requests(TALLOC_CTX *mem_ctx,
|
|
|
ecf709 |
}
|
|
|
ecf709 |
}
|
|
|
ecf709 |
|
|
|
ecf709 |
+ if (opts->clientcert != NULL) {
|
|
|
ecf709 |
+ ret = tcurl_req_set_client_cert(requests[i], opts->clientcert,
|
|
|
ecf709 |
+ opts->clientkey);
|
|
|
ecf709 |
+ if (ret != EOK) {
|
|
|
ecf709 |
+ goto done;
|
|
|
ecf709 |
+ }
|
|
|
ecf709 |
+ }
|
|
|
ecf709 |
+
|
|
|
ecf709 |
if (opts->username != NULL && opts->password != NULL) {
|
|
|
ecf709 |
ret = tcurl_req_http_basic_auth(requests[i], opts->username,
|
|
|
ecf709 |
opts->password);
|
|
|
ecf709 |
@@ -317,6 +328,8 @@ int main(int argc, const char *argv[])
|
|
|
ecf709 |
{ "verify-host", '\0', POPT_ARG_NONE, &opts.verify_host, '\0', "Verify host when TLS is enabled", NULL },
|
|
|
ecf709 |
{ "capath", '\0', POPT_ARG_STRING, &opts.capath, '\0', "Path to CA directory where peer certificate is stored", NULL },
|
|
|
ecf709 |
{ "cacert", '\0', POPT_ARG_STRING, &opts.cacert, '\0', "Path to CA certificate", NULL },
|
|
|
ecf709 |
+ { "clientcert", '\0', POPT_ARG_STRING, &opts.clientcert, '\0', "Path to client's certificate", NULL },
|
|
|
ecf709 |
+ { "clientkey", '\0', POPT_ARG_STRING, &opts.clientkey, '\0', "Path to client's private key", NULL },
|
|
|
ecf709 |
/* BASIC AUTH */
|
|
|
ecf709 |
{ "username", '\0', POPT_ARG_STRING, &opts.username, '\0', "Username for basic authentication", NULL },
|
|
|
ecf709 |
{ "password", '\0', POPT_ARG_STRING, &opts.password, '\0', "Password for basic authentication", NULL },
|
|
|
ecf709 |
--
|
|
|
ecf709 |
2.9.3
|
|
|
ecf709 |
|