Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

S3 fixture should report 404 on unknown bucket #31782

Merged
merged 1 commit into from
Jul 4, 2018
Merged

S3 fixture should report 404 on unknown bucket #31782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions plugins/repository-s3/src/test/java/org/elasticsearch/repositories/s3/AmazonS3Fixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,13 @@ protected Response handle(final Request request) throws IOException {
if (handler != null) {
final String bucket = request.getParam("bucket");
if (bucket != null && permittedBucket.equals(bucket) == false) {
// allow a null bucket to support bucket-free APIs
return newError(request.getId(), RestStatus.FORBIDDEN, "AccessDenied", "Bad bucket", "");
// allow a null bucket to support the multi-object-delete API which
// passes the bucket name in the host header instead of the URL.
if (buckets.containsKey(bucket)) {
return newError(request.getId(), RestStatus.FORBIDDEN, "AccessDenied", "Bad bucket", "");
} else {
return newBucketNotFoundError(request.getId(), bucket);
}
}
return handler.handle(request);
} else {
Expand Down
4 changes: 0 additions & 4 deletions ...c/test/resources/rest-api-spec/test/repository_s3/20_repository_permanent_credentials.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,6 @@ setup:
---
"Register a repository with a non existing bucket":

- skip:
version: all
reason: to be fixed

- do:
catch: /repository_exception/
snapshot.create_repository:
Expand Down
4 changes: 0 additions & 4 deletions ...c/test/resources/rest-api-spec/test/repository_s3/30_repository_temporary_credentials.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,6 @@ setup:
---
"Register a repository with a non existing bucket":

- skip:
version: all
reason: to be fixed

- do:
catch: /repository_exception/
snapshot.create_repository:
Expand Down