From e67393a38e1739ff1b0453fdb3b68ff7e4fb36e9 Mon Sep 17 00:00:00 2001

From: Jakub Filak <jfilak@redhat.com>

Date: Fri, 12 Sep 2014 17:20:01 +0200

Subject: [LIBREPORT PATCH 79/93] ureport: publish ureport.h and refactore

 uReport source

Allow other plugins to submit uReport and allow external applications to

use libreport to submit uReport.

Related to rhbz1139987

Signed-off-by: Jakub Filak <jfilak@redhat.com>

---

 src/include/Makefile.am        |   4 +

 src/include/ureport.h          |  76 ++++

 src/lib/Makefile.am            |   4 +-

 src/lib/json.c                 | 180 ----------

 src/lib/ureport.c              | 180 ++++++++++

 src/lib/ureport.h              |  76 ----

 src/plugins/Makefile.am        |   4 +-

 src/plugins/reporter-ureport.c | 777 +++++++++++++++++++++++++++++++++++++++++

 src/plugins/ureport.c          | 777 -----------------------------------------

 9 files changed, 1043 insertions(+), 1035 deletions(-)

 create mode 100644 src/include/ureport.h

 delete mode 100644 src/lib/json.c

 create mode 100644 src/lib/ureport.c

 delete mode 100644 src/lib/ureport.h

 create mode 100644 src/plugins/reporter-ureport.c

 delete mode 100644 src/plugins/ureport.c

diff --git a/src/include/Makefile.am b/src/include/Makefile.am

index 806b93e..de44cda 100644

--- a/src/include/Makefile.am

+++ b/src/include/Makefile.am

@@ -15,3 +15,7 @@ libreport_include_HEADERS = \

     internal_libreport.h \

     internal_abrt_dbus.h \

     xml_parser.h

+

+if BUILD_UREPORT

+libreport_include_HEADERS += ureport.h

+endif

diff --git a/src/include/ureport.h b/src/include/ureport.h

new file mode 100644

index 0000000..d341f6e

--- /dev/null

+++ b/src/include/ureport.h

@@ -0,0 +1,76 @@

+/*

+    Copyright (C) 2012  ABRT team

+    Copyright (C) 2012  RedHat Inc

+

+    This program is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 2 of the License, or

+    (at your option) any later version.

+

+    This program is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License along

+    with this program; if not, write to the Free Software Foundation, Inc.,

+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+*/

+#ifndef UREPORT_H_

+#define UREPORT_H_

+

+#include "problem_data.h"

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+/*

+ * uReport generation configuration

+ */

+struct ureport_preferences

+{

+    GList *urp_auth_items;  ///< list of file names included in 'auth' key

+};

+

+/*

+ * uReport server configuration

+ */

+struct ureport_server_config

+{

+    const char *ur_url;   ///< Web service URL

+    bool ur_ssl_verify;   ///< Verify HOST and PEER certificates

+    char *ur_client_cert; ///< Path to certificate used for client

+                          ///< authentication (or NULL)

+    char *ur_client_key;  ///< Private key for the certificate

+    map_string_t *ur_http_headers; ///< Additional HTTP headers

+

+    struct ureport_preferences ur_prefs; ///< configuration for uReport generation

+};

+

+struct abrt_post_state;

+

+#define ureport_post libreport_ureport_post

+struct post_state *ureport_post(const char *json_ureport,

+                                struct ureport_server_config *config);

+

+#define ureport_attach_rhbz libreport_ureport_attach_rhbz

+struct post_state *ureport_attach_rhbz(const char *bthash, int rhbz_bug_id,

+                                       struct ureport_server_config *config);

+

+#define ureport_attach_email libreport_ureport_attach_email

+struct post_state *ureport_attach_email(const char *bthash, const char *email,

+                                        struct ureport_server_config *config);

+

+#define ureport_from_dump_dir libreport_ureport_from_dump_dir

+char *ureport_from_dump_dir(const char *dump_dir_path);

+

