|
 |
4b6aa8 |
From b3ae09a48cf7cb21e3562509717381e4c4133454 Mon Sep 17 00:00:00 2001
|
|
|
4b6aa8 |
From: Jakub Filak <jfilak@redhat.com>
|
|
|
4b6aa8 |
Date: Wed, 22 Oct 2014 08:12:44 +0200
|
|
|
4b6aa8 |
Subject: [LIBREPORT PATCH 101/105] ureport: use entit certs with 'rhsm' and
|
|
|
4b6aa8 |
drop 'rhsm-entitlement'
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
/etc/pki/consumer certificates cannot be used for authentication in
|
|
|
4b6aa8 |
Strata. Martin Milata has correctly pointed out that it does not make
|
|
|
4b6aa8 |
sense to have both 'rhsm' and 'rhsm-entitlement' options.
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Related #1140224
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
|
4b6aa8 |
---
|
|
|
4b6aa8 |
doc/reporter-ureport.txt | 6 ++----
|
|
|
4b6aa8 |
src/lib/ureport.c | 11 -----------
|
|
|
4b6aa8 |
src/plugins/ureport.conf | 4 +---
|
|
|
4b6aa8 |
3 files changed, 3 insertions(+), 18 deletions(-)
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
diff --git a/doc/reporter-ureport.txt b/doc/reporter-ureport.txt
|
|
|
4b6aa8 |
index 807f1e1..1a67441 100644
|
|
|
4b6aa8 |
--- a/doc/reporter-ureport.txt
|
|
|
4b6aa8 |
+++ b/doc/reporter-ureport.txt
|
|
|
4b6aa8 |
@@ -35,10 +35,8 @@ Configuration file lines should have 'PARAM = VALUE' format. The parameters are:
|
|
|
4b6aa8 |
Possible values are:
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
'rhsm';;
|
|
|
4b6aa8 |
- Uses the system certificate that is used for Red Hat subscription management.
|
|
|
4b6aa8 |
-
|
|
|
4b6aa8 |
- 'rhsm-entitlement';;
|
|
|
4b6aa8 |
- Same as 'rhsm' but uses the V3 RHSM entitlement certificates.
|
|
|
4b6aa8 |
+ Uses the system V3 entitlement certificate that is used for Red Hat
|
|
|
4b6aa8 |
+ subscription management.
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
'puppet';;
|
|
|
4b6aa8 |
Uses the certificate that is used by the Puppet configuration management tool.
|
|
|
4b6aa8 |
diff --git a/src/lib/ureport.c b/src/lib/ureport.c
|
|
|
4b6aa8 |
index 99e84ef..5782b4e 100644
|
|
|
4b6aa8 |
--- a/src/lib/ureport.c
|
|
|
4b6aa8 |
+++ b/src/lib/ureport.c
|
|
|
4b6aa8 |
@@ -32,9 +32,6 @@
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
#define RHSM_WEB_SERVICE_URL "https://api.access.redhat.com/rs/telemetry/abrt"
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
-#define RHSM_CERT_PATH "/etc/pki/consumer/cert.pem"
|
|
|
4b6aa8 |
-#define RHSM_KEY_PATH "/etc/pki/consumer/key.pem"
|
|
|
4b6aa8 |
-
|
|
|
4b6aa8 |
#define RHSMENT_PEM_DIR_PATH "/etc/pki/entitlement"
|
|
|
4b6aa8 |
#define RHSMENT_ENT_DATA_BEGIN_TAG "-----BEGIN ENTITLEMENT DATA-----"
|
|
|
4b6aa8 |
#define RHSMENT_ENT_DATA_END_TAG "-----END ENTITLEMENT DATA-----"
|
|
|
4b6aa8 |
@@ -94,14 +91,6 @@ ureport_server_config_set_client_auth(struct ureport_server_config *config,
|
|
|
4b6aa8 |
if (config->ur_url == NULL)
|
|
|
4b6aa8 |
ureport_server_config_set_url(config, xstrdup(RHSM_WEB_SERVICE_URL));
|
|
|
4b6aa8 |
|
|
|
4b6aa8 |
- config->ur_client_cert = xstrdup(RHSM_CERT_PATH);
|
|
|
4b6aa8 |
- config->ur_client_key = xstrdup(RHSM_KEY_PATH);
|
|
|
4b6aa8 |
- }
|
|
|
4b6aa8 |
- else if (strcmp(client_auth, "rhsm-entitlement") == 0)
|
|
|
4b6aa8 |
- {
|
|
|
4b6aa8 |
- if (config->ur_url == NULL)
|
|
|
4b6aa8 |
- ureport_server_config_set_url(config, xstrdup(RHSM_WEB_SERVICE_URL));
|
|
|
4b6aa8 |
-
|
|
|
4b6aa8 |
GList *certs = get_file_list(RHSMENT_PEM_DIR_PATH, "pem");
|
|
|
4b6aa8 |
if (g_list_length(certs) < 2)
|
|
|
4b6aa8 |
{
|
|
|
4b6aa8 |
diff --git a/src/plugins/ureport.conf b/src/plugins/ureport.conf
|
|
|
4b6aa8 |
index e7bd66b..9e0415f 100644
|
|
|
4b6aa8 |
--- a/src/plugins/ureport.conf
|
|
|
4b6aa8 |
+++ b/src/plugins/ureport.conf
|
|
|
4b6aa8 |
@@ -22,10 +22,8 @@ AuthDataItems = hostname, machineid
|
|
|
4b6aa8 |
# 'IncludeAuthData' to 'yes'.
|
|
|
4b6aa8 |
# None (default):
|
|
|
4b6aa8 |
# SSLClientAuth =
|
|
|
4b6aa8 |
-# Using RH subscription management certificate:
|
|
|
4b6aa8 |
-# SSLClientAuth = rhsm
|
|
|
4b6aa8 |
# Using RH subscription management entitlement certificate:
|
|
|
4b6aa8 |
-# SSLClientAuth = rhsm-entitlement
|
|
|
4b6aa8 |
+# SSLClientAuth = rhsm
|
|
|
4b6aa8 |
# Using Puppet certificate:
|
|
|
4b6aa8 |
# SSLClientAuth = puppet
|
|
|
4b6aa8 |
# Using custom certificate:
|
|
|
4b6aa8 |
--
|
|
|
4b6aa8 |
1.8.3.1
|
|
|
4b6aa8 |
|