Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set Content-MD5 only if ETag has correct format 

Previously this check was more lenient than it should have been.
This commit is contained in:
Andrew Gaul 2014-08-18 23:15:49 -07:00
parent 268fb242d5
commit df996f3231
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apis/s3/src/main/java/org/jclouds/s3/xml/ListBucketHandler.java
View File

@ -20,6 +20,7 @@ import static com.google.common.io.BaseEncoding.base16;
import static org.jclouds.http.Uris.uriBuilder;
import static org.jclouds.util.SaxUtils.currentOrNull;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.inject.Inject;
@ -63,7 +64,7 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult<ListBucketResp
private boolean isTruncated;
/** Some blobs have a non-hex suffix when created by multi-part uploads such Amazon S3. */
private static final Pattern MULTIPART_BLOB_ETAG = Pattern.compile("[0-9a-f]+-[0-9]+");
private static final Pattern ETAG_CONTENT_MD5_PATTERN = Pattern.compile("\"([0-9a-f]+)\"");
@Inject
public ListBucketHandler(DateService dateParser) {
@ -101,9 +102,9 @@ public class ListBucketHandler extends ParseSax.HandlerWithResult<ListBucketResp
} else if (qName.equals("ETag")) {
String currentETag = currentOrNull(currentText);
builder.eTag(currentETag);
currentETag = currentETag.replace("\"", "");
if (!MULTIPART_BLOB_ETAG.matcher(currentETag).matches()) {
builder.contentMD5(base16().lowerCase().decode(currentETag));
Matcher matcher = ETAG_CONTENT_MD5_PATTERN.matcher(currentETag);
if (matcher.matches()) {
builder.contentMD5(base16().lowerCase().decode(matcher.group(1)));
}
} else if (qName.equals("Size")) {
builder.contentLength(Long.valueOf(currentOrNull(currentText)));