sijie closed pull request #2359: Issue #2304: add encoding for WebTargets parts
URL: https://github.com/apache/incubator-pulsar/pull/2359
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
index c9d973dde6..ae72737083 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
@@ -620,11 +620,15 @@ public void namespaces() throws PulsarAdminException,
PulsarServerException, Exc
// Ok, got the non authorized exception since usc cluster is not
in the allowed clusters list.
}
+ // test with url style role.
+ admin.namespaces().grantPermissionOnNamespace("prop-xyz/ns1",
+ "spiffe://developer/passport-role",
EnumSet.allOf(AuthAction.class));
admin.namespaces().grantPermissionOnNamespace("prop-xyz/ns1",
"my-role", EnumSet.allOf(AuthAction.class));
Policies policies = new Policies();
policies.replication_clusters = Sets.newHashSet("test");
policies.bundles = Policies.defaultBundle();
+
policies.auth_policies.namespace_auth.put("spiffe://developer/passport-role",
EnumSet.allOf(AuthAction.class));
policies.auth_policies.namespace_auth.put("my-role",
EnumSet.allOf(AuthAction.class));
assertEquals(admin.namespaces().getPolicies("prop-xyz/ns1"), policies);
@@ -632,7 +636,9 @@ public void namespaces() throws PulsarAdminException,
PulsarServerException, Exc
assertEquals(admin.namespaces().getTopics("prop-xyz/ns1"),
Lists.newArrayList());
+ admin.namespaces().revokePermissionsOnNamespace("prop-xyz/ns1",
"spiffe://developer/passport-role");
admin.namespaces().revokePermissionsOnNamespace("prop-xyz/ns1",
"my-role");
+
policies.auth_policies.namespace_auth.remove("spiffe://developer/passport-role");
policies.auth_policies.namespace_auth.remove("my-role");
assertEquals(admin.namespaces().getPolicies("prop-xyz/ns1"), policies);
diff --git
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WebTargets.java
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WebTargets.java
index 35b04f1ce8..3de248c417 100644
---
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WebTargets.java
+++
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/WebTargets.java
@@ -18,14 +18,26 @@
*/
package org.apache.pulsar.client.admin.internal;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import javax.ws.rs.client.WebTarget;
+import lombok.extern.slf4j.Slf4j;
+@Slf4j
class WebTargets {
static WebTarget addParts(WebTarget target, String[] parts) {
if (parts != null && parts.length > 0) {
for (String part : parts) {
- target = target.path(part);
+ String encode;
+ try {
+ encode = URLEncoder.encode(part,
StandardCharsets.UTF_8.toString());
+ } catch (UnsupportedEncodingException e) {
+ log.error(String.format("%s is Unknown",
StandardCharsets.UTF_8.toString()) + "exception - [{}]", e);
+ encode = part;
+ }
+ target = target.path(encode);
}
}
return target;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