+#define ureport_from_dump_dir_ext libreport_ureport_from_dump_dir_ext

+char *ureport_from_dump_dir_ext(const char *dump_dir_path,

+                                const struct ureport_preferences *preferences);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am

index d2ff675..7d9722a 100644

--- a/src/lib/Makefile.am

+++ b/src/lib/Makefile.am

@@ -72,6 +72,7 @@ libreport_la_CPPFLAGS = \

     -DDEFAULT_DUMP_DIR_MODE=$(DEFAULT_DUMP_DIR_MODE) \

     -DDUMP_DIR_OWNED_BY_USER=$(DUMP_DIR_OWNED_BY_USER) \

     -DLARGE_DATA_TMP_DIR=\"$(LARGE_DATA_TMP_DIR)\" \

+    $(JSON_C_CFLAGS) \

     $(GLIB_CFLAGS) \

     $(GOBJECT_CFLAGS) \

     $(AUGEAS_CFLAGS) \

@@ -79,6 +80,7 @@ libreport_la_CPPFLAGS = \

 libreport_la_LDFLAGS = \

     -version-info 0:1:0

 libreport_la_LIBADD = \

+    $(JSON_C_LIBS) \

     $(GLIB_LIBS) \

     $(JOURNAL_LIBS) \

     $(GOBJECT_LIBS) \

@@ -113,7 +115,7 @@ libreport_web_o += abrt_xmlrpc.h abrt_xmlrpc.c

 endif

 if BUILD_UREPORT

-libreport_web_o += ureport.h json.c

+libreport_web_o += ureport.c

 endif

 libreport_web_la_SOURCES = $(libreport_web_o) \

diff --git a/src/lib/json.c b/src/lib/json.c

deleted file mode 100644

index 6fbbf39..0000000

--- a/src/lib/json.c

+++ /dev/null

@@ -1,180 +0,0 @@

-/*

-    Copyright (C) 2012  ABRT team

-    Copyright (C) 2012  RedHat Inc

-

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License along

-    with this program; if not, write to the Free Software Foundation, Inc.,

-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-*/

-

-#include <json/json.h>

-

-#include <satyr/abrt.h>

-#include <satyr/report.h>

-

-#include "internal_libreport.h"

-#include "ureport.h"

-#include "libreport_curl.h"

-

-

-static void ureport_add_str(struct json_object *ur, const char *key,

-                            const char *s)

-{

-    struct json_object *jstring = json_object_new_string(s);

-    if (!jstring)

-        die_out_of_memory();

-

-    json_object_object_add(ur, key, jstring);

-}

-

-char *ureport_from_dump_dir_ext(const char *dump_dir_path, const struct ureport_preferences *preferences)

-{

-    char *error_message;

-    struct sr_report *report = sr_abrt_report_from_dir(dump_dir_path,

-                                                       &error_message);

-

-    if (!report)

-        error_msg_and_die("%s", error_message);

-

-    if (preferences != NULL && preferences->urp_auth_items != NULL)

-    {

-        struct dump_dir *dd = dd_opendir(dump_dir_path, DD_OPEN_READONLY);

-        if (!dd)

-            xfunc_die(); /* dd_opendir() already printed an error message */

-

-        GList *iter = preferences->urp_auth_items;

-        for ( ; iter != NULL; iter = g_list_next(iter))

-        {

-            const char *key = (const char *)iter->data;

-            char *value = dd_load_text_ext(dd, key,

-                    DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE | DD_FAIL_QUIETLY_ENOENT);

-

-            if (value == NULL)

-            {

-                perror_msg("Cannot include '%s' in 'auth'", key);

-                continue;

-            }

-

-            sr_report_add_auth(report, key, value);

-        }

-

-        dd_close(dd);

-    }

-

-    char *json_ureport = sr_report_to_json(report);

-    sr_report_free(report);

-

-    return json_ureport;

-}

-

-char *ureport_from_dump_dir(const char *dump_dir_path)

-{

-    return ureport_from_dump_dir_ext(dump_dir_path, /*no preferences*/NULL);

-}

