rgw: fix Swift container naming rules. #13992
Conversation
|
@robbat2 , can you add a test for this in swift test please |
| @@ -2228,6 +2228,8 @@ int RGWHandler_REST_SWIFT::validate_bucket_name(const string& bucket) | |||
| for (int i = 0; i < len; ++i, ++s) { | |||
| if (*(unsigned char *)s == 0xff) | |||
| return -ERR_INVALID_BUCKET_NAME; | |||
| if (*(unsigned char *)s == '/') | |||
There was a problem hiding this comment.
@robbat2 how about putting this check in RGWHandler_REST::validate_bucket_name? S3 also needs this.
There was a problem hiding this comment.
The S3 path doesn't call RGWHandler_REST::validate_bucket_name, but I did add it for the moment.
There was a problem hiding this comment.
Thanks, I will add RGWHandler_REST::validate_bucket_name to S3
Swift containers are declared in the upstream documentation as 1-256 bytes of UTF-8, and the only forbidden character is '/'. We did not previously enforce the no-slash rule. Also ensure that the common validate_bucket_name does not permit '/' or 0xFF either (it's also banned in S3). See-Also: https://docs.openstack.org/developer/swift/api/object_api_v1_overview.html Fixes: http://tracker.ceph.com/issues/19264 Backport: hammer, jewel Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
|
jenkins test this please |
|
jenkins test this please |
| if (*(unsigned char *)s == '/') | ||
| return -ERR_INVALID_BUCKET_NAME; | ||
| } | ||
|
|
There was a problem hiding this comment.
Why not use cpp style as
for (auto c : bucket) {
if ( c == 0xff ||
c == '/')
return -ERR_INVALID_BUCKET_NAME;
}There was a problem hiding this comment.
No reason I suppose, my style just shows how I learnt C++ ~20 years ago.
There was a problem hiding this comment.
Just a suggestion, This code looks good to me 👍
There was a problem hiding this comment.
i do prefer the ranged-for loop, with the small adjustment of
for (unsigned char c : bucket) {
There was a problem hiding this comment.
We can probably drop the whole C++ -> C string conversion and just do a string.find() or probably even using std::any_of
|
jenkins test this please |
|
test this please |
Swift containers are declared in the upstream documentation as 1-256
bytes of UTF-8, and the only forbidden character is '/'.
We did not previously enforce the no-slash rule.
See-Also: https://docs.openstack.org/developer/swift/api/object_api_v1_overview.html
Fixes: http://tracker.ceph.com/issues/19264
Backport: hammer, jewel
Signed-off-by: Robin H. Johnson robin.johnson@dreamhost.com