]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13992 from dreamhost/wip-19264
authorYuri Weinstein <yuri.weinstein@gmail.com>
Thu, 2 Nov 2017 16:47:31 +0000 (09:47 -0700)
committerGitHub <noreply@github.com>
Thu, 2 Nov 2017 16:47:31 +0000 (09:47 -0700)
rgw: fix Swift container naming rules.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
1  2 
src/rgw/rgw_rest.cc
src/rgw/rgw_rest_swift.cc

Simple merge
index ba1822f38a16ae37f4f745f2724e82e15e840e82,22b6dcff9629e3af97f6eefd0e4c667d5d0af625..ffc16aba023e174ad8b60e6b0245f2cd24f99d8c
@@@ -2751,9 -2225,11 +2751,11 @@@ int RGWHandler_REST_SWIFT::validate_buc
  
    const char *s = bucket.c_str();
  
 -  for (int i = 0; i < len; ++i, ++s) {
 +  for (size_t i = 0; i < len; ++i, ++s) {
      if (*(unsigned char *)s == 0xff)
        return -ERR_INVALID_BUCKET_NAME;
+     if (*(unsigned char *)s == '/')
+       return -ERR_INVALID_BUCKET_NAME;
    }
  
    return 0;