-

-char *new_json_attachment(const char *bthash, const char *type, const char *data)

-{

-    struct json_object *attachment = json_object_new_object();

-    if (!attachment)

-        die_out_of_memory();

-

-    ureport_add_str(attachment, "bthash", bthash);

-    ureport_add_str(attachment, "type", type);

-    ureport_add_str(attachment, "data", data);

-

-    char *result = xstrdup(json_object_to_json_string(attachment));

-    json_object_put(attachment);

-

-    return result;

-}

-

-struct post_state *post_ureport(const char *json, struct ureport_server_config *config)

-{

-    int flags = POST_WANT_BODY | POST_WANT_ERROR_MSG;

-

-    if (config->ur_ssl_verify)

-        flags |= POST_WANT_SSL_VERIFY;

-

-    struct post_state *post_state = new_post_state(flags);

-

-    if (config->ur_client_cert && config->ur_client_key)

-    {

-        post_state->client_cert_path = config->ur_client_cert;

-        post_state->client_key_path = config->ur_client_key;

-    }

-

-    char **headers = xmalloc(sizeof(char *) * (3 + size_map_string(config->ur_http_headers)));

-    headers[0] = (char *)"Accept: application/json";

-    headers[1] = (char *)"Connection: close";

-    headers[2] = NULL;

-

-    if (config->ur_http_headers != NULL)

-    {

-        unsigned i = 2;

-        const char *header;

-        const char *value;

-        map_string_iter_t iter;

-        init_map_string_iter(&iter, config->ur_http_headers);

-        while (next_map_string_iter(&iter, &header, &value))

-            headers[i++] = xasprintf("%s: %s", header, value);

-        headers[i] = NULL;

-    }

-

-    post_string_as_form_data(post_state, config->ur_url, "application/json",

-                    (const char **)headers, json);

-

-    /* Client authentication failed. Try again without client auth.

-     * CURLE_SSL_CONNECT_ERROR - cert not found/server doesnt trust the CA

-     * CURLE_SSL_CERTPROBLEM - malformed certificate/no permission

-     */

-    if ((post_state->curl_result == CURLE_SSL_CONNECT_ERROR

-         || post_state->curl_result == CURLE_SSL_CERTPROBLEM)

-            && config->ur_client_cert && config->ur_client_key)

-    {

-        warn_msg("Authentication failed. Retrying unauthenticated.");

-        free_post_state(post_state);

-        post_state = new_post_state(flags);

-

-        post_string_as_form_data(post_state, config->ur_url, "application/json",

-                         (const char **)headers, json);

-

-    }

-

-    for (unsigned i = size_map_string(config->ur_http_headers); i != 0; --i)

-        free(headers[i + 1]);

-    free(headers);

-

-    return post_state;

-}

-

-struct post_state *ureport_attach_rhbz(const char *bthash, int rhbz_bug_id,

-                                       struct ureport_server_config *config)

-{

-    char *str_bug_id = xasprintf("%d", rhbz_bug_id);

-    char *json_attachment = new_json_attachment(bthash, "RHBZ", str_bug_id);

-    struct post_state *post_state = post_ureport(json_attachment, config);

-    free(str_bug_id);

-    free(json_attachment);

-

-    return post_state;

-}

-

-struct post_state *ureport_attach_email(const char *bthash, const char *email,

-                                       struct ureport_server_config *config)

-{

-    char *json_attachment = new_json_attachment(bthash, "email", email);

-    struct post_state *post_state = post_ureport(json_attachment, config);

-    free(json_attachment);

-

-    return post_state;

-}

diff --git a/src/lib/ureport.c b/src/lib/ureport.c

new file mode 100644

index 0000000..761fe62

--- /dev/null

+++ b/src/lib/ureport.c

@@ -0,0 +1,180 @@

+/*

+    Copyright (C) 2012,2014  ABRT team

+    Copyright (C) 2012,2014  RedHat Inc

+

+    This program is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 2 of the License, or

+    (at your option) any later version.

+

+    This program is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License along

+    with this program; if not, write to the Free Software Foundation, Inc.,

+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+*/

