New subject: [PATCH] massage RHTSupport URL into one which points to human-usabel web UI

Friday, 20 August 2010

RHTSupport people asked for this. Run-tested.
-- 
vda


diff -x '*.po' -d -urpN abrt.2/lib/plugins/RHTSupport.cpp
abrt.3/lib/plugins/RHTSupport.cpp

--- abrt.2/lib/plugins/RHTSupport.cpp	2010-08-18 13:41:27.000000000 +0200
+++ abrt.3/lib/plugins/RHTSupport.cpp	2010-08-20 17:26:01.810918212 +0200
@@ -175,7 +175,7 @@ string CReporterRHticket::Report(const m
     if (tar_fdopen(&tar, pipe_from_parent_to_child[1], tempfile,
                 /*fileops:(standard)*/ NULL, O_WRONLY | O_CREAT, 0644, TAR_GNU) != 0)
     {
-        retval = "can't create temporary file in
"LOCALSTATEDIR"/run/abrt";
+        retval = "error: can't create temporary file in
"LOCALSTATEDIR"/run/abrt";
         goto ret;
     }
 
@@ -210,7 +210,7 @@ string CReporterRHticket::Report(const m
                         /*binary           */ 1);
                 if (tar_append_file(tar, (char*)content, (char*)(xml_name.c_str())) !=
0)
                 {
-                    retval = "can't create temporary file in
"LOCALSTATEDIR"/run/abrt";
+                    retval = "error: can't create temporary file in
"LOCALSTATEDIR"/run/abrt";
                     goto ret;
                 }
             }
@@ -237,7 +237,7 @@ string CReporterRHticket::Report(const m
          || full_write(tar_fd(tar), block, len512) != len512
          || tar_close(tar) != 0
         ) {
-            retval = "can't create temporary file in
"LOCALSTATEDIR"/run/abrt";
+            retval = "error: can't create temporary file in
"LOCALSTATEDIR"/run/abrt";
             goto ret;
         }
         tar = NULL;
diff -x '*.po' -d -urpN abrt.2/lib/utils/abrt_rh_support.cpp
abrt.3/lib/utils/abrt_rh_support.cpp
--- abrt.2/lib/utils/abrt_rh_support.cpp	2010-08-17 19:17:22.000000000 +0200
+++ abrt.3/lib/utils/abrt_rh_support.cpp	2010-08-20 17:50:51.268918429 +0200
@@ -359,6 +359,40 @@ make_response(const char* title, const c
 //<response><title>Case Created and Report
Attached</title><body></body><URL
href="http://support-services-devel.gss.redhat.com:8080/Strata/cases/00005129/attachments/ccbf3e65-b941-3db7-a016-6a3831691a32">New
Case URL</URL></response>
 #endif
 
+static char* process_location(const char *url)
+{
+    const char *api = strstr(url, "://api.");
+    const char *after_api;
+    if (api)
+    {
+        after_api = api + strlen("://api.");
+        api += 3; // skip "://"
+    } else {
+        after_api = api = url;
+    }
+
+    const char *rs = strstr(after_api, "/rs/");
+    const char *after_rs;
+    const char *repl_rs;
+    if (rs)
+    {
+        after_rs = rs + strlen("/rs");
+        rs += 1; // skip "/"
+        repl_rs = "support";
+    } else {
+        after_rs = rs = after_api;
+        repl_rs = "";
+    }
+
+    char *r = xasprintf("%.*s" "%.*s" "%s" "%s",
+                (int)(api - url), url, // the part from start to "api."
+                (int)(rs - after_api), after_api, // the part from end of
"://api." to start of "rs/"
+                repl_rs, // replacement "support"
+                after_rs // part after "/rs"
+    );
+    return r;
+}
+
 char*
 send_report_to_new_case(const char* baseURL,
                 const char* username,
@@ -479,14 +513,18 @@ send_report_to_new_case(const char* base
                 else /* only body exists */
                     errmsg = atch_state->body;
             }
-            /* Note: to prevent URL misparsing, make sure to delimit
-             * case_location only using spaces */
-            retval = xasprintf("Case created: %s but report attachment failed (HTTP
code %d)%s%s",
-                    case_location,
-                    atch_state->http_resp_code,
-                    errmsg ? ": " : "",
-                    errmsg ? errmsg : ""
-	    );
+            {
+                /* Note: to prevent URL misparsing, make sure to delimit
+                 * case_location only using spaces */
+                char *processed_loc = process_location(case_location);
+                retval = xasprintf("Case created: %s but report attachment failed
(HTTP code %d)%s%s",
+                        processed_loc,
+                        atch_state->http_resp_code,
+                        errmsg ? ": " : "",
+                        errmsg ? errmsg : ""
+                );
+                free(processed_loc);
+            }
             break;
 
         case 200:
@@ -501,7 +539,9 @@ send_report_to_new_case(const char* base
             //                case_state->body,
             //                atch_state->body);
             //}
-            retval = xasprintf("Case created: %s", /*body,*/ case_location);
+            char *processed_loc = process_location(case_location);
+            retval = xasprintf("Case created: %s", /*body,*/ processed_loc);
+            free(processed_loc);
         } /* switch (attach HTTP code) */
         free_abrt_post_state(atch_state);
 


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[PATCH] massage RHTSupport URL into one which points to human-usabel web UI