You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2024/04/14 08:37:57 UTC
(jclouds) branch master updated (bc43572d65 -> 4435765f55)
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
from bc43572d65 JCLOUDS-1630: Handle URI template properly with opened curve bracket (#199)
new 0688553087 JCLOUDS-1631: fix AWSRequestAuthorizeSignatureV4 when prefix contains special chars
new 4435765f55 add license header
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../filters/RequestAuthorizeSignatureV4Test.java | 6 +-
.../s3/filters/AWSRequestAuthorizeSignatureV4.java | 3 +-
.../filter/AwsRequestAuthorizeSignatureV4Test.java | 69 ++++++++++++++++++++++
3 files changed, 74 insertions(+), 4 deletions(-)
create mode 100644 providers/aws-s3/src/test/java/org/jclouds/aws/s3/filter/AwsRequestAuthorizeSignatureV4Test.java
(jclouds) 01/02: JCLOUDS-1631: fix AWSRequestAuthorizeSignatureV4 when prefix contains special chars
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 0688553087aabdaa7f503265bbc4a4cb60adef55
Author: Maksim_Hadalau <Ma...@epam.com>
AuthorDate: Mon Mar 18 19:54:28 2024 +0100
JCLOUDS-1631: fix AWSRequestAuthorizeSignatureV4 when prefix contains special chars
---
.../filters/RequestAuthorizeSignatureV4Test.java | 6 +--
.../s3/filters/AWSRequestAuthorizeSignatureV4.java | 3 +-
.../filter/AwsRequestAuthorizeSignatureV4Test.java | 53 ++++++++++++++++++++++
3 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4Test.java b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4Test.java
index bbe019c8cd..8057888945 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4Test.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4Test.java
@@ -89,7 +89,7 @@ public class RequestAuthorizeSignatureV4Test {
+ "SignedHeaders=host;x-amz-content-sha256;x-amz-date, "
+ "Signature=6cc5d0758e2599be7cb172fd57cefab2828201a2b4d372972a83dc304de93958";
- private static final String BUCKET_NAME = "test-bucket";
+ protected static final String BUCKET_NAME = "test-bucket";
private static final String OBJECT_NAME = "ExampleObject.txt";
@ConfiguresHttpApi
@@ -116,11 +116,11 @@ public class RequestAuthorizeSignatureV4Test {
.buildInjector();
}
- public static RequestAuthorizeSignatureV4 filter(Credentials creds) {
+ public RequestAuthorizeSignatureV4 filter(Credentials creds) {
return injector(creds).getInstance(RequestAuthorizeSignatureV4.class);
}
- Credentials temporaryCredentials = new Credentials.Builder()
+ protected Credentials temporaryCredentials = new Credentials.Builder()
.identity(IDENTITY)
.credential(CREDENTIAL)
.build();
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignatureV4.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignatureV4.java
index 1afa832348..2491152b8c 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignatureV4.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/filters/AWSRequestAuthorizeSignatureV4.java
@@ -53,7 +53,8 @@ public class AWSRequestAuthorizeSignatureV4 extends RequestAuthorizeSignatureV4
* with expiration.
*/
- Multimap<String, String> queryMap = queryParser().apply(request.getEndpoint().getQuery());
+ // Do not replace URI.getRawQuery() with URI.getQuery() see: JCLOUDS-1631
+ Multimap<String, String> queryMap = queryParser().apply(request.getEndpoint().getRawQuery());
if (queryMap.containsKey(AMZ_SIGNATURE_PARAM) || queryMap.containsKey(TEMPORARY_SIGNATURE_PARAM)) {
return request;
}
diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/filter/AwsRequestAuthorizeSignatureV4Test.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/filter/AwsRequestAuthorizeSignatureV4Test.java
new file mode 100644
index 0000000000..3afb640586
--- /dev/null
+++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/filter/AwsRequestAuthorizeSignatureV4Test.java
@@ -0,0 +1,53 @@
+package org.jclouds.aws.s3.filter;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.net.HttpHeaders;
+import org.jclouds.aws.s3.filters.AWSRequestAuthorizeSignatureV4;
+import org.jclouds.domain.Credentials;
+import org.jclouds.http.HttpRequest;
+import org.jclouds.reflect.Invocation;
+import org.jclouds.rest.internal.GeneratedHttpRequest;
+import org.jclouds.s3.S3Client;
+import org.jclouds.s3.filters.RequestAuthorizeSignatureV4;
+import org.jclouds.s3.filters.RequestAuthorizeSignatureV4Test;
+import org.jclouds.s3.options.ListBucketOptions;
+import org.testng.annotations.Test;
+
+import static org.jclouds.reflect.Reflection2.method;
+import static org.testng.Assert.assertEquals;
+
+/**
+ * Tests behavior of {@code AWSRequestAuthorizeSignatureV4}
+ */
+// NOTE:without testName, this will not call @Before* and fail w/NPE during surefire
+@Test(groups = "unit", testName = "AwsRequestAuthorizeSignatureV4Test")
+public class AwsRequestAuthorizeSignatureV4Test extends RequestAuthorizeSignatureV4Test {
+
+ private static final String LIST_BUCKET_AUTHORIZATION_HEADER_RESULT = "AWS4-HMAC-SHA256 Credential=AKIAPAEBI3QI4EXAMPLE/20150203/cn-north-1/s3/aws4_request," +
+ " SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=ec72ac5f67bf86e3b95d122f690a2898224f28328d39131c48221a5dcf0c2cee";
+
+ @Override
+ public RequestAuthorizeSignatureV4 filter(Credentials creds) {
+ return injector(creds).getInstance(AWSRequestAuthorizeSignatureV4.class);
+ }
+
+
+ // JCLOUDS-1631
+ @Test
+ void testListBucketWithSpecialChars() {
+ Invocation invocation = Invocation.create(method(S3Client.class, "listBucket", String.class,
+ ListBucketOptions[].class),
+ // Simulating ListBucketOptions.Builder.withPrefix("Folder (`~!@#$%^&*-_+[]'|<>.?) Name/") with manual endpoint:
+ ImmutableList.<Object>of(RequestAuthorizeSignatureV4Test.BUCKET_NAME, new ListBucketOptions[0]));
+
+ HttpRequest getObject = GeneratedHttpRequest.builder().method("GET")
+ .invocation(invocation)
+ .endpoint("https://" + BUCKET_NAME + ".s3.cn-north-1.amazonaws.com.cn/?delimiter=/&prefix=Folder%20%28%60%7E%21%40%23%24%25%5E%26%2A-_%2B%5B%5D%27%7C%3C%3E.%3F%29%20Name/")
+ .addHeader(HttpHeaders.HOST, BUCKET_NAME + ".s3.cn-north-1.amazonaws.com.cn")
+ .build();
+
+
+ HttpRequest filtered = filter(temporaryCredentials).filter(getObject);
+ assertEquals(filtered.getFirstHeaderOrNull("Authorization"), LIST_BUCKET_AUTHORIZATION_HEADER_RESULT);
+ }
+}
(jclouds) 02/02: add license header
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 4435765f550bbbae034a27ab5c5deee958fbc55f
Author: Maksim_Hadalau <Ma...@epam.com>
AuthorDate: Wed Mar 20 17:09:14 2024 +0100
add license header
---
.../s3/filter/AwsRequestAuthorizeSignatureV4Test.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/filter/AwsRequestAuthorizeSignatureV4Test.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/filter/AwsRequestAuthorizeSignatureV4Test.java
index 3afb640586..d4dd12f9ea 100644
--- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/filter/AwsRequestAuthorizeSignatureV4Test.java
+++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/filter/AwsRequestAuthorizeSignatureV4Test.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.jclouds.aws.s3.filter;
import com.google.common.collect.ImmutableList;