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

Allow anonymous access to public-read containers

async
kishore 2017-05-03 12:32:05 +05:30 zatwierdzone przez Andrew Gaul
rodzic ec90b748af
commit d3c77384f1
1 zmienionych plików z 16 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -660,6 +660,20 @@ public class S3ProxyHandler {
throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED); throw new S3Exception(S3ErrorCode.NOT_IMPLEMENTED);
} }
private boolean checkPublicAccess(BlobStore blobStore,
String containerName, String blobName) {
String blobStoreType = getBlobStoreType(blobStore);
if (Quirks.NO_BLOB_ACCESS_CONTROL.contains(blobStoreType)) {
ContainerAccess access = blobStore.getContainerAccess(
containerName);
return access == ContainerAccess.PUBLIC_READ;
} else {
BlobAccess access = blobStore.getBlobAccess(containerName,
blobName);
return access == BlobAccess.PUBLIC_READ;
}
}
private void doHandleAnonymous(HttpServletRequest request, private void doHandleAnonymous(HttpServletRequest request,
HttpServletResponse response, InputStream is, String uri, HttpServletResponse response, InputStream is, String uri,
BlobStore blobStore) BlobStore blobStore)
@ -683,9 +697,7 @@ public class S3ProxyHandler {
} else { } else {
String containerName = path[1]; String containerName = path[1];
String blobName = path[2]; String blobName = path[2];
BlobAccess access = blobStore.getBlobAccess(containerName, if (!checkPublicAccess(blobStore, containerName, blobName)) {
blobName);
if (access != BlobAccess.PUBLIC_READ) {
throw new S3Exception(S3ErrorCode.ACCESS_DENIED); throw new S3Exception(S3ErrorCode.ACCESS_DENIED);
} }
handleGetBlob(request, response, blobStore, containerName, handleGetBlob(request, response, blobStore, containerName,
@ -706,9 +718,7 @@ public class S3ProxyHandler {
} else { } else {
String containerName = path[1]; String containerName = path[1];
String blobName = path[2]; String blobName = path[2];
BlobAccess access = blobStore.getBlobAccess(containerName, if (!checkPublicAccess(blobStore, containerName, blobName)) {
blobName);
if (access != BlobAccess.PUBLIC_READ) {
throw new S3Exception(S3ErrorCode.ACCESS_DENIED); throw new S3Exception(S3ErrorCode.ACCESS_DENIED);
} }
handleBlobMetadata(request, response, blobStore, containerName, handleBlobMetadata(request, response, blobStore, containerName,