+

+#include <json.h>

+

+#include <satyr/abrt.h>

+#include <satyr/report.h>

+

+#include "internal_libreport.h"

+#include "ureport.h"

+#include "libreport_curl.h"

+

+

+static void ureport_add_str(struct json_object *ur, const char *key,

+                            const char *s)

+{

+    struct json_object *jstring = json_object_new_string(s);

+    if (!jstring)

+        die_out_of_memory();

+

+    json_object_object_add(ur, key, jstring);

+}

+

+char *ureport_from_dump_dir_ext(const char *dump_dir_path, const struct ureport_preferences *preferences)

+{

+    char *error_message;

+    struct sr_report *report = sr_abrt_report_from_dir(dump_dir_path,

+                                                       &error_message);

+

+    if (!report)

+        error_msg_and_die("%s", error_message);

+

+    if (preferences != NULL && preferences->urp_auth_items != NULL)

+    {

+        struct dump_dir *dd = dd_opendir(dump_dir_path, DD_OPEN_READONLY);

+        if (!dd)

+            xfunc_die(); /* dd_opendir() already printed an error message */

+

+        GList *iter = preferences->urp_auth_items;

+        for ( ; iter != NULL; iter = g_list_next(iter))

+        {

+            const char *key = (const char *)iter->data;

+            char *value = dd_load_text_ext(dd, key,

+                    DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE | DD_FAIL_QUIETLY_ENOENT);

+

+            if (value == NULL)

+            {

+                perror_msg("Cannot include '%s' in 'auth'", key);

+                continue;

+            }

+

+            sr_report_add_auth(report, key, value);

+        }

+

+        dd_close(dd);

+    }

+

+    char *json_ureport = sr_report_to_json(report);

+    sr_report_free(report);

+

+    return json_ureport;

+}

+

+char *ureport_from_dump_dir(const char *dump_dir_path)

+{

+    return ureport_from_dump_dir_ext(dump_dir_path, /*no preferences*/NULL);

+}

+

+static char *new_json_attachment(const char *bthash, const char *type, const char *data)

+{

+    struct json_object *attachment = json_object_new_object();

+    if (!attachment)

+        die_out_of_memory();

+

+    ureport_add_str(attachment, "bthash", bthash);

+    ureport_add_str(attachment, "type", type);

+    ureport_add_str(attachment, "data", data);

+

+    char *result = xstrdup(json_object_to_json_string(attachment));

+    json_object_put(attachment);

+

+    return result;

+}

+

+struct post_state *ureport_post(const char *json, struct ureport_server_config *config)

+{

+    int flags = POST_WANT_BODY | POST_WANT_ERROR_MSG;

+

+    if (config->ur_ssl_verify)

+        flags |= POST_WANT_SSL_VERIFY;

+

+    struct post_state *post_state = new_post_state(flags);

+

+    if (config->ur_client_cert && config->ur_client_key)

+    {

+        post_state->client_cert_path = config->ur_client_cert;

+        post_state->client_key_path = config->ur_client_key;

+    }

+

+    char **headers = xmalloc(sizeof(char *) * (3 + size_map_string(config->ur_http_headers)));

+    headers[0] = (char *)"Accept: application/json";

+    headers[1] = (char *)"Connection: close";

+    headers[2] = NULL;

+

+    if (config->ur_http_headers != NULL)

+    {

+        unsigned i = 2;

+        const char *header;

+        const char *value;

+        map_string_iter_t iter;

+        init_map_string_iter(&iter, config->ur_http_headers);

+        while (next_map_string_iter(&iter, &header, &value))

+            headers[i++] = xasprintf("%s: %s", header, value);

+        headers[i] = NULL;

+    }

+

+    post_string_as_form_data(post_state, config->ur_url, "application/json",

+                    (const char **)headers, json);

+

+    /* Client authentication failed. Try again without client auth.

+     * CURLE_SSL_CONNECT_ERROR - cert not found/server doesnt trust the CA

+     * CURLE_SSL_CERTPROBLEM - malformed certificate/no permission

+     */

+    if ((post_state->curl_result == CURLE_SSL_CONNECT_ERROR

+         || post_state->curl_result == CURLE_SSL_CERTPROBLEM)

+            && config->ur_client_cert && config->ur_client_key)

+    {

+        warn_msg("Authentication failed. Retrying unauthenticated.");

+        free_post_state(post_state);

+        post_state = new_post_state(flags);

+

+        post_string_as_form_data(post_state, config->ur_url, "application/json",

+                         (const char **)headers, json);

+

+    }

+

+    for (unsigned i = size_map_string(config->ur_http_headers); i != 0; --i)

+        free(headers[i + 1]);

+    free(headers);

+

+    return post_state;

+}

