Blame SOURCES/0080-ureport-aggressive-refactorization-of-uReport-source.patch

562801
From 85b9ada575f47a5f25f1ffeaccf9c4e1142fd689 Mon Sep 17 00:00:00 2001
562801
From: Jakub Filak <jfilak@redhat.com>
562801
Date: Sat, 13 Sep 2014 22:26:53 +0200
562801
Subject: [LIBREPORT PATCH 80/93] ureport: aggressive refactorization of
562801
 uReport source
562801
562801
Simplify/unify the uReport API and provide a development documentation
562801
in form of Doxygen comments.
562801
562801
Related to rhbz1139987
562801
562801
Signed-off-by: Jakub Filak <jfilak@redhat.com>
562801
---
562801
 po/POTFILES.in                 |   4 +-
562801
 src/include/ureport.h          | 185 +++++++++++-
562801
 src/lib/ureport.c              | 633 ++++++++++++++++++++++++++++++++++++++---
562801
 src/plugins/reporter-ureport.c | 581 ++-----------------------------------
562801
 4 files changed, 793 insertions(+), 610 deletions(-)
562801
562801
diff --git a/po/POTFILES.in b/po/POTFILES.in
562801
index 7ba080c..00046e2 100644
562801
--- a/po/POTFILES.in
562801
+++ b/po/POTFILES.in
562801
@@ -19,7 +19,7 @@ src/lib/client.c
562801
 src/lib/create_dump_dir.c
562801
 src/lib/curl.c
562801
 src/lib/event_config.c
562801
-src/lib/json.c
562801
+src/lib/ureport.c
562801
 src/lib/make_descr.c
562801
 src/lib/parse_options.c
562801
 src/lib/problem_data.c
562801
@@ -42,7 +42,7 @@ src/plugins/report_Uploader.xml.in
562801
 src/plugins/report_uReport.xml.in
562801
 src/plugins/report_EmergencyAnalysis.xml.in
562801
 src/plugins/rhbz.c
562801
-src/plugins/ureport.c
562801
+src/plugins/reporter-ureport.c
562801
 src/report-newt/report-newt.c
562801
 src/workflows/workflow_AnacondaFedora.xml.in
562801
 src/workflows/workflow_AnacondaRHEL.xml.in
562801
diff --git a/src/include/ureport.h b/src/include/ureport.h
562801
index d341f6e..3fffed7 100644
562801
--- a/src/include/ureport.h
562801
+++ b/src/include/ureport.h
562801
@@ -19,12 +19,19 @@
562801
 #ifndef UREPORT_H_
562801
 #define UREPORT_H_
562801
 
562801
-#include "problem_data.h"
562801
-
562801
 #ifdef __cplusplus
562801
 extern "C" {
562801
 #endif
562801
 
562801
+#define UREPORT_CONF_FILE_PATH PLUGINS_CONF_DIR"/ureport.conf"
562801
+
562801
+#define UREPORT_OPTION_VALUE_FROM_CONF(settings, opt, var, tr) do { const char *value = getenv("uReport_"opt); \
562801
+        if (!value) { value = get_map_string_item_or_NULL(settings, opt); } if (value) { var = tr(value); } \
562801
+    } while(0)
562801
+
562801
+#define UREPORT_SUBMIT_ACTION "reports/new/"
562801
+#define UREPORT_ATTACH_ACTION "reports/attach/"
562801
+
562801
 /*
562801
  * uReport generation configuration
562801
  */
562801
@@ -48,22 +55,176 @@ struct ureport_server_config
562801
     struct ureport_preferences ur_prefs; ///< configuration for uReport generation
562801
 };
562801
 
562801
-struct abrt_post_state;
562801
+/*
562801
+ * Initialize structure members
562801
+ *
562801
+ * @param config Initialized structure
562801
+ */
562801
+#define ureport_server_config_init libreport_ureport_server_config_init
562801
+void
562801
+ureport_server_config_init(struct ureport_server_config *config);
562801
+
562801
+/*
562801
+ * Release all allocated resources
562801
+ *
562801
+ * @param config Released structure
562801
+ */
562801
+#define ureport_server_config_destroy libreport_ureport_server_config_destroy
562801
+void
562801
+ureport_server_config_destroy(struct ureport_server_config *config);
562801
 
562801
-#define ureport_post libreport_ureport_post
562801
-struct post_state *ureport_post(const char *json_ureport,
562801
-                                struct ureport_server_config *config);
562801
+/*
562801
+ * Loads uReport configuration from various sources.
562801
+ *
562801
+ * Replaces a value of an already configured option only if the
562801
+ * option was found in a configuration source.
562801
+ *
562801
+ * @param config a server configuration to be populated
562801
+ */
562801
+#define ureport_server_config_load libreport_ureport_server_config_load
562801
+void
562801
+ureport_server_config_load(struct ureport_server_config *config,
562801
+                           map_string_t *settings);
562801
 
