|
 |
4b6aa8 |
From 20014427c5b225ca47a546f0d77aab981e9ee849 Mon Sep 17 00:00:00 2001
|
|
|
4b6aa8 |
From: Jakub Filak <jfilak@redhat.com>
|
|
|
4b6aa8 |
Date: Tue, 4 Nov 2014 09:14:43 +0100
|
|
|
4b6aa8 |
Subject: [LIBREPORT PATCH 114/118] Revert "ureport: consistently die on all
|
|
|
4b6aa8 |
client auth errors"
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
This reverts commit fca34b5620a6213e1d191bcb99e8757f34bbe0a5.
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Related #1140224
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
|
4b6aa8 |
---
|
|
|
4b6aa8 |
src/lib/ureport.c | 28 +++++++++++++++++++++++++---
|
|
|
4b6aa8 |
1 file changed, 25 insertions(+), 3 deletions(-)
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
diff --git a/src/lib/ureport.c b/src/lib/ureport.c
|
|
|
4b6aa8 |
index ae6a58d..fef3922 100644
|
|
|
4b6aa8 |
--- a/src/lib/ureport.c
|
|
|
4b6aa8 |
+++ b/src/lib/ureport.c
|
|
|
4b6aa8 |
@@ -119,12 +119,21 @@ ureport_server_config_set_client_auth(struct ureport_server_config *config,
|
|
|
4b6aa8 |
ureport_server_config_set_url(config, xstrdup(RHSM_WEB_SERVICE_URL));
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
char *rhsm_dir = rhsm_config_get_entitlement_cert_dir();
|
|
|
4b6aa8 |
+ if (rhsm_dir == NULL)
|
|
|
4b6aa8 |
+ {
|
|
|
4b6aa8 |
+ log_notice("Not using client authentication");
|
|
|
4b6aa8 |
+ return;
|
|
|
4b6aa8 |
+ }
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
GList *certs = get_file_list(rhsm_dir, "pem");
|
|
|
4b6aa8 |
if (g_list_length(certs) < 2)
|
|
|
4b6aa8 |
{
|
|
|
4b6aa8 |
g_list_free_full(certs, (GDestroyNotify)free_file_obj);
|
|
|
4b6aa8 |
- error_msg_and_die("'%s' does not contain a cert-key files pair", rhsm_dir);
|
|
|
4b6aa8 |
+
|
|
|
4b6aa8 |
+ log_notice("'%s' does not contain a cert-key files pair", rhsm_dir);
|
|
|
4b6aa8 |
+ log_notice("Not using client authentication");
|
|
|
4b6aa8 |
+ free(rhsm_dir);
|
|
|
4b6aa8 |
+ return;
|
|
|
4b6aa8 |
}
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
/* Use the last non-key file found. */
|
|
|
4b6aa8 |
@@ -141,7 +150,11 @@ ureport_server_config_set_client_auth(struct ureport_server_config *config,
|
|
|
4b6aa8 |
if (cert == NULL)
|
|
|
4b6aa8 |
{
|
|
|
4b6aa8 |
g_list_free_full(certs, (GDestroyNotify)free_file_obj);
|
|
|
4b6aa8 |
- error_msg_and_die("'%s' does not contain a cert file (only keys)", rhsm_dir);
|
|
|
4b6aa8 |
+
|
|
|
4b6aa8 |
+ log_notice("'%s' does not contain a cert file (only keys)", rhsm_dir);
|
|
|
4b6aa8 |
+ log_notice("Not using client authentication");
|
|
|
4b6aa8 |
+ free(rhsm_dir);
|
|
|
4b6aa8 |
+ return;
|
|
|
4b6aa8 |
}
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
config->ur_client_cert = xstrdup(fo_get_fullpath(cert));
|
|
|
4b6aa8 |
@@ -177,7 +190,16 @@ ureport_server_config_set_client_auth(struct ureport_server_config *config,
|
|
|
4b6aa8 |
xasprintf(RHSMENT_SIG_DATA_BEGIN_TAG"%s"RHSMENT_SIG_DATA_END_TAG, sig_data));
|
|
|
4b6aa8 |
}
|
|
|
4b6aa8 |
else
|
|
|
4b6aa8 |
- error_msg_and_die("Cert file '%s' doesn't contain Entitlement and RSA Signature sections", config->ur_client_cert);
|
|
|
4b6aa8 |
+ {
|
|
|
4b6aa8 |
+ log_notice("Cert file '%s' doesn't contain Entitlement and RSA Signature sections", config->ur_client_cert);
|
|
|
4b6aa8 |
+ log_notice("Not using client authentication");
|
|
|
4b6aa8 |
+
|
|
|
4b6aa8 |
+ free(config->ur_client_cert);
|
|
|
4b6aa8 |
+ config->ur_client_cert = NULL;
|
|
|
4b6aa8 |
+
|
|
|
4b6aa8 |
+ free(config->ur_client_key);
|
|
|
4b6aa8 |
+ config->ur_client_key = NULL;
|
|
|
4b6aa8 |
+ }
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
free(sig_data);
|
|
|
4b6aa8 |
free(ent_data);
|
|
|
4b6aa8 |
--
|
|
|
4b6aa8 |
1.8.3.1
|
|
|
4b6aa8 |
|