From 8ae39c8538cef760332336286da7636b4397879e Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Jun 2020 12:44:45 +0200 Subject: [PATCH] rgw: fix double slash (//) killing the gateway When a bucket is inialized as a static website, a curl request on the bucket with double slash kills the gateway. The problem is on the URL handling of the subdirectory, which tries to remove the last slash of any URL, so when only / is given as a sub-directory, this results to an empty string. Fixes: https://tracker.ceph.com/issues/41225 Signed-off-by: Theofilos Mouratidis (cherry picked from commit 626330c504b1af8393986bd0553786c3031422cd) --- src/rgw/rgw_rest_s3.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 34012e99152f8..a4cb2669c8940 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -4097,7 +4097,7 @@ bool RGWHandler_REST_S3Website::web_dir() const { if (subdir_name.empty()) { return false; - } else if (subdir_name.back() == '/') { + } else if (subdir_name.back() == '/' && subdir_name.size() > 1) { subdir_name.pop_back(); } -- 2.39.5