Skip to content

[branch-2.10] [fix] [auth] fix not forward compatible config saslJaasServerRoleTokenSignerSecretPath after cherry-pick #15121 #19971

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

Merged
poorbarcode merged 1 commit into from
Apr 3, 2023
Merged

[branch-2.10] [fix] [auth] fix not forward compatible config saslJaasServerRoleTokenSignerSecretPath after cherry-pick #15121 #19971

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
5 changes: 3 additions & 2 deletions ...asl/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderSasl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
Expand Down Expand Up @@ -106,8 +107,8 @@ public void initialize(ServiceConfiguration config) throws IOException {
if (StringUtils.isNotBlank(saslJaasServerRoleTokenSignerSecretPath)) {
secret = readSecretFromUrl(saslJaasServerRoleTokenSignerSecretPath);
} else {
String msg = "saslJaasServerRoleTokenSignerSecretPath parameter is empty";
throw new IllegalArgumentException(msg);
secret = Long.toString(new Random().nextLong()).getBytes();
log.info("JAAS authentication provider using random secret.");
}
this.signer = new SaslRoleTokenSigner(secret);
}
Expand Down
24 changes: 20 additions & 4 deletions ...sl/src/test/java/org/apache/pulsar/broker/authentication/ProxySaslAuthenticationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import lombok.Cleanup;
import org.apache.commons.io.FileUtils;
import org.apache.curator.shaded.com.google.common.collect.Maps;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.client.admin.PulsarAdmin;
import org.apache.pulsar.client.api.Authentication;
import org.apache.pulsar.client.api.AuthenticationFactory;
Expand All @@ -51,6 +52,7 @@
import org.apache.pulsar.common.configuration.PulsarConfigurationLoader;
import org.apache.pulsar.proxy.server.ProxyConfiguration;
import org.apache.pulsar.proxy.server.ProxyService;
import org.mockito.Mockito;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
Expand Down Expand Up @@ -214,10 +216,14 @@ protected void setup() throws Exception {
@Override
@AfterMethod(alwaysRun = true)
protected void cleanup() throws Exception {
FileUtils.deleteQuietly(brokerSecretKeyFile);
Assert.assertFalse(brokerSecretKeyFile.exists());
FileUtils.deleteQuietly(proxySecretKeyFile);
Assert.assertFalse(proxySecretKeyFile.exists());
if (brokerSecretKeyFile != null) {
FileUtils.deleteQuietly(brokerSecretKeyFile);
Assert.assertFalse(brokerSecretKeyFile.exists());
}
if (proxySecretKeyFile != null) {
FileUtils.deleteQuietly(proxySecretKeyFile);
Assert.assertFalse(proxySecretKeyFile.exists());
}
super.internalCleanup();
}

Expand Down Expand Up @@ -294,6 +300,16 @@ void testAuthentication() throws Exception {
proxyService.close();
}

@Test
public void testNoErrorEvenIfTheConfigSecretIsEmpty () throws Exception {
ServiceConfiguration configurationWithoutSecret = Mockito.spy(conf);
Mockito.doAnswer(invocation -> null).when(configurationWithoutSecret).getSaslJaasServerRoleTokenSignerSecretPath();
configurationWithoutSecret.setSaslJaasServerRoleTokenSignerSecretPath(null);
AuthenticationProviderSasl authenticationProviderSasl = new AuthenticationProviderSasl();
authenticationProviderSasl.initialize(configurationWithoutSecret);
authenticationProviderSasl.close();
}

private PulsarClient createProxyClient(String proxyServiceUrl, int numberOfConnections) throws PulsarClientException {
Map<String, String> clientSaslConfig = Maps.newHashMap();
clientSaslConfig.put("saslJaasClientSectionName", "PulsarClient");
Expand Down