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

Handle listing a public-read container 

Also handle checking existence.
pull/86/head
Andrew Gaul 2015-10-15 20:00:15 -07:00
rodzic 0faa68ccfc
commit 274bf8a32e
1 zmienionych plików z 25 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -287,7 +287,7 @@ final class S3ProxyHandler extends AbstractHandler {
}
// anonymous request
if (method.equals("GET") &&
if ((method.equals("GET") || method.equals("HEAD")) &&
request.getHeader(HttpHeaders.AUTHORIZATION) == null &&
request.getParameter("AWSAccessKeyId") == null &&
defaultBlobStore != null) {
@ -522,11 +522,18 @@ final class S3ProxyHandler extends AbstractHandler {
String[] path = uri.split("/", 3);
switch (method) {
case "GET":
if (path.length <= 1) {
throw new S3Exception(S3ErrorCode.INVALID_REQUEST);
} else if (path.length == 2) {
if (uri.equals("/")) {
handleContainerList(response, blobStore);
return;
} else if (path.length <= 2 || path[2].isEmpty()) {
String containerName = path[1];
ContainerAccess access = blobStore.getContainerAccess(
containerName);
if (access == ContainerAccess.PRIVATE) {
throw new S3Exception(S3ErrorCode.ACCESS_DENIED);
}
handleBlobList(request, response, blobStore, containerName);
return;
}
BlobRequestSigner signer = blobStore
@ -570,6 +577,20 @@ final class S3ProxyHandler extends AbstractHandler {
}
}
return;
case "HEAD":
if (path.length <= 2 || path[2].isEmpty()) {
String containerName = path[1];
ContainerAccess access = blobStore.getContainerAccess(
containerName);
if (access == ContainerAccess.PRIVATE) {
throw new S3Exception(S3ErrorCode.ACCESS_DENIED);
}
if (!blobStore.containerExists(containerName)) {
throw new S3Exception(S3ErrorCode.NO_SUCH_BUCKET);
}
return;
}
break;
default:
break;
}