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

Ignore case when matching header values

pull/53/head
Andrew Gaul 2015-04-10 22:15:28 -07:00
rodzic f1dec1e3fc
commit 9a5d17fd62
1 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -539,9 +539,9 @@ final class S3ProxyHandler extends AbstractHandler {
ContainerAccess access; ContainerAccess access;
String cannedAcl = request.getHeader("x-amz-acl"); String cannedAcl = request.getHeader("x-amz-acl");
if (cannedAcl == null || "private".equals(cannedAcl)) { if (cannedAcl == null || "private".equalsIgnoreCase(cannedAcl)) {
access = ContainerAccess.PRIVATE; access = ContainerAccess.PRIVATE;
} else if ("public-read".equals(cannedAcl)) { } else if ("public-read".equalsIgnoreCase(cannedAcl)) {
access = ContainerAccess.PUBLIC_READ; access = ContainerAccess.PUBLIC_READ;
} else if (CANNED_ACLS.contains(cannedAcl)) { } else if (CANNED_ACLS.contains(cannedAcl)) {
throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED); throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED);
@ -630,9 +630,9 @@ final class S3ProxyHandler extends AbstractHandler {
BlobAccess access; BlobAccess access;
String cannedAcl = request.getHeader("x-amz-acl"); String cannedAcl = request.getHeader("x-amz-acl");
if (cannedAcl == null || "private".equals(cannedAcl)) { if (cannedAcl == null || "private".equalsIgnoreCase(cannedAcl)) {
access = BlobAccess.PRIVATE; access = BlobAccess.PRIVATE;
} else if ("public-read".equals(cannedAcl)) { } else if ("public-read".equalsIgnoreCase(cannedAcl)) {
access = BlobAccess.PUBLIC_READ; access = BlobAccess.PUBLIC_READ;
} else if (CANNED_ACLS.contains(cannedAcl)) { } else if (CANNED_ACLS.contains(cannedAcl)) {
throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED); throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED);
@ -758,7 +758,7 @@ final class S3ProxyHandler extends AbstractHandler {
CreateContainerOptions options = new CreateContainerOptions(); CreateContainerOptions options = new CreateContainerOptions();
String acl = request.getHeader("x-amz-acl"); String acl = request.getHeader("x-amz-acl");
if ("public-read".equals(acl)) { if ("public-read".equalsIgnoreCase(acl)) {
options.publicRead(); options.publicRead();
} }
@ -1064,7 +1064,7 @@ final class S3ProxyHandler extends AbstractHandler {
} }
String sourceContainerName = path[0]; String sourceContainerName = path[0];
String sourceBlobName = path[1]; String sourceBlobName = path[1];
boolean replaceMetadata = "REPLACE".equals(request.getHeader( boolean replaceMetadata = "REPLACE".equalsIgnoreCase(request.getHeader(
"x-amz-metadata-directive")); "x-amz-metadata-directive"));
if (sourceContainerName.equals(destContainerName) && if (sourceContainerName.equals(destContainerName) &&
@ -1233,7 +1233,7 @@ final class S3ProxyHandler extends AbstractHandler {
// TODO: jclouds should include this in PutOptions // TODO: jclouds should include this in PutOptions
String cannedAcl = request.getHeader("x-amz-acl"); String cannedAcl = request.getHeader("x-amz-acl");
if (cannedAcl != null && !cannedAcl.equals("private")) { if (cannedAcl != null && !cannedAcl.equalsIgnoreCase("private")) {
handleSetBlobAcl(request, response, blobStore, containerName, handleSetBlobAcl(request, response, blobStore, containerName,
blobName); blobName);
} }