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

Enable ACLs for local blobstores

pull/53/head
Andrew Gaul 2015-03-15 17:58:45 -07:00
rodzic ba491b2430
commit 5f9a1b519d
1 zmienionych plików z 4 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -466,14 +466,7 @@ final class S3ProxyHandler extends AbstractHandler {
private void handleGetContainerAcl(HttpServletResponse response, private void handleGetContainerAcl(HttpServletResponse response,
BlobStore blobStore, String containerName) throws IOException { BlobStore blobStore, String containerName) throws IOException {
ContainerAccess access; ContainerAccess access = blobStore.getContainerAccess(containerName);
String blobStoreType = getBlobStoreType(blobStore);
if (blobStoreType.equals("filesystem") ||
blobStoreType.equals("transient")) {
access = ContainerAccess.PRIVATE;
} else {
access = blobStore.getContainerAccess(containerName);
}
try (Writer writer = response.getWriter()) { try (Writer writer = response.getWriter()) {
XMLStreamWriter xml = xmlOutputFactory.createXMLStreamWriter( XMLStreamWriter xml = xmlOutputFactory.createXMLStreamWriter(
@ -557,24 +550,13 @@ final class S3ProxyHandler extends AbstractHandler {
return; return;
} }
String blobStoreType = getBlobStoreType(blobStore); blobStore.setContainerAccess(containerName, access);
if (!(blobStoreType.equals("filesystem") ||
blobStoreType.equals("transient"))) {
blobStore.setContainerAccess(containerName, access);
}
} }
private void handleGetBlobAcl(HttpServletResponse response, private void handleGetBlobAcl(HttpServletResponse response,
BlobStore blobStore, String containerName, BlobStore blobStore, String containerName,
String blobName) throws IOException { String blobName) throws IOException {
BlobAccess access; BlobAccess access = blobStore.getBlobAccess(containerName, blobName);
String blobStoreType = getBlobStoreType(blobStore);
if (blobStoreType.equals("filesystem") ||
blobStoreType.equals("transient")) {
access = BlobAccess.PRIVATE;
} else {
access = blobStore.getBlobAccess(containerName, blobName);
}
try (Writer writer = response.getWriter()) { try (Writer writer = response.getWriter()) {
XMLStreamWriter xml = xmlOutputFactory.createXMLStreamWriter( XMLStreamWriter xml = xmlOutputFactory.createXMLStreamWriter(
@ -659,11 +641,7 @@ final class S3ProxyHandler extends AbstractHandler {
return; return;
} }
String blobStoreType = getBlobStoreType(blobStore); blobStore.setBlobAccess(containerName, blobName, access);
if (!(blobStoreType.equals("filesystem") ||
blobStoreType.equals("transient"))) {
blobStore.setBlobAccess(containerName, blobName, access);
}
} }
private void handleContainerList(HttpServletResponse response, private void handleContainerList(HttpServletResponse response,