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 2018/03/27 21:24:55 UTC
[incubator-pulsar] branch master updated: Check if request is HTTPs
before redirecting to TLS URL (#1454)
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/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 527731c Check if request is HTTPs before redirecting to TLS URL (#1454)
527731c is described below
commit 527731cff64be2d8ebcc09921aaec843ff9ca7d4
Author: Jai Asher <ja...@ccs.neu.edu>
AuthorDate: Tue Mar 27 14:24:52 2018 -0700
Check if request is HTTPs before redirecting to TLS URL (#1454)
* Check if request is HTTPs before redirecting to TLS URL
* Handled Matteo's PR Comments
---
.../java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
index 5f5b758..c711279 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -39,6 +39,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriBuilder;
+import org.apache.commons.lang3.StringUtils;
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.ServiceConfiguration;
import org.apache.pulsar.broker.admin.AdminResource;
@@ -145,9 +146,9 @@ public abstract class NamespacesBase extends AdminResource {
.orElseThrow(() -> new RestException(Status.NOT_FOUND,
"Cluster " + replCluster + " does not exist"));
URL replClusterUrl;
- if (!config().isTlsEnabled()) {
+ if (!config().isTlsEnabled() || !isRequestHttps()) {
replClusterUrl = new URL(replClusterData.getServiceUrl());
- } else if (!replClusterData.getServiceUrlTls().isEmpty()) {
+ } else if (StringUtils.isNotBlank(replClusterData.getServiceUrlTls())) {
replClusterUrl = new URL(replClusterData.getServiceUrlTls());
} else {
throw new RestException(Status.PRECONDITION_FAILED,
@@ -246,9 +247,9 @@ public abstract class NamespacesBase extends AdminResource {
.orElseThrow(() -> new RestException(Status.NOT_FOUND,
"Cluser " + replCluster + " does not exist"));
URL replClusterUrl;
- if (!config().isTlsEnabled()) {
+ if (!config().isTlsEnabled() || !isRequestHttps()) {
replClusterUrl = new URL(replClusterData.getServiceUrl());
- } else if (!replClusterData.getServiceUrlTls().isEmpty()) {
+ } else if (StringUtils.isNotBlank(replClusterData.getServiceUrlTls())) {
replClusterUrl = new URL(replClusterData.getServiceUrlTls());
} else {
throw new RestException(Status.PRECONDITION_FAILED,
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.