562801
-#define ureport_attach_rhbz libreport_ureport_attach_rhbz
562801
-struct post_state *ureport_attach_rhbz(const char *bthash, int rhbz_bug_id,
562801
+/*
562801
+ * Configure client certificate paths
562801
+ *
562801
+ * @param config Where the paths are stored
562801
+ * @param client_path Path in form of cert_full_path:key_full_path or one of
562801
+ *        the following string: 'rhsm', 'puppet'.
562801
+ */
562801
+#define ureport_server_config_set_client_auth libreport_ureport_server_config_set_client_auth
562801
+void
562801
+ureport_server_config_set_client_auth(struct ureport_server_config *config,
562801
+                                      const char *client_auth);
562801
+
562801
+/*
562801
+ * uReport server response
562801
+ */
562801
+struct ureport_server_response
562801
+{
562801
+    bool urr_is_error;  ///< True if server replied with error response
562801
+    char *urr_value;    ///< Value of the response
562801
+    char *urr_message;  ///< Additional message
562801
+    char *urr_bthash;   ///< uReport's server side identifier
562801
+    GList *urr_reported_to_list; ///< Known external reports for uReport
562801
+                                 ///< in *reported_to* format
562801
+    char *urr_solution; ///< URL pointing to solution for uReport
562801
+};
562801
+
562801
+/* Can't include "abrt_curl.h", it's not a public API.
562801
+ * Resorting to just forward-declaring the struct we need.
562801
+ */
562801
+struct post_state;
562801
+
562801
+/*
562801
+ * Parse server reply
562801
+ *
562801
+ * @param post_state Server reply
562801
+ * @param config Configuration used in communication
562801
+ * @return Pointer to malloced memory or NULL in case of error in communication
562801
+ */
562801
+#define ureport_server_response_from_reply libreport_ureport_server_response_from_reply
562801
+struct ureport_server_response *
562801
+ureport_server_response_from_reply(struct post_state *post_state,
562801
+                                   struct ureport_server_config *config);
562801
+
562801
+/*
562801
+ * Save response in dump dir files
562801
+ *
562801
+ * @param resp Parsed server response
562801
+ * @param dump_dir_pat Path to dump directory
562801
+ * @param config Configuration used in communication
562801
+ * @return False in case of any error; otherwise True.
562801
+ */
562801
+#define ureport_server_response_save_in_dump_dir libreport_ureport_server_response_save_in_dump_dir
562801
+bool
562801
+ureport_server_response_save_in_dump_dir(struct ureport_server_response *resp,
562801
+                                         const char *dump_dir_path,
562801
+                                         struct ureport_server_config *config);
562801
+
562801
+/*
562801
+ * Build URL to submitted uReport
562801
+ *
562801
+ * @param resp Parsed server response
562801
+ * @param config Configuration used in communication
562801
+ * @return Malloced zero-terminated string
562801
+ */
562801
+#define ureport_server_response_get_report_url libreport_ureport_server_response_get_report_url
562801
+char *
562801
+ureport_server_response_get_report_url(struct ureport_server_response *resp,
562801
                                        struct ureport_server_config *config);
562801
 
562801
-#define ureport_attach_email libreport_ureport_attach_email
562801
-struct post_state *ureport_attach_email(const char *bthash, const char *email,
562801
-                                        struct ureport_server_config *config);
562801
+/*
562801
+ * Release allocated resources
562801
+ *
562801
+ * @param resp Released structured
562801
+ */
562801
+#define ureport_server_response_free libreport_ureport_server_response_free
562801
+void
562801
+ureport_server_response_free(struct ureport_server_response *resp);
562801
+
562801
+/*
562801
+ * Send JSON to server and obtain reply
562801
+ *
562801
+ * @param json Sent data
562801
+ * @param config Configuration used in communication
562801
+ * @param url_sfx Local part of the upload URL
562801
+ * @return Malloced server reply or NULL in case of communication errors
562801
+ */
562801
+#define ureport_do_post libreport_ureport_do_post
562801
+struct post_state *
562801
+ureport_do_post(const char *json, struct ureport_server_config *config,
562801
+                const char *url_sfx);
562801
+
562801
+/*
562801
+ * Submit uReport on server
562801
+ *
562801
+ * @param json Sent data
562801
+ * @param config Configuration used in communication
562801
+ * @return Malloced, parsed server response
562801
+ */
562801
+#define ureport_submit libreport_ureport_submit
562801
+struct ureport_server_response *
562801
+ureport_submit(const char *json_ureport, struct ureport_server_config *config);
562801
+
562801
+/*
562801
+ * Attach given string to uReport
562801
+ *
562801
+ * @param bthash uReport identifier
562801
+ * @param type Type of attachment
562801
+ * @param data Attached data
562801
+ * @param config Configuration used in communication
562801
+ * @return False in case of any error; otherwise True
562801
+ */
562801
+#define ureport_attach_string libreport_ureport_attach_string
562801
+bool
562801
+ureport_attach_string(const char *bthash, const char *type, const char *data,
562801
+               struct ureport_server_config *config);
562801
 
562801
+/*
562801
+ * Attach given integer to uReport
562801
+ *
562801
+ * @param bthash uReport identifier
562801
+ * @param type Type of attachment
562801
+ * @param data Attached data
562801
+ * @param config Configuration used in communication
562801
+ * @return False in case of any error; otherwise True
562801
+ */
562801
+#define ureport_attach_int libreport_ureport_attach_int
562801
+bool
562801
+ureport_attach_int(const char *bthash, const char *type, int data,
562801
+                   struct ureport_server_config *config);
562801
+
562801
+/*
562801
+ * Build uReport from dump dir
562801
+ *
562801
+ * @param dump_dir_path FS path to dump dir
562801
+ * @return Malloced JSON string
562801
+ */
562801
 #define ureport_from_dump_dir libreport_ureport_from_dump_dir
562801
-char *ureport_from_dump_dir(const char *dump_dir_path);
562801
+char *
562801
+ureport_from_dump_dir(const char *dump_dir_path);
562801
 
562801
 #define ureport_from_dump_dir_ext libreport_ureport_from_dump_dir_ext
562801
 char *ureport_from_dump_dir_ext(const char *dump_dir_path,
562801
diff --git a/src/lib/ureport.c b/src/lib/ureport.c
562801
index 761fe62..e1816ef 100644
562801
--- a/src/lib/ureport.c
562801
+++ b/src/lib/ureport.c
562801
@@ -26,9 +26,528 @@
562801
 #include "ureport.h"
562801
 #include "libreport_curl.h"
562801
 
562801
+#define DESTROYED_POINTER (void *)0xdeadbeef
562801
 
562801
-static void ureport_add_str(struct json_object *ur, const char *key,
562801
-                            const char *s)
562801
+#define BTHASH_URL_SFX "reports/bthash/"
562801
+
562801
+#define RHSM_CERT_PATH "/etc/pki/consumer/cert.pem"
562801
+#define RHSM_KEY_PATH "/etc/pki/consumer/key.pem"
562801
+
562801
+#define RHSMENT_PEM_DIR_PATH "/etc/pki/entitlement"
562801
+#define RHSMENT_ENT_DATA_BEGIN_TAG "-----BEGIN ENTITLEMENT DATA-----"
562801
+#define RHSMENT_ENT_DATA_END_TAG "-----END ENTITLEMENT DATA-----"
562801
+#define RHSMENT_SIG_DATA_BEGIN_TAG "-----BEGIN RSA SIGNATURE-----"
562801
+#define RHSMENT_SIG_DATA_END_TAG "-----END RSA SIGNATURE-----"
562801
+
562801
+static char *
562801
+puppet_config_print(const char *key)
562801
+{
562801
+    char *command = xasprintf("puppet config print %s", key);
562801
+    char *result = run_in_shell_and_save_output(0, command, NULL, NULL);
562801
+    free(command);
562801
+
562801
+    /* run_in_shell_and_save_output always returns non-NULL */
562801
+    if (result[0] != '/')
562801
+        goto error;
562801
+
562801
+    char *newline = strchrnul(result, '\n');
562801
+    if (!newline)
562801
+        goto error;
562801
+
562801
+    *newline = '\0';
562801
+    return result;
562801
+error:
562801
+    free(result);
562801
+    error_msg_and_die("Unable to determine puppet %s path (puppet not installed?)", key);
562801
+}
562801
+
562801
+void
562801
+ureport_server_config_set_client_auth(struct ureport_server_config *config,
562801
+                                      const char *client_auth)
562801
+{
562801
+    if (client_auth == NULL)
562801
+        return;
562801
+
562801
+    if (strcmp(client_auth, "") == 0)
562801
+    {
562801
+        config->ur_client_cert = NULL;
562801
+        config->ur_client_key = NULL;
562801
+        log_notice("Not using client authentication");
562801
+    }
562801
+    else if (strcmp(client_auth, "rhsm") == 0)
562801
+    {
562801
+        config->ur_client_cert = xstrdup(RHSM_CERT_PATH);
562801
+        config->ur_client_key = xstrdup(RHSM_KEY_PATH);
562801
+    }
562801
+    else if (strcmp(client_auth, "rhsm-entitlement") == 0)
562801
+    {
562801
+        GList *certs = get_file_list(RHSMENT_PEM_DIR_PATH, "pem");
562801
+        if (g_list_length(certs) != 2)
562801
+        {
562801
+            log_notice(RHSMENT_PEM_DIR_PATH" does not contain unique cert-key files pair");
562801
+            log_notice("Not using client authentication");
562801
+            return;
562801
+        }
562801
+
562801
+        const char *cert = NULL;
562801
+        const char *key = NULL;
562801
+
562801
+        file_obj_t *fst = (file_obj_t *)certs->data;
562801
+        file_obj_t *scn = (file_obj_t *)certs->next->data;
562801
+
562801
+        if (strlen(fo_get_filename(fst)) < strlen(fo_get_filename(scn)))
562801
+        {
562801
+            cert = fo_get_filename(fst);
562801
+            key = fo_get_filename(scn);
562801
+
562801
+            config->ur_client_cert = xstrdup(fo_get_fullpath(fst));
562801
+            config->ur_client_key = xstrdup(fo_get_fullpath(scn));
562801
+        }
562801
+        else
562801
+        {
562801
+            cert = fo_get_filename(scn);
562801
+            key = fo_get_filename(fst);
562801
+
562801
+            config->ur_client_cert = xstrdup(fo_get_fullpath(scn));
562801
+            config->ur_client_key = xstrdup(fo_get_fullpath(fst));
562801
+        }
562801
+
562801
+        const bool iscomplement = prefixcmp(key, cert) != 0 || strcmp("-key", key + strlen(cert)) != 0;
562801
+        g_list_free_full(certs, (GDestroyNotify)free_file_obj);
562801
+
562801
+        if (iscomplement)
562801
+        {
562801
+            log_notice("Key file '%s' isn't complement to cert file '%s'",
562801
+                    config->ur_client_key, config->ur_client_cert);
562801
+            log_notice("Not using client authentication");
562801
+
562801
+            free(config->ur_client_cert);
562801
+            free(config->ur_client_key);
562801
+            config->ur_client_cert = NULL;
562801
+            config->ur_client_key = NULL;
562801
+
562801
+            return;
562801
+        }
562801
+
562801
+        char *certdata = xmalloc_open_read_close(config->ur_client_cert, /*no size limit*/NULL);
562801
+        if (certdata != NULL)
562801
+        {
562801
+            char *ent_data = xstrdup_between(certdata,
562801
+                    RHSMENT_ENT_DATA_BEGIN_TAG, RHSMENT_ENT_DATA_END_TAG);
562801
+
562801
+            char *sig_data = xstrdup_between(certdata,
562801
+                    RHSMENT_SIG_DATA_BEGIN_TAG, RHSMENT_SIG_DATA_END_TAG);
562801
+
562801
+            if (ent_data != NULL && sig_data != NULL)
562801
+            {
562801
+                ent_data = strremovech(ent_data, '\n');
562801
+                insert_map_string(config->ur_http_headers,
562801
+                        xstrdup("X-RH-Entitlement-Data"),
562801
+                        xasprintf(RHSMENT_ENT_DATA_BEGIN_TAG"%s"RHSMENT_ENT_DATA_END_TAG, ent_data));
562801
+
562801
+                sig_data = strremovech(sig_data, '\n');
562801
+                insert_map_string(config->ur_http_headers,
562801
+                        xstrdup("X-RH-Entitlement-Sig"),
562801
+                        xasprintf(RHSMENT_SIG_DATA_BEGIN_TAG"%s"RHSMENT_SIG_DATA_END_TAG, sig_data));
562801
+            }
562801
+            else
562801
+            {
562801
+                log_notice("Cert file '%s' doesn't contain Entitlement and RSA Signature sections", config->ur_client_cert);
562801
+                log_notice("Not using HTTP authentication headers");
562801
+            }
562801
+
562801
+            free(sig_data);
562801
+            free(ent_data);
562801
+            free(certdata);
562801
+        }
562801
+    }
562801
+    else if (strcmp(client_auth, "puppet") == 0)
562801
+    {
562801
+        config->ur_client_cert = puppet_config_print("hostcert");
562801
+        config->ur_client_key = puppet_config_print("hostprivkey");
562801
+    }
562801
+    else
562801
+    {
562801
+        char *scratch = xstrdup(client_auth);
562801
+        config->ur_client_cert = xstrdup(strtok(scratch, ":"));
562801
+        config->ur_client_key = xstrdup(strtok(NULL, ":"));
562801
+        free(scratch);
562801
+
562801
+        if (config->ur_client_cert == NULL || config->ur_client_key == NULL)
562801
+            error_msg_and_die("Invalid client authentication specification");
562801
+    }
562801
+
562801
+    if (config->ur_client_cert && config->ur_client_key)
562801
+    {
562801
+        log_notice("Using client certificate: %s", config->ur_client_cert);
562801
+        log_notice("Using client private key: %s", config->ur_client_key);
562801
+    }
562801
+}
562801
+
562801
+void
562801
+ureport_server_config_load(struct ureport_server_config *config,
562801
+                           map_string_t *settings)
562801
+{
562801
+    UREPORT_OPTION_VALUE_FROM_CONF(settings, "URL", config->ur_url, (const char *));
562801
+    UREPORT_OPTION_VALUE_FROM_CONF(settings, "SSLVerify", config->ur_ssl_verify, string_to_bool);
562801
+
562801
+    bool include_auth = false;
562801
+    UREPORT_OPTION_VALUE_FROM_CONF(settings, "IncludeAuthData", include_auth, string_to_bool);
562801
+
562801
+    if (include_auth)
562801
+    {
562801
+        const char *auth_items = NULL;
562801
+        UREPORT_OPTION_VALUE_FROM_CONF(settings, "AuthDataItems", auth_items, (const char *));
562801
+        config->ur_prefs.urp_auth_items = parse_list(auth_items);
562801
+
562801
+        if (config->ur_prefs.urp_auth_items == NULL)
562801
+            log_warning("IncludeAuthData set to 'yes' but AuthDataItems is empty.");
562801
+    }
562801
+
562801
+    const char *client_auth = NULL;
562801
+    UREPORT_OPTION_VALUE_FROM_CONF(settings, "SSLClientAuth", client_auth, (const char *));
562801
+    ureport_server_config_set_client_auth(config, client_auth);
562801
+}
562801
+
562801
+void
562801
+ureport_server_config_init(struct ureport_server_config *config)
562801
+{
562801
+    config->ur_url = NULL;
562801
+    config->ur_ssl_verify = true;
562801
+    config->ur_client_cert = NULL;
562801
+    config->ur_client_key = NULL;
562801
+    config->ur_http_headers = new_map_string();
562801
+    config->ur_prefs.urp_auth_items = NULL;
562801
+}
562801
+
562801
+void
562801
+ureport_server_config_destroy(struct ureport_server_config *config)
562801
+{
562801
+    free(config->ur_client_cert);
562801
+    config->ur_client_cert = DESTROYED_POINTER;
562801
+
562801
+    free(config->ur_client_key);
562801
+    config->ur_client_key = DESTROYED_POINTER;
562801
+
562801
+    g_list_free_full(config->ur_prefs.urp_auth_items, free);
562801
+    config->ur_prefs.urp_auth_items = DESTROYED_POINTER;
562801
+
562801
+    free_map_string(config->ur_http_headers);
562801
+    config->ur_http_headers = DESTROYED_POINTER;
562801
+}
562801
+
562801
+void
562801
+ureport_server_response_free(struct ureport_server_response *resp)
562801
+{
562801
+    if (!resp)
562801
+        return;
562801
+
562801
+    free(resp->urr_solution);
562801
+    resp->urr_solution = DESTROYED_POINTER;
562801
+
562801
+    g_list_free_full(resp->urr_reported_to_list, g_free);
562801
+    resp->urr_reported_to_list = DESTROYED_POINTER;
562801
+
562801
+    free(resp->urr_bthash);
562801
+    resp->urr_bthash = DESTROYED_POINTER;
562801
+
562801
+    free(resp->urr_message);
562801
+    resp->urr_message = DESTROYED_POINTER;
562801
+
562801
+    free(resp->urr_value);
562801
+    resp->urr_value = DESTROYED_POINTER;
562801
+
562801
+    free(resp);
562801
+}
562801
+
562801
+static char *
562801
+parse_solution_from_json_list(struct json_object *list,
562801
+                              GList **reported_to)
562801
+{
562801
+    json_object *list_elem, *struct_elem;
562801
+    const char *cause, *note, *url;
562801
+    struct strbuf *solution_buf = strbuf_new();
562801
+
562801
+    const unsigned length = json_object_array_length(list);
562801
+
562801
+    const char *one_format = _("Your problem seems to be caused by %s\n\n%s\n");
562801
+    if (length > 1)
562801
+    {
562801
+        strbuf_append_str(solution_buf, _("Your problem seems to be caused by one of the following:\n"));
562801
+        one_format = "\n* %s\n\n%s\n";
562801
+    }
562801
+
562801
+    bool empty = true;
562801
+    for (unsigned i = 0; i < length; ++i)
562801
+    {
562801
+        list_elem = json_object_array_get_idx(list, i);
562801
+        if (!list_elem)
562801
+            continue;
562801
+
562801
+        if (!json_object_object_get_ex(list_elem, "cause", &struct_elem))
562801
+            continue;
562801
+
562801
+        cause = json_object_get_string(struct_elem);
562801
+            continue;
562801
+
562801
+        if (!json_object_object_get_ex(list_elem, "note", &struct_elem))
562801
+            continue;
562801
+
562801
+        note = json_object_get_string(struct_elem);
562801
+        if (!note)
562801
+            continue;
562801
+
562801
+        empty = false;
562801
+        strbuf_append_strf(solution_buf, one_format, cause, note);
562801
+
562801
+        if (!json_object_object_get_ex(list_elem, "url", &struct_elem))
562801
+            continue;
562801
+
562801
+        url = json_object_get_string(struct_elem);
562801
+        if (url)
562801
+        {
562801
+            char *reported_to_line = xasprintf("%s: URL=%s", cause, url);
562801
+            *reported_to = g_list_append(*reported_to, reported_to_line);
562801
+        }
562801
+    }
562801
+
562801
+    if (empty)
562801
+    {
562801
+        strbuf_free(solution_buf);
562801
+        return NULL;
562801
+    }
562801
+
562801
+    return strbuf_free_nobuf(solution_buf);
562801
+}
562801
+
562801
+/* reported_to json element should be a list of structures
562801
+   {
562801
+     "reporter": "Bugzilla",
562801
+     "type": "url",
562801
+     "value": "https://bugzilla.redhat.com/show_bug.cgi?id=XYZ"
562801
+   }
562801
+ */
562801
+static GList *
562801
+parse_reported_to_from_json_list(struct json_object *list)
562801
+{
562801
+    int i;
562801
+    json_object *list_elem, *struct_elem;
562801
+    const char *reporter, *value, *type;
562801
+    char *reported_to_line, *prefix;
562801
+    GList *result = NULL;
562801
+
562801
+    for (i = 0; i < json_object_array_length(list); ++i)
562801
+    {
562801
+        prefix = NULL;
562801
+        list_elem = json_object_array_get_idx(list, i);
562801
+        if (!list_elem)
562801
+            continue;
562801
+
562801
+        if (!json_object_object_get_ex(list_elem, "reporter", &struct_elem))
562801
+            continue;
562801
+
562801
+        reporter = json_object_get_string(struct_elem);
562801
+        if (!reporter)
562801
+            continue;
562801
+
562801
+        if (!json_object_object_get_ex(list_elem, "value", &struct_elem))
562801
+            continue;
562801
+
562801
+        value = json_object_get_string(struct_elem);
562801
+        if (!value)
562801
+            continue;
562801
+
562801
+        if (!json_object_object_get_ex(list_elem, "type", &struct_elem))
562801
+            continue;
562801
+
562801
+        type = json_object_get_string(struct_elem);
562801
+        if (type)
562801
+        {
562801
+            if (strcasecmp("url", type) == 0)
562801
+                prefix = xstrdup("URL=");
562801
+            else if (strcasecmp("bthash", type) == 0)
562801
+                prefix = xstrdup("BTHASH=");
562801
+        }
562801
+
562801
+        if (!prefix)
562801
+            prefix = xstrdup("");
562801
+
562801
+        reported_to_line = xasprintf("%s: %s%s", reporter, prefix, value);
562801
+        free(prefix);
562801
+
562801
+        result = g_list_append(result, reported_to_line);
562801
+    }
562801
+
562801
+    return result;
562801
+}
562801
+
562801
+/*
562801
+ * Reponse samples:
562801
+ * {"error":"field 'foo' is required"}
562801
+ * {"response":"true"}
562801
+ * {"response":"false"}
562801
+ */
562801
+static struct ureport_server_response *
562801
+ureport_server_parse_json(json_object *json)
562801
+{
562801
+    json_object *obj = NULL;
562801
+    if (json_object_object_get_ex(json, "error", &obj))
562801
+    {
562801
+        struct ureport_server_response *out_response = xzalloc(sizeof(*out_response));
562801
+        out_response->urr_is_error = true;
562801
+        /*
562801
+         * Used to use json_object_to_json_string(obj), but it returns
562801
+         * the string in quote marks (") - IOW, json-formatted string.
562801
+         */
562801
+        out_response->urr_value = xstrdup(json_object_get_string(obj));
562801
+        return out_response;
562801
+    }
562801
+
562801
+    if (json_object_object_get_ex(json, "result", &obj))
562801
+    {
562801
+        struct ureport_server_response *out_response = xzalloc(sizeof(*out_response));
562801
+        out_response->urr_value = xstrdup(json_object_get_string(obj));
562801
+
562801
+        json_object *message = NULL;
562801
+        if (json_object_object_get_ex(json, "message", &message))
562801
+            out_response->urr_message = xstrdup(json_object_get_string(message));
562801
+
562801
+        json_object *bthash = NULL;
562801
+        if (json_object_object_get_ex(json, "bthash", &bthash))
562801
+            out_response->urr_bthash = xstrdup(json_object_get_string(bthash));
562801
+
562801
+        json_object *reported_to_list = NULL;
562801
+        if (json_object_object_get_ex(json, "reported_to", &reported_to_list))
562801
+            out_response->urr_reported_to_list =
562801
+                parse_reported_to_from_json_list(reported_to_list);
562801
+
562801
+        json_object *solutions = NULL;
562801
+        if (json_object_object_get_ex(json, "solutions", &solutions))
562801
+            out_response->urr_solution =
562801
+                parse_solution_from_json_list(solutions, &(out_response->urr_reported_to_list));
562801
+
562801
+        return out_response;
562801
+    }
562801
+
562801
+    return NULL;
562801
+}
562801
+
562801
+struct ureport_server_response *
562801
+ureport_server_response_from_reply(post_state_t *post_state,
562801
+                                   struct ureport_server_config *config)
562801
+{
562801
+    /* Previously, the condition here was (post_state->errmsg[0] != '\0')
562801
+     * however when the server asks for optional client authentication and we do not have the certificates,
562801
+     * then post_state->errmsg contains "NSS: client certificate not found (nickname not specified)" even though
562801
+     * the request succeeded.
562801
+     */
562801
+    if (post_state->curl_result != CURLE_OK)
562801
+    {
562801
+        error_msg(_("Failed to upload uReport to the server '%s' with curl: %s"), config->ur_url, post_state->errmsg);
562801
+        return NULL;
562801
+    }
562801
+
562801
+    if (post_state->http_resp_code == 404)
562801
+    {
562801
+        error_msg(_("The URL '%s' does not exist (got error 404 from server)"), config->ur_url);
562801
+        return NULL;
562801
+    }
562801
+
562801
+    if (post_state->http_resp_code == 500)
562801
+    {
562801
+        error_msg(_("The server at '%s' encountered an internal error (got error 500)"), config->ur_url);
562801
+        return NULL;
562801
+    }
562801
+
562801
+    if (post_state->http_resp_code == 503)
562801
+    {
562801
+        error_msg(_("The server at '%s' currently can't handle the request (got error 503)"), config->ur_url);
562801
+        return NULL;
562801
+    }
562801
+
562801
+    if (post_state->http_resp_code != 202
562801
+            && post_state->http_resp_code != 400
562801
+            && post_state->http_resp_code != 413)
562801
+    {
562801
+        /* can't print better error message */
562801
+        error_msg(_("Unexpected HTTP response from '%s': %d"), config->ur_url, post_state->http_resp_code);
562801
+        log_notice("%s", post_state->body);
562801
+        return NULL;
562801
+    }
562801
+
562801
+    json_object *const json = json_tokener_parse(post_state->body);
562801
+
562801
+    if (is_error(json))
562801
+    {
562801
+        error_msg(_("Unable to parse response from ureport server at '%s'"), config->ur_url);
562801
+        log_notice("%s", post_state->body);
562801
+        json_object_put(json);
562801
+        return NULL;
562801
+    }
562801
+
562801
+    struct ureport_server_response *response = ureport_server_parse_json(json);
562801
+    json_object_put(json);
562801
+
562801
+    if (!response)
562801
+        error_msg(_("The response from '%s' has invalid format"), config->ur_url);
562801
+    else if ((post_state->http_resp_code == 202 && response->urr_is_error)
562801
+                || (post_state->http_resp_code != 202 && !response->urr_is_error))
562801
+    {
562801
+        /* HTTP CODE 202 means that call was successful but the response */
562801
+        /* has an error message */
562801
+        error_msg(_("Type mismatch has been detected in the response from '%s'"), config->ur_url);
562801
+    }
562801
+
562801
+    return response;
562801
+}
562801
+
562801
+bool
562801
+ureport_server_response_save_in_dump_dir(struct ureport_server_response *resp,
562801
+                                         const char *dump_dir_path,
562801
+                                         struct ureport_server_config *config)
562801
+{
562801
+    struct dump_dir *dd = dd_opendir(dump_dir_path, /* flags */ 0);
562801
+    if (!dd)
562801
+        return false;
562801
+
562801
+    if (resp->urr_bthash)
562801
+    {
562801
+        char *msg = xasprintf("uReport: BTHASH=%s", resp->urr_bthash);
562801
+        add_reported_to(dd, msg);
562801
+        free(msg);
562801
+
562801
+        char *report_url = ureport_server_response_get_report_url(resp, config);
562801
+        msg = xasprintf("ABRT Server: URL=%s", report_url);
562801
+        add_reported_to(dd, msg);
562801
+        free(msg);
562801
+        free(report_url);
562801
+    }
562801
+
562801
+    if (resp->urr_reported_to_list)
562801
+    {
562801
+        for (GList *e = resp->urr_reported_to_list; e; e = g_list_next(e))
562801
+            add_reported_to(dd, e->data);
562801
+    }
562801
+
562801
+    if (resp->urr_solution)
562801
+        dd_save_text(dd, FILENAME_NOT_REPORTABLE, resp->urr_solution);
562801
+
562801
+    dd_close(dd);
562801
+    return true;
562801
+}
562801
+
562801
+char *
562801
+ureport_server_response_get_report_url(struct ureport_server_response *resp,
562801
+                                       struct ureport_server_config *config)
562801
+{
562801
+    char *bthash_url = concat_path_file(config->ur_url, BTHASH_URL_SFX);
562801
+    char *report_url = concat_path_file(bthash_url, resp->urr_bthash);
562801
+    free(bthash_url);
562801
+    return report_url;
562801
+}
562801
+
562801
+static void
562801
+ureport_add_str(struct json_object *ur, const char *key, const char *s)
562801
 {
562801
     struct json_object *jstring = json_object_new_string(s);
562801
     if (!jstring)
562801
@@ -37,7 +556,8 @@ static void ureport_add_str(struct json_object *ur, const char *key,
562801
     json_object_object_add(ur, key, jstring);
562801
 }
562801
 
562801
-char *ureport_from_dump_dir_ext(const char *dump_dir_path, const struct ureport_preferences *preferences)
562801
+char *
562801
+ureport_from_dump_dir_ext(const char *dump_dir_path, const struct ureport_preferences *preferences)
562801
 {
562801
     char *error_message;
562801
     struct sr_report *report = sr_abrt_report_from_dir(dump_dir_path,
562801
@@ -77,28 +597,15 @@ char *ureport_from_dump_dir_ext(const char *dump_dir_path, const struct ureport_
562801
     return json_ureport;
562801
 }
562801
 
562801
-char *ureport_from_dump_dir(const char *dump_dir_path)
562801
+char *
562801
+ureport_from_dump_dir(const char *dump_dir_path)
562801
 {
562801
     return ureport_from_dump_dir_ext(dump_dir_path, /*no preferences*/NULL);
562801
 }
562801
 
562801
-static char *new_json_attachment(const char *bthash, const char *type, const char *data)
562801
-{
562801
-    struct json_object *attachment = json_object_new_object();
562801
-    if (!attachment)
562801
-        die_out_of_memory();
562801
-
562801
-    ureport_add_str(attachment, "bthash", bthash);
562801
-    ureport_add_str(attachment, "type", type);
562801
-    ureport_add_str(attachment, "data", data);
562801
-
562801
-    char *result = xstrdup(json_object_to_json_string(attachment));
562801
-    json_object_put(attachment);
562801
-
562801
-    return result;
562801
-}
562801
-
562801
-struct post_state *ureport_post(const char *json, struct ureport_server_config *config)
562801
+struct post_state *
562801
+ureport_do_post(const char *json, struct ureport_server_config *config,
562801
+                const char *url_sfx)
562801
 {
562801
     int flags = POST_WANT_BODY | POST_WANT_ERROR_MSG;
562801
 
562801
@@ -130,8 +637,10 @@ struct post_state *ureport_post(const char *json, struct ureport_server_config *
562801
         headers[i] = NULL;
562801
     }
562801
 
562801
-    post_string_as_form_data(post_state, config->ur_url, "application/json",
562801
-                    (const char **)headers, json);
562801
+    char *dest_url = concat_path_file(config->ur_url, url_sfx);
562801
+
562801
+    post_string_as_form_data(post_state, dest_url, "application/json",
562801
+                     (const char **)headers, json);
562801
 
562801
     /* Client authentication failed. Try again without client auth.
562801
      * CURLE_SSL_CONNECT_ERROR - cert not found/server doesnt trust the CA
562801
@@ -145,11 +654,13 @@ struct post_state *ureport_post(const char *json, struct ureport_server_config *
562801
         free_post_state(post_state);
562801
         post_state = new_post_state(flags);
562801
 
562801
-        post_string_as_form_data(post_state, config->ur_url, "application/json",
562801
+        post_string_as_form_data(post_state, dest_url, "application/json",
562801
                          (const char **)headers, json);
562801
 
562801
     }
562801
 
562801
+    free(dest_url);
562801
+
562801
     for (unsigned i = size_map_string(config->ur_http_headers); i != 0; --i)
562801
         free(headers[i + 1]);
562801
     free(headers);
562801
@@ -157,24 +668,70 @@ struct post_state *ureport_post(const char *json, struct ureport_server_config *
562801
     return post_state;
562801
 }
562801
 
562801
-struct post_state *ureport_attach_rhbz(const char *bthash, int rhbz_bug_id,
562801
-                                       struct ureport_server_config *config)
562801
+struct ureport_server_response *
562801
+ureport_submit(const char *json, struct ureport_server_config *config)
562801
 {
562801
-    char *str_bug_id = xasprintf("%d", rhbz_bug_id);
562801
-    char *json_attachment = new_json_attachment(bthash, "RHBZ", str_bug_id);
562801
-    struct post_state *post_state = ureport_post(json_attachment, config);
562801
-    free(str_bug_id);
562801
-    free(json_attachment);
562801
+    struct post_state *post_state = ureport_do_post(json, config, UREPORT_SUBMIT_ACTION);
562801
 
562801
-    return post_state;
562801
+    if (post_state == NULL)
562801
+    {
562801
+        error_msg(_("Failed on submitting the problem"));
562801
+        return NULL;
562801
+    }
562801
+
562801
+    struct ureport_server_response *resp = ureport_server_response_from_reply(post_state, config);
562801
+    free(post_state);
562801
+
562801
+    return resp;
562801
 }
562801
 
562801
-struct post_state *ureport_attach_email(const char *bthash, const char *email,
562801
-                                       struct ureport_server_config *config)
562801
+static char *
562801
+ureport_json_attachment_new(const char *bthash, const char *type, const char *data)
562801
 {
562801
-    char *json_attachment = new_json_attachment(bthash, "email", email);
562801
-    struct post_state *post_state = ureport_post(json_attachment, config);
562801
-    free(json_attachment);
562801
+    struct json_object *attachment = json_object_new_object();
562801
+    if (!attachment)
562801
+        die_out_of_memory();
562801
 
562801
-    return post_state;
562801
+    ureport_add_str(attachment, "bthash", bthash);
562801
+    ureport_add_str(attachment, "type", type);
562801
+    ureport_add_str(attachment, "data", data);
562801
+
562801
+    char *result = xstrdup(json_object_to_json_string(attachment));
562801
+    json_object_put(attachment);
562801
+
562801
+    return result;
562801
+}
562801
+
562801
+bool
562801
+ureport_attach_string(const char *bthash, const char *type, const char *data,
562801
+               struct ureport_server_config *config)
562801
+{
562801
+    char *json = ureport_json_attachment_new(bthash, type, data);
562801
+    post_state_t *post_state = ureport_do_post(json, config, UREPORT_ATTACH_ACTION);
562801
+    free(json);
562801
+
562801
+    struct ureport_server_response *resp =
562801
+        ureport_server_response_from_reply(post_state, config);
562801
+    free_post_state(post_state);
562801
+    /* don't use str_bo_bool() because we require "true" string */
562801
+    const int result = !resp || resp->urr_is_error || strcmp(resp->urr_value, "true") != 0;
562801
+
562801
+    if (resp && resp->urr_is_error)
562801
+        error_msg(_("The server at '%s' responded with an error: '%s'"),
562801
+                config->ur_url, resp->urr_value);
562801
+
562801
+    ureport_server_response_free(resp);
562801
+
562801
+    return result;
562801
+}
562801
+
562801
+bool
562801
+ureport_attach_int(const char *bthash, const char *type, int data,
562801
+                    struct ureport_server_config *config)
562801
+{
562801
+    char *data_str = xasprintf("%d", data);
562801
+    const bool result = ureport_attach_string(bthash, type, data_str, config);
562801
+    free(data_str);
562801
+
562801
+    return result;
562801
 }
562801
diff --git a/src/plugins/reporter-ureport.c b/src/plugins/reporter-ureport.c
562801
index d827c7d..7bd3fb3 100644
562801
--- a/src/plugins/reporter-ureport.c
562801
+++ b/src/plugins/reporter-ureport.c
562801
@@ -22,482 +22,6 @@
562801
 #include "ureport.h"
562801
 #include "libreport_curl.h"
562801
 
562801
-#define CONF_FILE_PATH PLUGINS_CONF_DIR"/ureport.conf"
562801
-
562801
-#define REPORT_URL_SFX "reports/new/"
562801
-#define ATTACH_URL_SFX "reports/attach/"
562801
-#define BTHASH_URL_SFX "reports/bthash/"
562801
-
562801
-#define RHSM_CERT_PATH "/etc/pki/consumer/cert.pem"
562801
-#define RHSM_KEY_PATH "/etc/pki/consumer/key.pem"
562801
-
562801
-#define RHAP_PEM_DIR_PATH "/etc/pki/entitlement"
562801
-#define RHAP_ENT_DATA_BEGIN_TAG "-----BEGIN ENTITLEMENT DATA-----"
562801
-#define RHAP_ENT_DATA_END_TAG "-----END ENTITLEMENT DATA-----"
562801
-#define RHAP_SIG_DATA_BEGIN_TAG "-----BEGIN RSA SIGNATURE-----"
562801
-#define RHAP_SIG_DATA_END_TAG "-----END RSA SIGNATURE-----"
562801
-
562801
-#define VALUE_FROM_CONF(opt, var, tr) do { const char *value = getenv("uReport_"opt); \
562801
-        if (!value) { value = get_map_string_item_or_NULL(settings, opt); } if (value) { var = tr(value); } \
562801
-    } while(0)
562801
-
562801
-static char *puppet_config_print(const char *key)
562801
-{
562801
-    char *command = xasprintf("puppet config print %s", key);
562801
-    char *result = run_in_shell_and_save_output(0, command, NULL, NULL);
562801
-    free(command);
562801
-
562801
-    /* run_in_shell_and_save_output always returns non-NULL */
562801
-    if (result[0] != '/')
562801
-        goto error;
562801
-
562801
-    char *newline = strchrnul(result, '\n');
562801
-    if (!newline)
562801
-        goto error;
562801
-
562801
-    *newline = '\0';
562801
-    return result;
562801
-error:
562801
-    free(result);
562801
-    error_msg_and_die("Unable to determine puppet %s path (puppet not installed?)", key);
562801
-}
562801
-
562801
-static void parse_client_auth_paths(struct ureport_server_config *config, const char *client_auth)
562801
-{
562801
-    if (client_auth == NULL)
562801
-        return;
562801
-
562801
-    if (strcmp(client_auth, "") == 0)
562801
-    {
562801
-        config->ur_client_cert = NULL;
562801
-        config->ur_client_key = NULL;
562801
-        log_notice("Not using client authentication");
562801
-    }
562801
-    else if (strcmp(client_auth, "rhsm") == 0)
562801
-    {
562801
-        config->ur_client_cert = xstrdup(RHSM_CERT_PATH);
562801
-        config->ur_client_key = xstrdup(RHSM_KEY_PATH);
562801
-    }
562801
-    else if (strcmp(client_auth, "rhsm-entitlement") == 0)
562801
-    {
562801
-        GList *certs = get_file_list(RHAP_PEM_DIR_PATH, "pem");
562801
-        if (g_list_length(certs) != 2)
562801
-        {
562801
-            log_notice(RHAP_PEM_DIR_PATH" does not contain unique cert-key files pair");
562801
-            log_notice("Not using client authentication");
562801
-            return;
562801
-        }
562801
-
562801
-        const char *cert = NULL;
562801
-        const char *key = NULL;
562801
-
562801
-        file_obj_t *fst = (file_obj_t *)certs->data;
562801
-        file_obj_t *scn = (file_obj_t *)certs->next->data;
562801
-
562801
-        if (strlen(fo_get_filename(fst)) < strlen(fo_get_filename(scn)))
562801
-        {
562801
-            cert = fo_get_filename(fst);
562801
-            key = fo_get_filename(scn);
562801
-
562801
-            config->ur_client_cert = xstrdup(fo_get_fullpath(fst));
562801
-            config->ur_client_key = xstrdup(fo_get_fullpath(scn));
562801
-        }
562801
-        else
562801
-        {
562801
-            cert = fo_get_filename(scn);
562801
-            key = fo_get_filename(fst);
562801
-
562801
-            config->ur_client_cert = xstrdup(fo_get_fullpath(scn));
562801
-            config->ur_client_key = xstrdup(fo_get_fullpath(fst));
562801
-        }
562801
-
562801
-        const bool iscomplement = prefixcmp(key, cert) != 0 || strcmp("-key", key + strlen(cert)) != 0;
562801
-        g_list_free_full(certs, (GDestroyNotify)free_file_obj);
562801
-
562801
-        if (iscomplement)
562801
-        {
562801
-            log_notice("Key file '%s' isn't complement to cert file '%s'",
562801
-                    config->ur_client_key, config->ur_client_cert);
562801
-            log_notice("Not using client authentication");
562801
-
562801
-            free(config->ur_client_cert);
562801
-            free(config->ur_client_key);
562801
-            config->ur_client_cert = NULL;
562801
-            config->ur_client_key = NULL;
562801
-
562801
-            return;
562801
-        }
562801
-
562801
-        char *certdata = xmalloc_open_read_close(config->ur_client_cert, /*no size limit*/NULL);
562801
-        if (certdata != NULL)
562801
-        {
562801
-            char *ent_data = xstrdup_between(certdata,
562801
-                    RHAP_ENT_DATA_BEGIN_TAG, RHAP_ENT_DATA_END_TAG);
562801
-
562801
-            char *sig_data = xstrdup_between(certdata,
562801
-                    RHAP_SIG_DATA_BEGIN_TAG, RHAP_SIG_DATA_END_TAG);
562801
-
562801
-            if (ent_data != NULL && sig_data != NULL)
562801
-            {
562801
-                ent_data = strremovech(ent_data, '\n');
562801
-                insert_map_string(config->ur_http_headers,
562801
-                        xstrdup("X-RH-Entitlement-Data"),
562801
-                        xasprintf(RHAP_ENT_DATA_BEGIN_TAG"%s"RHAP_ENT_DATA_END_TAG, ent_data));
562801
-
562801
-                sig_data = strremovech(sig_data, '\n');
562801
-                insert_map_string(config->ur_http_headers,
562801
-                        xstrdup("X-RH-Entitlement-Sig"),
562801
-                        xasprintf(RHAP_SIG_DATA_BEGIN_TAG"%s"RHAP_SIG_DATA_END_TAG, sig_data));
562801
-            }
562801
-            else
562801
-            {
562801
-                log_notice("Cert file '%s' doesn't contain Entitlement and RSA Signature sections", config->ur_client_cert);
562801
-                log_notice("Not using HTTP authentication headers");
562801
-            }
562801
-
562801
-            free(sig_data);
562801
-            free(ent_data);
562801
-            free(certdata);
562801
-        }
562801
-    }
562801
-    else if (strcmp(client_auth, "puppet") == 0)
562801
-    {
562801
-        config->ur_client_cert = puppet_config_print("hostcert");
562801
-        config->ur_client_key = puppet_config_print("hostprivkey");
562801
-    }
562801
-    else
562801
-    {
562801
-        char *scratch = xstrdup(client_auth);
562801
-        config->ur_client_cert = xstrdup(strtok(scratch, ":"));
562801
-        config->ur_client_key = xstrdup(strtok(NULL, ":"));
562801
-        free(scratch);
562801
-        if (config->ur_client_cert == NULL || config->ur_client_key == NULL)
562801
-            error_msg_and_die("Invalid client authentication specification");
562801
-    }
562801
-
562801
-    if (config->ur_client_cert && config->ur_client_key)
562801
-    {
562801
-        log_notice("Using client certificate: %s", config->ur_client_cert);
562801
-        log_notice("Using client private key: %s", config->ur_client_key);
562801
-    }
562801
-}
562801
-
562801
-/*
562801
- * Loads uReport configuration from various sources.
562801
- *
562801
- * Replaces a value of an already configured option only if the
562801
- * option was found in a configuration source.
562801
- *
562801
- * @param config a server configuration to be populated
562801
- */
562801
-static void load_ureport_server_config(struct ureport_server_config *config, map_string_t *settings)
562801
-{
562801
-    VALUE_FROM_CONF("URL", config->ur_url, (const char *));
562801
-    VALUE_FROM_CONF("SSLVerify", config->ur_ssl_verify, string_to_bool);
562801
-
562801
-    bool include_auth = false;
562801
-    VALUE_FROM_CONF("IncludeAuthData", include_auth, string_to_bool);
562801
-
562801
-    if (include_auth)
562801
-    {
562801
-        const char *auth_items = NULL;
562801
-        VALUE_FROM_CONF("AuthDataItems", auth_items, (const char *));
562801
-        config->ur_prefs.urp_auth_items = parse_list(auth_items);
562801
-
562801
-        if (config->ur_prefs.urp_auth_items == NULL)
562801
-            log_warning("IncludeAuthData set to 'yes' but AuthDataItems is empty.");
562801
-    }
562801
-
562801
-    const char *client_auth = NULL;
562801
-    VALUE_FROM_CONF("SSLClientAuth", client_auth, (const char *));
562801
-    parse_client_auth_paths(config, client_auth);
562801
-}
562801
-
562801
-struct ureport_server_response {
562801
-    bool is_error;
562801
-    char *value;
562801
-    char *message;
562801
-    char *bthash;
562801
-    GList *reported_to_list;
562801
-    char *solution;
562801
-};
562801
-
562801
-void free_ureport_server_response(struct ureport_server_response *resp)
562801
-{
562801
-    if (!resp)
562801
-        return;
562801
-
562801
-    free(resp->solution);
562801
-    g_list_free_full(resp->reported_to_list, g_free);
562801
-    free(resp->bthash);
562801
-    free(resp->message);
562801
-    free(resp->value);
562801
-    free(resp);
562801
-}
562801
-
562801
-static char *parse_solution_from_json_list(struct json_object *list, GList **reported_to)
562801
-{
562801
-    json_object *list_elem, *struct_elem;
562801
-    const char *cause, *note, *url;
562801
-    struct strbuf *solution_buf = strbuf_new();
562801
-
562801
-    const unsigned length = json_object_array_length(list);
562801
-
562801
-    const char *one_format = _("Your problem seems to be caused by %s\n\n%s\n");
562801
-    if (length > 1)
562801
-    {
562801
-        strbuf_append_str(solution_buf, _("Your problem seems to be caused by one of the following:\n"));
562801
-        one_format = "\n* %s\n\n%s\n";
562801
-    }
562801
-
562801
-    bool empty = true;
562801
-    for (unsigned i = 0; i < length; ++i)
562801
-    {
562801
-        list_elem = json_object_array_get_idx(list, i);
562801
-        if (!list_elem)
562801
-            continue;
562801
-
562801
-        if (!json_object_object_get_ex(list_elem, "cause", &struct_elem))
562801
-            continue;
562801
-
562801
-        cause = json_object_get_string(struct_elem);
562801
-            continue;
562801
-
562801
-        if (!json_object_object_get_ex(list_elem, "note", &struct_elem))
562801
-            continue;
562801
-
562801
-        note = json_object_get_string(struct_elem);
562801
-        if (!note)
562801
-            continue;
562801
-
562801
-        empty = false;
562801
-        strbuf_append_strf(solution_buf, one_format, cause, note);
562801
-
562801
-        if (!json_object_object_get_ex(list_elem, "url", &struct_elem))
562801
-            continue;
562801
-
562801
-        url = json_object_get_string(struct_elem);
562801
-        if (url)
562801
-        {
562801
-            char *reported_to_line = xasprintf("%s: URL=%s", cause, url);
562801
-            *reported_to = g_list_append(*reported_to, reported_to_line);
562801
-        }
562801
-    }
562801
-
562801
-    if (empty)
562801
-    {
562801
-        strbuf_free(solution_buf);
562801
-        return NULL;
562801
-    }
562801
-
562801
-    return strbuf_free_nobuf(solution_buf);
562801
-}
562801
-
562801
-/* reported_to json element should be a list of structures
562801
-{ "reporter": "Bugzilla",
562801
-  "type": "url",
562801
-  "value": "https://bugzilla.redhat.com/show_bug.cgi?id=XYZ" } */
562801
-static GList *parse_reported_to_from_json_list(struct json_object *list)
562801
-{
562801
-    int i;
562801
-    json_object *list_elem, *struct_elem;
562801
-    const char *reporter, *value, *type;
562801
-    char *reported_to_line, *prefix;
562801
-    GList *result = NULL;
562801
-
562801
-    for (i = 0; i < json_object_array_length(list); ++i)
562801
-    {
562801
-        prefix = NULL;
562801
-        list_elem = json_object_array_get_idx(list, i);
562801
-        if (!list_elem)
562801
-            continue;
562801
-
562801
-        if (!json_object_object_get_ex(list_elem, "reporter", &struct_elem))
562801
-            continue;
562801
-
562801
-        reporter = json_object_get_string(struct_elem);
562801
-        if (!reporter)
562801
-            continue;
562801
-
562801
-        if (!json_object_object_get_ex(list_elem, "value", &struct_elem))
562801
-            continue;
562801
-
562801
-        value = json_object_get_string(struct_elem);
562801
-        if (!value)
562801
-            continue;
562801
-
562801
-        if (!json_object_object_get_ex(list_elem, "type", &struct_elem))
562801
-            continue;
562801
-
562801
-        type = json_object_get_string(struct_elem);
562801
-        if (type)
562801
-        {
562801
-            if (strcasecmp("url", type) == 0)
562801
-                prefix = xstrdup("URL=");
562801
-            else if (strcasecmp("bthash", type) == 0)
562801
-                prefix = xstrdup("BTHASH=");
562801
-        }
562801
-
562801
-        if (!prefix)
562801
-            prefix = xstrdup("");
562801
-
562801
-        reported_to_line = xasprintf("%s: %s%s", reporter, prefix, value);
562801
-        free(prefix);
562801
-
562801
-        result = g_list_append(result, reported_to_line);
562801
-    }
562801
-
562801
-    return result;
562801
-}
562801
-
562801
-/*
562801
- * Reponse samples:
562801
- * {"error":"field 'foo' is required"}
562801
- * {"response":"true"}
562801
- * {"response":"false"}
562801
- */
562801
-static struct ureport_server_response *ureport_server_parse_json(json_object *json)
562801
-{
562801
-    json_object *obj = NULL;
562801
-    if (json_object_object_get_ex(json, "error", &obj))
562801
-    {
562801
-        struct ureport_server_response *out_response = xzalloc(sizeof(*out_response));
562801
-        out_response->is_error = true;
562801
-        /*
562801
-         * Used to use json_object_to_json_string(obj), but it returns
562801
-         * the string in quote marks (") - IOW, json-formatted string.
562801
-         */
562801
-        out_response->value = xstrdup(json_object_get_string(obj));
562801
-        return out_response;
562801
-    }
562801
-
562801
-    if (json_object_object_get_ex(json, "result", &obj))
562801
-    {
562801
-        struct ureport_server_response *out_response = xzalloc(sizeof(*out_response));
562801
-        out_response->value = xstrdup(json_object_get_string(obj));
562801
-
562801
-        json_object *message = NULL;
562801
-        if (json_object_object_get_ex(json, "message", &message))
562801
-            out_response->message = xstrdup(json_object_get_string(message));
562801
-
562801
-        json_object *bthash = NULL;
562801
-        if (json_object_object_get_ex(json, "bthash", &bthash))
562801
-            out_response->bthash = xstrdup(json_object_get_string(bthash));
562801
-
562801
-        json_object *reported_to_list = NULL;
562801
-        if (json_object_object_get_ex(json, "reported_to", &reported_to_list))
562801
-            out_response->reported_to_list = parse_reported_to_from_json_list(reported_to_list);
562801
-
562801
-        json_object *solutions = NULL;
562801
-        if (json_object_object_get_ex(json, "solutions", &solutions))
562801
-            out_response->solution = parse_solution_from_json_list(solutions, &(out_response->reported_to_list));
562801
-
562801
-        return out_response;
562801
-    }
562801
-
562801
-    return NULL;
562801
-}
562801
-
562801
-static struct ureport_server_response *get_server_response(post_state_t *post_state, struct ureport_server_config *config)
562801
-{
562801
-    /* Previously, the condition here was (post_state->errmsg[0] != '\0')
562801
-     * however when the server asks for optional client authentication and we do not have the certificates,
562801
-     * then post_state->errmsg contains "NSS: client certificate not found (nickname not specified)" even though
562801
-     * the request succeeded.
562801
-     */
562801
-    if (post_state->curl_result != CURLE_OK)
562801
-    {
562801
-        error_msg(_("Failed to upload uReport to the server '%s' with curl: %s"), config->ur_url, post_state->errmsg);
562801
-        return NULL;
562801
-    }
562801
-
562801
-    if (post_state->http_resp_code == 404)
562801
-    {
562801
-        error_msg(_("The URL '%s' does not exist (got error 404 from server)"), config->ur_url);
562801
-        return NULL;
562801
-    }
562801
-
562801
-    if (post_state->http_resp_code == 500)
562801
-    {
562801
-        error_msg(_("The server at '%s' encountered an internal error (got error 500)"), config->ur_url);
562801
-        return NULL;
562801
-    }
562801
-
562801
-    if (post_state->http_resp_code == 503)
562801
-    {
562801
-        error_msg(_("The server at '%s' currently can't handle the request (got error 503)"), config->ur_url);
562801
-        return NULL;
562801
-    }
562801
-
562801
-    if (post_state->http_resp_code != 202
562801
-            && post_state->http_resp_code != 400
562801
-            && post_state->http_resp_code != 413)
562801
-    {
562801
-        /* can't print better error message */
562801
-        error_msg(_("Unexpected HTTP response from '%s': %d"), config->ur_url, post_state->http_resp_code);
562801
-        log_notice("%s", post_state->body);
562801
-        return NULL;
562801
-    }
562801
-
562801
-    json_object *const json = json_tokener_parse(post_state->body);
562801
-
562801
-    if (is_error(json))
562801
-    {
562801
-        error_msg(_("Unable to parse response from ureport server at '%s'"), config->ur_url);
562801
-        log_notice("%s", post_state->body);
562801
-        json_object_put(json);
562801
-        return NULL;
562801
-    }
562801
-
562801
-    struct ureport_server_response *response = ureport_server_parse_json(json);
562801
-    json_object_put(json);
562801
-
562801
-    if (!response)
562801
-        error_msg(_("The response from '%s' has invalid format"), config->ur_url);
562801
-    else if ((post_state->http_resp_code == 202 && response->is_error)
562801
-                || (post_state->http_resp_code != 202 && !response->is_error))
562801
-    {
562801
-        /* HTTP CODE 202 means that call was successful but the response */
562801
-        /* has an error message */
562801
-        error_msg(_("Type mismatch has been detected in the response from '%s'"), config->ur_url);
562801
-    }
562801
-
562801
-    return response;
562801
-}
562801
-
562801
-typedef post_state_t *(*attach_handler)(const char *, void *, struct ureport_server_config *);
562801
-
562801
-static post_state_t *wrp_ureport_attach_rhbz(const char *ureport_hash, int *rhbz_bug,
562801
-        struct ureport_server_config *config)
562801
-{
562801
-    return ureport_attach_rhbz(ureport_hash, *rhbz_bug, config);
562801
-}
562801
-
562801
-static bool perform_attach(struct ureport_server_config *config, const char *ureport_hash,
562801
-        attach_handler handler, void *args)
562801
-{
562801
-    char *dest_url = concat_path_file(config->ur_url, ATTACH_URL_SFX);
562801
-    const char *old_url = config->ur_url;
562801
-    config->ur_url = dest_url;
562801
-    post_state_t *post_state = handler(ureport_hash, args, config);
562801
-    config->ur_url = old_url;
562801
-    free(dest_url);
562801
-
562801
-    struct ureport_server_response *resp = get_server_response(post_state, config);
562801
-    free_post_state(post_state);
562801
-    /* don't use str_bo_bool() because we require "true" string */
562801
-    const int result = !resp || resp->is_error || strcmp(resp->value,"true") != 0;
562801
-
562801
-    if (resp && resp->is_error)
562801
-    {
562801
-        error_msg(_("The server at '%s' responded with an error: '%s'"), config->ur_url, resp->value);
562801
-    }
562801
-
562801
-    free_ureport_server_response(resp);
562801
-
562801
-    return result;
562801
-}
562801
-
562801
 int main(int argc, char **argv)
562801
 {
562801
     setlocale(LC_ALL, "");
562801
@@ -508,18 +32,8 @@ int main(int argc, char **argv)
562801
 
562801
     abrt_init(argv);
562801
 
562801
-    struct ureport_server_config config = {
562801
-        .ur_url = NULL,
562801
-        .ur_ssl_verify = true,
562801
-        .ur_client_cert = NULL,
562801
-        .ur_client_key = NULL,
562801
-        .ur_http_headers = NULL,
562801
-        {
562801
-            .urp_auth_items = NULL,
562801
-        },
562801
-    };
562801
-
562801
-    config.ur_http_headers = new_map_string();
562801
+    struct ureport_server_config config;
562801
+    ureport_server_config_init(&config);
562801
 
562801
     enum {
562801
         OPT_v = 1 << 0,
562801
@@ -532,7 +46,7 @@ int main(int argc, char **argv)
562801
 
562801
     int ret = 1; /* "failure" (for now) */
562801
     bool insecure = !config.ur_ssl_verify;
562801
-    const char *conf_file = CONF_FILE_PATH;
562801
+    const char *conf_file = UREPORT_CONF_FILE_PATH;
562801
     const char *arg_server_url = NULL;
562801
     const char *client_auth = NULL;
562801
     GList *auth_items = NULL;
562801
@@ -575,7 +89,7 @@ int main(int argc, char **argv)
562801
         "\n"
562801
         "Upload micro report or add an attachment to a micro report\n"
562801
         "\n"
562801
-        "Reads the default configuration from "CONF_FILE_PATH
562801
+        "Reads the default configuration from "UREPORT_CONF_FILE_PATH
562801
     );
562801
 
562801
     unsigned opts = parse_opts(argc, argv, program_options, program_usage_string);
562801
@@ -583,14 +97,14 @@ int main(int argc, char **argv)
562801
     map_string_t *settings = new_map_string();
562801
     load_conf_file(conf_file, settings, /*skip key w/o values:*/ false);
562801
 
562801
-    load_ureport_server_config(&config, settings);
562801
+    ureport_server_config_load(&config, settings);
562801
 
562801
     if (opts & OPT_u)
562801
         config.ur_url = arg_server_url;
562801
     if (opts & OPT_k)
562801
         config.ur_ssl_verify = !insecure;
562801
     if (opts & OPT_t)
562801
-        parse_client_auth_paths(&config, client_auth);
562801
+        ureport_server_config_set_client_auth(&config, client_auth);
562801
     if (opts & OPT_i)
562801
     {
562801
         g_list_free_full(config.ur_prefs.urp_auth_items, free);
562801
@@ -600,8 +114,6 @@ int main(int argc, char **argv)
562801
     if (!config.ur_url)
562801
         error_msg_and_die("You need to specify server URL");
562801
 
562801
-    post_state_t *post_state = NULL;
562801
-
562801
     if (ureport_hash && ureport_hash_from_rt)
562801
         error_msg_and_die("You need to pass either -a bthash or -A");
562801
 
562801
@@ -654,7 +166,7 @@ int main(int argc, char **argv)
562801
 
562801
     if (email_address_from_env)
562801
     {
562801
-        VALUE_FROM_CONF("ContactEmail", email_address, (const char *));
562801
+        UREPORT_OPTION_VALUE_FROM_CONF(settings, "ContactEmail", email_address, (const char *));
562801
 
562801
         if (!email_address)
562801
             error_msg_and_die(_("Neither environment variable 'uReport_ContactEmail' nor configuration option 'ContactEmail' is set"));
562801
@@ -667,13 +179,13 @@ int main(int argc, char **argv)
562801
 
562801
         if (rhbz_bug >= 0)
562801
         {
562801
-            if (perform_attach(&config, ureport_hash, (attach_handler)wrp_ureport_attach_rhbz, (void *)&rhbz_bug))
562801
+            if (ureport_attach_int(ureport_hash, "RHBZ", rhbz_bug, &config))
562801
                 goto finalize;
562801
         }
562801
 
562801
         if (email_address)
562801
         {
562801
-            if (perform_attach(&config, ureport_hash, (attach_handler)ureport_attach_email, (void *)email_address))
562801
+            if (ureport_attach_string(ureport_hash, "email", email_address, &config))
562801
                 goto finalize;
562801
         }
562801
 
562801
@@ -683,95 +195,48 @@ int main(int argc, char **argv)
562801
     if (!ureport_hash && (rhbz_bug >= 0 || email_address))
562801
         error_msg_and_die(_("You need to specify bthash of the uReport to attach."));
562801
 
562801
-    /* -b, -a nor -r were specified - upload uReport from dump_dir */
562801
-    const char *server_url = config.ur_url;
562801
-    char *dest_url = concat_path_file(config.ur_url, REPORT_URL_SFX);
562801
-    config.ur_url = dest_url;
562801
-
562801
     char *json_ureport = ureport_from_dump_dir_ext(dump_dir_path, &(config.ur_prefs));
562801
     if (!json_ureport)
562801
     {
562801
         error_msg(_("Not uploading an empty uReport"));
562801
-        goto format_err;
562801
+        goto finalize;
562801
     }
562801
 
562801
-    post_state = ureport_post(json_ureport, &config);
562801
+    struct ureport_server_response *response = ureport_submit(json_ureport, &config);
562801
     free(json_ureport);
562801
 
562801
-    if (!post_state)
562801
-    {
562801
-        error_msg(_("Failed on submitting the problem"));
562801
-        goto format_err;
562801
-    }
562801
-
562801
-    struct ureport_server_response *response = get_server_response(post_state, &config);
562801
-
562801
     if (!response)
562801
-        goto format_err;
562801
+        goto finalize;
562801
 
562801
-    if (!response->is_error)
562801
+    if (!response->urr_is_error)
562801
     {
562801
-        log_notice("is known: %s", response->value);
562801
+        log_notice("is known: %s", response->urr_value);
562801
         ret = 0; /* "success" */
562801
 
562801
-        dd = dd_opendir(dump_dir_path, /* flags */ 0);
562801
-        if (!dd)
562801
+        if (!ureport_server_response_save_in_dump_dir(response, dump_dir_path, &config))
562801
             xfunc_die();
562801
 
562801
-        if (response->bthash)
562801
-        {
562801
-            char *msg = xasprintf("uReport: BTHASH=%s", response->bthash);
562801
-            add_reported_to(dd, msg);
562801
-            free(msg);
562801
-
562801
-            char *bthash_url = concat_path_file(server_url, BTHASH_URL_SFX);
562801
-            msg = xasprintf("ABRT Server: URL=%s%s", bthash_url, response->bthash);
562801
-            add_reported_to(dd, msg);
562801
-            free(msg);
562801
-            free(bthash_url);
562801
-        }
562801
-
562801
-        if (response->reported_to_list)
562801
-        {
562801
-            for (GList *e = response->reported_to_list; e; e = g_list_next(e))
562801
-                add_reported_to(dd, e->data);
562801
-        }
562801
-
562801
-        if (response->solution)
562801
-            dd_save_text(dd, FILENAME_NOT_REPORTABLE, response->solution);
562801
-
562801
-        dd_close(dd);
562801
-
562801
         /* If a reported problem is not known then emit NEEDMORE */
562801
-        if (strcmp("true", response->value) == 0)
562801
+        if (strcmp("true", response->urr_value) == 0)
562801
         {
562801
             log(_("This problem has already been reported."));
562801
-            if (response->message)
562801
-                log(response->message);
562801
+            if (response->urr_message)
562801
+                log(response->urr_message);
562801
 
562801
             ret = EXIT_STOP_EVENT_RUN;
562801
         }
562801
     }
562801
     else
562801
-    {
562801
-        error_msg(_("Server responded with an error: '%s'"), response->value);
562801
-    }
562801
-
562801
-    free_ureport_server_response(response);
562801
+        error_msg(_("Server responded with an error: '%s'"), response->urr_value);
562801
 
562801
-format_err:
562801
-    free_post_state(post_state);
562801
-    free(dest_url);
562801
+    ureport_server_response_free(response);
562801
 
562801
 finalize:
562801
-    if (config.ur_prefs.urp_auth_items != auth_items)
562801
-        g_list_free_full(config.ur_prefs.urp_auth_items, free);
562801
-
562801
-    free_map_string(config.ur_http_headers);
562801
+    if (config.ur_prefs.urp_auth_items == auth_items)
562801
+        config.ur_prefs.urp_auth_items = NULL;
562801
 
562801
     free_map_string(settings);
562801
-    free(config.ur_client_cert);
562801
-    free(config.ur_client_key);
562801
+    ureport_server_config_destroy(&config);
562801
 
562801
     return ret;
562801
 }
562801
-- 
562801
1.8.3.1
562801