+

+struct post_state *ureport_attach_rhbz(const char *bthash, int rhbz_bug_id,

+                                       struct ureport_server_config *config)

+{

+    char *str_bug_id = xasprintf("%d", rhbz_bug_id);

+    char *json_attachment = new_json_attachment(bthash, "RHBZ", str_bug_id);

+    struct post_state *post_state = ureport_post(json_attachment, config);

+    free(str_bug_id);

+    free(json_attachment);

+

+    return post_state;

+}

+

+struct post_state *ureport_attach_email(const char *bthash, const char *email,

+                                       struct ureport_server_config *config)

+{

+    char *json_attachment = new_json_attachment(bthash, "email", email);

+    struct post_state *post_state = ureport_post(json_attachment, config);

+    free(json_attachment);

+

+    return post_state;

+}

diff --git a/src/lib/ureport.h b/src/lib/ureport.h

deleted file mode 100644

index 319aca9..0000000

--- a/src/lib/ureport.h

+++ /dev/null

@@ -1,76 +0,0 @@

-/*

-    Copyright (C) 2012  ABRT team

-    Copyright (C) 2012  RedHat Inc

-

-    This program is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License along

-    with this program; if not, write to the Free Software Foundation, Inc.,

-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

-*/

-#ifndef UREPORT_H_

-#define UREPORT_H_

-

-#include "problem_data.h"

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-/*

- * uReport generation configuration

- */

-struct ureport_preferences

-{

-    GList *urp_auth_items;  ///< list of file names included in 'auth' key

-};

-

-/*

- * uReport server configuration

- */

-struct ureport_server_config

-{

-    const char *ur_url;   ///< Web service URL

-    bool ur_ssl_verify;   ///< Verify HOST and PEER certificates

-    char *ur_client_cert; ///< Path to certificate used for client

-                          ///< authentication (or NULL)

-    char *ur_client_key;  ///< Private key for the certificate

-    map_string_t *ur_http_headers; ///< Additional HTTP headers

-

-    struct ureport_preferences ur_prefs; ///< configuration for uReport generation

-};

-

-struct abrt_post_state;

-

-#define post_ureport libreport_post_ureport

-struct post_state *post_ureport(const char *json_ureport,

-                                struct ureport_server_config *config);

-

-#define ureport_attach_rhbz libreport_ureport_attach_rhbz

-struct post_state *ureport_attach_rhbz(const char *bthash, int rhbz_bug_id,

-                                       struct ureport_server_config *config);

-

-#define ureport_attach_email libreport_ureport_attach_email

-struct post_state *ureport_attach_email(const char *bthash, const char *email,

-                                        struct ureport_server_config *config);

-

-#define ureport_from_dump_dir libreport_ureport_from_dump_dir

-char *ureport_from_dump_dir(const char *dump_dir_path);

-

-#define ureport_from_dump_dir_ext libreport_ureport_from_dump_dir_ext

-char *ureport_from_dump_dir_ext(const char *dump_dir_path,

-                                const struct ureport_preferences *preferences);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am

index 7ec5219..7ec08d7 100644

--- a/src/plugins/Makefile.am

