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

Handle conditional HEAD object requests

pull/125/head
Andrew Gaul 2016-02-18 11:44:10 -08:00
rodzic 52ba2c843f
commit 2062aadfeb
1 zmienionych plików z 39 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -521,7 +521,8 @@ final class S3ProxyHandler extends AbstractHandler {
handleContainerExists(response, blobStore, path[1]);
return;
} else {
handleBlobMetadata(response, blobStore, path[1], path[2]);
handleBlobMetadata(request, response, blobStore, path[1],
path[2]);
return;
}
case "POST":
@ -661,7 +662,8 @@ final class S3ProxyHandler extends AbstractHandler {
BlobAccess access = blobStore.getBlobAccess(containerName,
blobName);
if (access == BlobAccess.PUBLIC_READ) {
handleBlobMetadata(response, blobStore, path[1], path[2]);
handleBlobMetadata(request, response, blobStore, path[1],
path[2]);
} else {
throw new S3Exception(S3ErrorCode.ACCESS_DENIED);
}
@ -1248,7 +1250,8 @@ final class S3ProxyHandler extends AbstractHandler {
}
}
private void handleBlobMetadata(HttpServletResponse response,
private void handleBlobMetadata(HttpServletRequest request,
HttpServletResponse response,
BlobStore blobStore, String containerName,
String blobName) throws IOException, S3Exception {
BlobMetadata metadata = blobStore.blobMetadata(containerName, blobName);
@ -1256,6 +1259,39 @@ final class S3ProxyHandler extends AbstractHandler {
throw new S3Exception(S3ErrorCode.NO_SUCH_KEY);
}
// BlobStore.blobMetadata does not support GetOptions so we emulate
// conditional requests.
String ifMatch = request.getHeader(HttpHeaders.IF_MATCH);
String ifNoneMatch = request.getHeader(HttpHeaders.IF_NONE_MATCH);
long ifModifiedSince = request.getDateHeader(
HttpHeaders.IF_MODIFIED_SINCE);
long ifUnmodifiedSince = request.getDateHeader(
HttpHeaders.IF_UNMODIFIED_SINCE);
String eTag = maybeQuoteETag(metadata.getETag());
if (eTag != null) {
if (ifMatch != null && !ifMatch.equals(eTag)) {
throw new S3Exception(S3ErrorCode.PRECONDITION_FAILED);
}
if (ifNoneMatch != null && ifNoneMatch.equals(eTag)) {
response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
return;
}
}
Date lastModified = metadata.getLastModified();
if (lastModified != null) {
if (ifModifiedSince != -1 && lastModified.compareTo(
new Date(ifModifiedSince)) <= 0) {
throw new S3Exception(S3ErrorCode.PRECONDITION_FAILED);
}
if (ifUnmodifiedSince != -1 && lastModified.compareTo(
new Date(ifUnmodifiedSince)) >= 0) {
response.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
return;
}
}
response.setStatus(HttpServletResponse.SC_OK);
addMetadataToResponse(response, metadata);
}