Skip to content

[fix][proxy] Fix client service url #16834

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
Technoboy- merged 1 commit into from
Jul 29, 2022
Merged

[fix][proxy] Fix client service url #16834

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
4 changes: 3 additions & 1 deletion pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,10 @@ protected void handleLookup(CommandLookupTopic lookup) {

ClientConfigurationData createClientConfiguration() {
ClientConfigurationData initialConf = new ClientConfigurationData();
initialConf.setServiceUrl(service.getServiceUrl());
ProxyConfiguration proxyConfig = service.getConfiguration();
initialConf.setServiceUrl(
proxyConfig.isTlsEnabledWithBroker() ? service.getServiceUrlTls() : service.getServiceUrl());

// Apply all arbitrary configuration. This must be called before setting any fields annotated as
// @Secret on the ClientConfigurationData object because of the way they are serialized.
// See https://github.com/apache/pulsar/issues/8509 for more information.
Expand Down
24 changes: 24 additions & 0 deletions pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@
*/
package org.apache.pulsar.proxy.server;

import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
import org.testng.annotations.Test;

public class ProxyConnectionTest {
Expand All @@ -35,4 +39,24 @@ public void testMatchesHostAndPort() {
assertFalse(ProxyConnection
.matchesHostAndPort("pulsar://", "pulsar://1.2.3.4:12345", "1.2.3.4:1234"));
}
@Test
public void testCreateClientConfiguration() {
ProxyConfiguration proxyConfiguration = new ProxyConfiguration();
proxyConfiguration.setTlsEnabledWithBroker(true);
String proxyUrlTls = "pulsar+ssl://proxy:6651";
String proxyUrl = "pulsar://proxy:6650";

ProxyService proxyService = mock(ProxyService.class);
doReturn(proxyConfiguration).when(proxyService).getConfiguration();
doReturn(proxyUrlTls).when(proxyService).getServiceUrlTls();
doReturn(proxyUrl).when(proxyService).getServiceUrl();

ProxyConnection proxyConnection = new ProxyConnection(proxyService, null);
ClientConfigurationData clientConfiguration = proxyConnection.createClientConfiguration();
assertEquals(clientConfiguration.getServiceUrl(), proxyUrlTls);

proxyConfiguration.setTlsEnabledWithBroker(false);
clientConfiguration = proxyConnection.createClientConfiguration();
assertEquals(clientConfiguration.getServiceUrl(), proxyUrl);
}
}