This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 04e3d75 CAMEL-14422: Shutdown should mask sensitive endpoint urls
also from base path.
04e3d75 is described below
commit 04e3d75ada42468fabdd17de9d42e2f0a6999221
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jan 23 06:25:24 2020 +0100
CAMEL-14422: Shutdown should mask sensitive endpoint urls also from base
path.
---
.../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 3 +++
.../java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java | 5 +++++
.../org/apache/camel/api/management/mbean/ManagedEndpointMBean.java | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 5b26704..62a16e7 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2959,6 +2959,7 @@ public abstract class AbstractCamelContext extends
ServiceSupport implements Ext
if (route.getConsumer() != null) {
// use basic endpoint uri to not log verbose details or
potential sensitive data
String uri = route.getEndpoint().getEndpointBaseUri();
+ uri = URISupport.sanitizeUri(uri);
LOG.info("Route: {} is {}, was consuming from: {}",
route.getId(), state, uri);
} else {
LOG.info("Route: {} is {}.", route.getId(), state);
@@ -3197,6 +3198,7 @@ public abstract class AbstractCamelContext extends
ServiceSupport implements Ext
ServiceHelper.resumeService(consumer);
// use basic endpoint uri to not log verbose details or
potential sensitive data
String uri = endpoint.getEndpointBaseUri();
+ uri = URISupport.sanitizeUri(uri);
LOG.info("Route: {} resumed and consuming from: {}",
route.getId(), uri);
} else {
// when starting we should invoke the lifecycle strategies
@@ -3213,6 +3215,7 @@ public abstract class AbstractCamelContext extends
ServiceSupport implements Ext
// use basic endpoint uri to not log verbose details or
potential sensitive data
String uri = endpoint.getEndpointBaseUri();
+ uri = URISupport.sanitizeUri(uri);
LOG.info("Route: {} started and consuming from: {}",
route.getId(), uri);
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
index 7f54bce..0c971c4 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
@@ -53,6 +53,7 @@ import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.CollectionStringBuffer;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StopWatch;
+import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -593,11 +594,13 @@ public class DefaultShutdownStrategy extends
ServiceSupport implements ShutdownS
deferredConsumers.add(new
ShutdownDeferredConsumer(order.getRoute(), consumer));
// use basic endpoint uri to not log verbose details
or potential sensitive data
String uri =
order.getRoute().getEndpoint().getEndpointBaseUri();
+ uri = URISupport.sanitizeUri(uri);
LOG.debug("Route: {} suspended and shutdown deferred,
was consuming from: {}", order.getRoute().getId(), uri);
} else if (shutdown) {
shutdownNow(order.getRoute().getId(), consumer);
// use basic endpoint uri to not log verbose details
or potential sensitive data
String uri =
order.getRoute().getEndpoint().getEndpointBaseUri();
+ uri = URISupport.sanitizeUri(uri);
LOG.info("Route: {} shutdown complete, was consuming
from: {}", order.getRoute().getId(), uri);
} else {
// we will stop it later, but for now it must run to
be able to help all inflight messages
@@ -690,11 +693,13 @@ public class DefaultShutdownStrategy extends
ServiceSupport implements ShutdownS
suspendNow(deferred.getRoute().getId(), consumer);
// use basic endpoint uri to not log verbose details or
potential sensitive data
String uri =
deferred.getRoute().getEndpoint().getEndpointBaseUri();
+ uri = URISupport.sanitizeUri(uri);
LOG.info("Route: {} suspend complete, was consuming from:
{}", deferred.getRoute().getId(), uri);
} else {
shutdownNow(deferred.getRoute().getId(), consumer);
// use basic endpoint uri to not log verbose details or
potential sensitive data
String uri =
deferred.getRoute().getEndpoint().getEndpointBaseUri();
+ uri = URISupport.sanitizeUri(uri);
LOG.info("Route: {} shutdown complete, was consuming from:
{}", deferred.getRoute().getId(), uri);
}
}
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
index bf0ecf0..217c7c5 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedEndpointMBean.java
@@ -29,7 +29,7 @@ public interface ManagedEndpointMBean {
@ManagedAttribute(description = "Endpoint URI", mask = true)
String getEndpointUri();
- @ManagedAttribute(description = "Endpoint Base URI (no query parameters)")
+ @ManagedAttribute(description = "Endpoint Base URI (no query parameters)",
mask = true)
String getEndpointBaseUri();
@ManagedAttribute(description = "Singleton")
