Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pulsar-admin] update dynamic config with escape char #4611

Merged
merged 1 commit into from
Jun 27, 2019
Merged

[pulsar-admin] update dynamic config with escape char #4611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ public class ServiceConfiguration implements PulsarConfiguration {

@FieldContext(
category = CATEGORY_AUTHORIZATION,
dynamic = true,
doc = "Role names that are treated as `super-user`, meaning they will be able to"
+ " do all admin operations and publish/consume from all topics"
)
Expand Down
11 changes: 11 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,17 @@ public void testUpdateDynamicConfigurationWithZkWatch() throws Exception {
} catch (Exception e) {
assertTrue(e instanceof PreconditionFailedException);
}

// (4) try to update dynamic-field with special char "/" and "%"
String user1 = "test/test%&$*/^";
String user2 = "user2/password";
final String configValue = user1 + "," + user2;
admin.brokers().updateDynamicConfiguration("superUserRoles", configValue);
String storedValue = admin.brokers().getAllDynamicConfigurations().get("superUserRoles");
assertEquals(configValue, storedValue);
retryStrategically((test) -> pulsar.getConfiguration().getSuperUserRoles().size() == 2, 5, 200);
assertTrue(pulsar.getConfiguration().getSuperUserRoles().contains(user1));
assertTrue(pulsar.getConfiguration().getSuperUserRoles().contains(user2));

}

Expand Down
4 changes: 3 additions & 1 deletion pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/BrokersImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.pulsar.common.conf.InternalConfigurationData;
import org.apache.pulsar.common.policies.data.ErrorData;
import org.apache.pulsar.common.policies.data.NamespaceOwnershipStatus;
import org.apache.pulsar.common.util.Codec;

public class BrokersImpl extends BaseResource implements Brokers {
private final WebTarget adminBrokers;
Expand Down Expand Up @@ -65,7 +66,8 @@ public Map<String, NamespaceOwnershipStatus> getOwnedNamespaces(String cluster,
@Override
public void updateDynamicConfiguration(String configName, String configValue) throws PulsarAdminException {
try {
request(adminBrokers.path("/configuration/").path(configName).path(configValue)).post(Entity.json(""),
String value = Codec.encode(configValue);
request(adminBrokers.path("/configuration/").path(configName).path(value)).post(Entity.json(""),
ErrorData.class);
} catch (Exception e) {
throw getApiException(e);
Expand Down