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

Improve support for x-amz-metadata-directive 

Replace content metadata in addition to user metadata.  Addresses
s3cmd tests failures.
pull/36/head
Andrew Gaul 2015-01-13 22:29:39 -08:00
rodzic a6133a60a6
commit 5b5e9877b9
1 zmienionych plików z 43 dodań i 44 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -863,18 +863,6 @@ final class S3ProxyHandler extends AbstractHandler {
boolean replaceMetadata = "REPLACE".equals(request.getHeader(
"x-amz-metadata-directive"));
ImmutableMap.Builder<String, String> userMetadataBuilder =
ImmutableMap.builder();
for (String headerName : Collections.list(request.getHeaderNames())) {
if (!headerName.startsWith(USER_METADATA_PREFIX)) {
continue;
}
userMetadataBuilder.put(
headerName.substring(USER_METADATA_PREFIX.length()),
Strings.nullToEmpty(request.getHeader(headerName)));
}
Map<String, String> userMetadata = userMetadataBuilder.build();
if (sourceContainerName.equals(destContainerName) &&
sourceBlobName.equals(destBlobName) &&
!replaceMetadata) {
@ -892,14 +880,17 @@ final class S3ProxyHandler extends AbstractHandler {
ContentMetadata metadata = blob.getMetadata().getContentMetadata();
BlobBuilder.PayloadBlobBuilder builder = blobStore
.blobBuilder(destBlobName)
.userMetadata(replaceMetadata ? userMetadata :
blob.getMetadata().getUserMetadata())
.payload(is)
.contentDisposition(metadata.getContentDisposition())
.contentEncoding(metadata.getContentEncoding())
.contentLanguage(metadata.getContentLanguage())
.contentLength(metadata.getContentLength())
.contentType(metadata.getContentType());
.payload(is);
if (replaceMetadata) {
addContentMetdataFromHttpRequest(builder, request);
} else {
builder.contentDisposition(metadata.getContentDisposition())
.contentEncoding(metadata.getContentEncoding())
.contentLanguage(metadata.getContentLanguage())
.contentLength(metadata.getContentLength())
.contentType(metadata.getContentType())
.userMetadata(blob.getMetadata().getUserMetadata());
}
PutOptions options = new PutOptions()
.multipart(forceMultiPartUpload);
@ -937,8 +928,6 @@ final class S3ProxyHandler extends AbstractHandler {
// null for empty headers values.
String contentLengthString = null;
String contentMD5String = null;
ImmutableMap.Builder<String, String> userMetadata =
ImmutableMap.builder();
for (String headerName : Collections.list(request.getHeaderNames())) {
String headerValue = Strings.nullToEmpty(request.getHeader(
headerName));
@ -946,11 +935,6 @@ final class S3ProxyHandler extends AbstractHandler {
contentLengthString = headerValue;
} else if (headerName.equalsIgnoreCase(HttpHeaders.CONTENT_MD5)) {
contentMD5String = headerValue;
} else if (headerName.toLowerCase().startsWith(
USER_METADATA_PREFIX)) {
userMetadata.put(
headerName.substring(USER_METADATA_PREFIX.length()),
headerValue);
}
}
@ -989,23 +973,8 @@ final class S3ProxyHandler extends AbstractHandler {
try (InputStream is = request.getInputStream()) {
BlobBuilder.PayloadBlobBuilder builder = blobStore
.blobBuilder(blobName)
.userMetadata(userMetadata.build())
.payload(is)
.contentDisposition(request.getHeader(
HttpHeaders.CONTENT_DISPOSITION))
.contentEncoding(request.getHeader(
HttpHeaders.CONTENT_ENCODING))
.contentLanguage(request.getHeader(
HttpHeaders.CONTENT_LANGUAGE))
.contentLength(request.getContentLength());
String contentType = request.getContentType();
if (contentType != null) {
builder.contentType(contentType);
}
long expires = request.getDateHeader(HttpHeaders.EXPIRES);
if (expires != -1) {
builder = builder.expires(new Date(expires));
}
.payload(is);
addContentMetdataFromHttpRequest(builder, request);
if (contentMD5 != null) {
builder = builder.contentMD5(contentMD5);
}
@ -1245,4 +1214,34 @@ final class S3ProxyHandler extends AbstractHandler {
}
return elements;
}
private static void addContentMetdataFromHttpRequest(
BlobBuilder.PayloadBlobBuilder builder,
HttpServletRequest request) {
ImmutableMap.Builder<String, String> userMetadata =
ImmutableMap.builder();
for (String headerName : Collections.list(request.getHeaderNames())) {
if (headerName.toLowerCase().startsWith(USER_METADATA_PREFIX)) {
userMetadata.put(
headerName.substring(USER_METADATA_PREFIX.length()),
Strings.nullToEmpty(request.getHeader(headerName)));
}
}
builder.contentDisposition(request.getHeader(
HttpHeaders.CONTENT_DISPOSITION))
.contentEncoding(request.getHeader(
HttpHeaders.CONTENT_ENCODING))
.contentLanguage(request.getHeader(
HttpHeaders.CONTENT_LANGUAGE))
.contentLength(request.getContentLength())
.userMetadata(userMetadata.build());
String contentType = request.getContentType();
if (contentType != null) {
builder.contentType(contentType);
}
long expires = request.getDateHeader(HttpHeaders.EXPIRES);
if (expires != -1) {
builder.expires(new Date(expires));
}
}
}