You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2024/11/27 09:42:50 UTC
(pulsar) 04/05: [fix][client] Initializing client-authentication using configured auth params (#23610)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit a2732b13cd7d87f684311b355b2b62bd87088565
Author: Rajan Dhabalia <rd...@apache.org>
AuthorDate: Tue Nov 26 13:20:51 2024 -0800
[fix][client] Initializing client-authentication using configured auth params (#23610)
(cherry picked from commit 13f77aa5b09dc48cd1326096a3defc9394fedf67)
---
.../pulsar/broker/service/BrokerServiceTest.java | 45 ++++++++++++++++++++++
.../pulsar/client/impl/ClientBuilderImpl.java | 4 ++
2 files changed, 49 insertions(+)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
index e05bb836a3c..89727014be9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
@@ -103,6 +103,7 @@ import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionInitialPosition;
import org.apache.pulsar.client.api.SubscriptionMode;
import org.apache.pulsar.client.api.SubscriptionType;
+import org.apache.pulsar.client.impl.ClientBuilderImpl;
import org.apache.pulsar.client.impl.ClientCnx;
import org.apache.pulsar.client.impl.ConnectionPool;
import org.apache.pulsar.client.impl.PulsarServiceNameResolver;
@@ -1916,5 +1917,49 @@ public class BrokerServiceTest extends BrokerTestBase {
}
}
}
+
+ @Test
+ public void testTlsWithAuthParams() throws Exception {
+ final String topicName = "persistent://prop/ns-abc/newTopic";
+ final String subName = "newSub";
+ Authentication auth;
+
+ Set<String> providers = new HashSet<>();
+ providers.add("org.apache.pulsar.broker.authentication.AuthenticationProviderTls");
+
+ conf.setAuthenticationEnabled(true);
+ conf.setAuthenticationProviders(providers);
+ conf.setBrokerServicePortTls(Optional.of(0));
+ conf.setWebServicePortTls(Optional.of(0));
+ conf.setTlsCertificateFilePath(BROKER_CERT_FILE_PATH);
+ conf.setTlsKeyFilePath(BROKER_KEY_FILE_PATH);
+ conf.setTlsAllowInsecureConnection(false);
+ conf.setTlsTrustCertsFilePath(CA_CERT_FILE_PATH);
+ conf.setNumExecutorThreadPoolSize(5);
+ restartBroker();
+
+ String authParam = String.format("tlsCertFile:%s,tlsKeyFile:%s", getTlsFileForClient("admin.cert"),
+ getTlsFileForClient("admin.key-pk8"));
+ String authClassName = "org.apache.pulsar.client.impl.auth.AuthenticationTls";
+ ClientConfigurationData conf = new ClientConfigurationData();
+ conf.setServiceUrl(brokerUrlTls.toString());
+ conf.setAuthParams(authParam);
+ conf.setAuthPluginClassName(authClassName);
+ conf.setTlsAllowInsecureConnection(true);
+
+ PulsarClient pulsarClient = null;
+ try {
+ pulsarClient = (new ClientBuilderImpl(conf)).build();
+
+ @Cleanup
+ Consumer<byte[]> consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName(subName)
+ .subscribe();
+ } catch (Exception e) {
+ fail("should not fail");
+ } finally {
+ pulsarClient.close();
+ }
+ }
+
}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
index 69232186767..7652d8a4199 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientBuilderImpl.java
@@ -36,6 +36,7 @@ import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.PulsarClientException.UnsupportedAuthenticationException;
import org.apache.pulsar.client.api.ServiceUrlProvider;
import org.apache.pulsar.client.api.SizeUnit;
+import org.apache.pulsar.client.impl.auth.AuthenticationDisabled;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
import org.apache.pulsar.client.impl.conf.ConfigurationDataUtils;
import org.apache.pulsar.common.tls.InetAddressUtils;
@@ -64,6 +65,9 @@ public class ClientBuilderImpl implements ClientBuilder {
"Cannot get service url from service url provider.");
conf.setServiceUrl(conf.getServiceUrlProvider().getServiceUrl());
}
+ if (conf.getAuthentication() == null || conf.getAuthentication() == AuthenticationDisabled.INSTANCE) {
+ setAuthenticationFromPropsIfAvailable(conf);
+ }
PulsarClient client = new PulsarClientImpl(conf);
if (conf.getServiceUrlProvider() != null) {
conf.getServiceUrlProvider().initialize(client);