rgw: append query string to redirect URL if present

clwluvw · clwluvw · commit 8de984d413d3 · 2024-12-06T01:44:46.000+01:00
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>
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -666,8 +666,10 @@ static void build_redirect_url(req_state *s, const string& redirect_base, string`
`666`	`666`	`dest_uri = dest_uri.substr(0, dest_uri.size() - 1);`
`667`	`667`	`}`
`668`	`668`	`dest_uri += s->info.request_uri;`
`669`		`- dest_uri += "?";`
`670`		`- dest_uri += s->info.request_params;`
	`669`	`+ if (!s->info.request_params.empty()) {`
	`670`	`+ dest_uri += "?";`
	`671`	`+ dest_uri += s->info.request_params;`
	`672`	`+ }`
`671`	`673`	`}`
`672`	`674`
`673`	`675`	`void abort_early(req_state s, RGWOp op, int err_no,`