mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Handle default private ACL 

References:

http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTacl.html
http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUTacl.html
pull/50/head
Andrew Gaul 2015-02-27 14:05:49 -08:00
rodzic abe6b9ddf1
commit 7dbdc4faf8
1 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
Wyświetl plik

@ -505,11 +505,11 @@ final class S3ProxyHandler extends AbstractHandler {
ContainerAccess access; ContainerAccess access;
String cannedAcl = request.getHeader("x-amz-acl"); String cannedAcl = request.getHeader("x-amz-acl");
if ("private".equals(cannedAcl)) { if (cannedAcl == null || "private".equals(cannedAcl)) {
access = ContainerAccess.PRIVATE; access = ContainerAccess.PRIVATE;
} else if ("public-read".equals(cannedAcl)) { } else if ("public-read".equals(cannedAcl)) {
access = ContainerAccess.PUBLIC_READ; access = ContainerAccess.PUBLIC_READ;
} else if (cannedAcl == null || CANNED_ACLS.contains(cannedAcl)) { } else if (CANNED_ACLS.contains(cannedAcl)) {
throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED); throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED);
} else { } else {
response.sendError(HttpServletResponse.SC_BAD_REQUEST); response.sendError(HttpServletResponse.SC_BAD_REQUEST);
@ -603,11 +603,11 @@ final class S3ProxyHandler extends AbstractHandler {
BlobAccess access; BlobAccess access;
String cannedAcl = request.getHeader("x-amz-acl"); String cannedAcl = request.getHeader("x-amz-acl");
if ("private".equals(cannedAcl)) { if (cannedAcl == null || "private".equals(cannedAcl)) {
access = BlobAccess.PRIVATE; access = BlobAccess.PRIVATE;
} else if ("public-read".equals(cannedAcl)) { } else if ("public-read".equals(cannedAcl)) {
access = BlobAccess.PUBLIC_READ; access = BlobAccess.PUBLIC_READ;
} else if (cannedAcl == null || CANNED_ACLS.contains(cannedAcl)) { } else if (CANNED_ACLS.contains(cannedAcl)) {
throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED); throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED);
} else { } else {
response.sendError(HttpServletResponse.SC_BAD_REQUEST); response.sendError(HttpServletResponse.SC_BAD_REQUEST);