]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Fix Host->bucket fallback logic inversion
authorRobin H. Johnson <robin.johnson@dreamhost.com>
Thu, 25 Aug 2016 15:04:34 +0000 (08:04 -0700)
committerAbhishek Varshney <abhishek.varshney@flipkart.com>
Thu, 3 Nov 2016 09:02:04 +0000 (14:32 +0530)
The logic (added in 46aae19ee) for falling back to just using the hostname as
the possible bucket name contained an accidental inversion, because
RGWHandler_REST::validate_bucket_name returns success as zero.

Backport: jewel
Fixes: http://tracker.ceph.com/issues/17136
Re-Fixes: http://tracker.ceph.com/issues/15975
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit 70e0289644f4a7205e6c2f75a094ece8ab5ed97c)

src/rgw/rgw_rest.cc

index e485d99f40ce883370520d3643390dc1efef1e34..9065136e37d455a22e0f936e678dc0f626efc0d2 100644 (file)
@@ -1770,7 +1770,7 @@ int RGWREST::preprocess(struct req_state *s, RGWClientIO* cio)
     if (subdomain.empty()
         && (domain.empty() || domain != info.host)
         && !looks_like_ip_address(info.host.c_str())
-        && RGWHandler_REST::validate_bucket_name(info.host)) {
+        && RGWHandler_REST::validate_bucket_name(info.host) == 0) {
       subdomain.append(info.host);
       in_hosted_domain = 1;
     }