]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: append query string to redirect URL if present 60970/head
authorSeena Fallah <seenafallah@gmail.com>
Fri, 6 Dec 2024 00:44:46 +0000 (01:44 +0100)
committerSeena Fallah <seenafallah@gmail.com>
Fri, 6 Dec 2024 00:44:46 +0000 (01:44 +0100)
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>
src/rgw/rgw_rest.cc

index 03241b7369ac3c4144bb09e5c59ec092a84c4264..0630c99c9c0c647decf4f49e04e107daf7f395f1 100644 (file)
@@ -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,