rgw: append query string to redirect URL if present

Ensure that a "?" is added to the redirect URL when query strings
are present.

Fixes: https://tracker.ceph.com/issues/69139
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
(cherry picked from commit 8de984d413d3b094fd49d9c2c7641d668d734156)

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 8213779d3f740f5bfe9eefc5ec1284e24638e496..1588ccce96d2633a38778bb089fadcd93c29fa0f 100644 (file)
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -666,8 +666,10 @@ static void build_redirect_url(req_state *s, const string& redirect_base, string
     dest_uri = dest_uri.substr(0, dest_uri.size() - 1);
   }
   dest_uri += s->info.request_uri;
-  dest_uri += "?";
-  dest_uri += s->info.request_params;
+  if (!s->info.request_params.empty()) {
+    dest_uri += "?";
+    dest_uri += s->info.request_params;
+  }
 }
 
 void abort_early(req_state *s, RGWOp* op, int err_no,