+++ b/src/plugins/Makefile.am

@@ -250,15 +250,17 @@ endif

 if BUILD_UREPORT

 reporter_ureport_SOURCES = \

-    ureport.c

+    reporter-ureport.c

 reporter_ureport_CPPFLAGS = \

     -I$(srcdir)/../include \

     -I$(srcdir)/../lib \

+    $(JSON_C_CFLAGS) \

     $(GLIB_CFLAGS) \

     $(LIBREPORT_CFLAGS) \

     -DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \

     -D_GNU_SOURCE

 reporter_ureport_LDADD = \

+    $(JSON_C_LIBS) \

     ../lib/libreport.la \

     ../lib/libreport-web.la

 endif

diff --git a/src/plugins/reporter-ureport.c b/src/plugins/reporter-ureport.c

new file mode 100644

index 0000000..d827c7d

--- /dev/null

+++ b/src/plugins/reporter-ureport.c

@@ -0,0 +1,777 @@

+/*

+    Copyright (C) 2012  ABRT Team

+    Copyright (C) 2012  RedHat inc.

+

+    This program is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 2 of the License, or

+    (at your option) any later version.

+

+    This program is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License along

+    with this program; if not, write to the Free Software Foundation, Inc.,

+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+*/

+

+#include <json.h>

+#include "internal_libreport.h"

+#include "ureport.h"

+#include "libreport_curl.h"

+

+#define CONF_FILE_PATH PLUGINS_CONF_DIR"/ureport.conf"

+

+#define REPORT_URL_SFX "reports/new/"

+#define ATTACH_URL_SFX "reports/attach/"

+#define BTHASH_URL_SFX "reports/bthash/"

+

+#define RHSM_CERT_PATH "/etc/pki/consumer/cert.pem"

+#define RHSM_KEY_PATH "/etc/pki/consumer/key.pem"

+

+#define RHAP_PEM_DIR_PATH "/etc/pki/entitlement"

+#define RHAP_ENT_DATA_BEGIN_TAG "-----BEGIN ENTITLEMENT DATA-----"

+#define RHAP_ENT_DATA_END_TAG "-----END ENTITLEMENT DATA-----"

+#define RHAP_SIG_DATA_BEGIN_TAG "-----BEGIN RSA SIGNATURE-----"

+#define RHAP_SIG_DATA_END_TAG "-----END RSA SIGNATURE-----"

+

+#define VALUE_FROM_CONF(opt, var, tr) do { const char *value = getenv("uReport_"opt); \

+        if (!value) { value = get_map_string_item_or_NULL(settings, opt); } if (value) { var = tr(value); } \

+    } while(0)

+

+static char *puppet_config_print(const char *key)

+{

+    char *command = xasprintf("puppet config print %s", key);

+    char *result = run_in_shell_and_save_output(0, command, NULL, NULL);

+    free(command);

+

+    /* run_in_shell_and_save_output always returns non-NULL */

+    if (result[0] != '/')

+        goto error;

+

+    char *newline = strchrnul(result, '\n');

+    if (!newline)

+        goto error;

+

+    *newline = '\0';

+    return result;

+error:

+    free(result);

+    error_msg_and_die("Unable to determine puppet %s path (puppet not installed?)", key);

+}

+

+static void parse_client_auth_paths(struct ureport_server_config *config, const char *client_auth)

+{

+    if (client_auth == NULL)

+        return;

+

+    if (strcmp(client_auth, "") == 0)

+    {

+        config->ur_client_cert = NULL;

+        config->ur_client_key = NULL;

+        log_notice("Not using client authentication");

+    }

+    else if (strcmp(client_auth, "rhsm") == 0)

+    {

+        config->ur_client_cert = xstrdup(RHSM_CERT_PATH);

+        config->ur_client_key = xstrdup(RHSM_KEY_PATH);

+    }

+    else if (strcmp(client_auth, "rhsm-entitlement") == 0)

+    {

+        GList *certs = get_file_list(RHAP_PEM_DIR_PATH, "pem");