Merge pull request ceph#60970 from clwluvw/redirect-qs

ivancich · web-flow · commit 954ca4589b0b · 2024-12-18T08:56:08.000-05:00
rgw: append query string to redirect URL if present

Reviewed-by: Casey Bodley &lt;cbodley@redhat.com&gt;
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,`