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

JCLOUDS-1299: Handle % in names during Swift list 

uriBuilder.appendPath assumes an encoded path.
This commit is contained in:
Andrew Gaul 2017-05-16 14:39:46 -07:00
parent f7cad22d93
commit acb84bc5e1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/functions/ParseObjectListFromResponse.java
View File

@ -18,6 +18,7 @@ package org.jclouds.openstack.swift.v1.functions;
import static com.google.common.io.BaseEncoding.base16;
import static org.jclouds.http.Uris.uriBuilder;
import static org.jclouds.util.Strings2.urlEncode;
import java.util.Date;
import java.util.List;
@ -96,7 +97,7 @@ public class ParseObjectListFromResponse implements Function<HttpResponse, Objec
String etag = Strings.nullToEmpty(input.hash);
Date lastModified = input.last_modified == null ? new Date() : input.last_modified;
return SwiftObject.builder()
.uri(uriBuilder(containerUri).clearQuery().appendPath(input.name).build())
.uri(uriBuilder(containerUri).clearQuery().appendPath(urlEncode(input.name)).build())
.name(name)
.etag(etag)
.payload(payload(input.bytes, etag, input.content_type, input.expires))

2
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseContainerIntegrationTest.java
View File

@ -597,7 +597,7 @@ public class BaseContainerIntegrationTest extends BaseBlobStoreIntegrationTest {
@DataProvider
public Object[][] getBlobsToEscape() {
ImmutableSet<String> testNames = ImmutableSet.of("%20", "%20 ", " %20", " ");
ImmutableSet<String> testNames = ImmutableSet.of("%20", "%20 ", " %20", " ", "%", "%%");
Object[][] result = new Object[1][1];
result[0][0] = testNames;
return result;