diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-11-01T17·33+0100 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-11-03T00·31+0100 |
| commit | 310567922666472c01c69912c269706fb6bb1921 (patch) | |
| tree | f04adf0729b733037921c6c7eaf12301723fb0e1 | |
| parent | 1969f357b7f9abbff82b613b88ae53b84ff4e483 (diff) | |
Don't freak out if we get a 403 from S3
As far as we're concerned, not being able to access a file just means the file is missing. Plus, AWS explicitly goes out of its way to return a 403 if the file is missing and the requester doesn't have permission to list the bucket. Also getting rid of an old hack that Eelco said was only relevant to an older AWS SDK.
| -rw-r--r-- | src/libstore/s3-binary-cache-store.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index 5fc7371a5198..6a0f19238add 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -241,8 +241,8 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore auto & error = res.GetError(); if (error.GetErrorType() == Aws::S3::S3Errors::RESOURCE_NOT_FOUND || error.GetErrorType() == Aws::S3::S3Errors::NO_SUCH_KEY - || (error.GetErrorType() == Aws::S3::S3Errors::UNKNOWN // FIXME - && error.GetMessage().find("404") != std::string::npos)) + // If bucket listing is disabled, 404s turn into 403s + || error.GetErrorType() == Aws::S3::S3Errors::ACCESS_DENIED) return false; throw Error(format("AWS error fetching '%s': %s") % path % error.GetMessage()); } |