You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/01/12 02:41:43 UTC
[pulsar] branch master updated: Support TLS authentication and
authorization in standalone mode (#3360)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 617712e Support TLS authentication and authorization in standalone mode (#3360)
617712e is described below
commit 617712e2913c8f53873e60631905b7d14ccd947b
Author: tuteng <eg...@gmail.com>
AuthorDate: Sat Jan 12 10:41:38 2019 +0800
Support TLS authentication and authorization in standalone mode (#3360)
---
.../src/main/java/org/apache/pulsar/PulsarStandalone.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
index 8711bd8..c6ee4dc 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
@@ -272,8 +272,16 @@ public class PulsarStandalone implements AutoCloseable {
workerConfig = WorkerConfig.load(this.getFnWorkerConfigFile());
}
// worker talks to local broker
- workerConfig.setPulsarServiceUrl("pulsar://127.0.0.1:" + config.getBrokerServicePort().get());
- workerConfig.setPulsarWebServiceUrl("http://127.0.0.1:" + config.getWebServicePort().get());
+ boolean useTls = workerConfig.isUseTls();
+ String localhost = "127.0.0.1";
+ String pulsarServiceUrl = useTls
+ ? PulsarService.brokerUrlTls(localhost, config.getBrokerServicePortTls().get())
+ : PulsarService.brokerUrl(localhost, config.getBrokerServicePort().get());
+ String webServiceUrl = useTls
+ ? PulsarService.webAddressTls(localhost, config.getWebServicePortTls().get())
+ : PulsarService.webAddress(localhost, config.getWebServicePort().get());
+ workerConfig.setPulsarServiceUrl(pulsarServiceUrl);
+ workerConfig.setPulsarWebServiceUrl(webServiceUrl);
if (!this.isNoStreamStorage()) {
// only set the state storage service url when state is enabled.
workerConfig.setStateStorageServiceUrl("bk://127.0.0.1:" + this.getStreamStoragePort());