You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/05/19 16:25:36 UTC
svn commit: r1340486 - in
/camel/trunk/camel-core/src/main/java/org/apache/camel: component/dataset/
component/seda/ impl/ management/ management/event/ processor/
Author: davsclaus
Date: Sat May 19 14:25:35 2012
New Revision: 1340486
URL: http://svn.apache.org/viewvc?rev=1340486&view=rev
Log:
CAMEL-5291: Further use santizie uri to avoid logging sensitive information for endpoint uris.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java Sat May 19 14:25:35 2012
@@ -24,6 +24,7 @@ import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.processor.ThroughputLogger;
import org.apache.camel.util.CamelLogger;
+import org.apache.camel.util.URISupport;
/**
* DataSet consumer.
@@ -106,7 +107,9 @@ public class DataSetConsumer extends Def
}
protected ThroughputLogger createReporter() {
- CamelLogger logger = new CamelLogger(endpoint.getEndpointUri());
+ // must sanitize uri to avoid logging sensitive information
+ String uri = URISupport.sanitizeUri(endpoint.getEndpointUri());
+ CamelLogger logger = new CamelLogger(uri);
ThroughputLogger answer = new ThroughputLogger(logger, (int) endpoint.getDataSet().getReportCount());
answer.setAction("Sent");
return answer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java Sat May 19 14:25:35 2012
@@ -29,6 +29,7 @@ import org.apache.camel.processor.Throug
import org.apache.camel.util.CamelLogger;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -201,7 +202,9 @@ public class DataSetEndpoint extends Moc
}
protected ThroughputLogger createReporter() {
- CamelLogger logger = new CamelLogger(this.getEndpointUri());
+ // must sanitize uri to avoid logging sensitive information
+ String uri = URISupport.sanitizeUri(getEndpointUri());
+ CamelLogger logger = new CamelLogger(uri);
ThroughputLogger answer = new ThroughputLogger(logger, (int) this.getDataSet().getReportCount());
answer.setAction("Received");
return answer;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java Sat May 19 14:25:35 2012
@@ -70,7 +70,7 @@ public class SedaConsumer extends Servic
@Override
public String toString() {
- return "SedaConsumer[" + endpoint.getEndpointUri() + "]";
+ return "SedaConsumer[" + endpoint + "]";
}
public Endpoint getEndpoint() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java Sat May 19 14:25:35 2012
@@ -42,6 +42,7 @@ import org.apache.camel.spi.BrowsableEnd
import org.apache.camel.util.EndpointHelper;
import org.apache.camel.util.MessageHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.URISupport;
/**
* An implementation of the <a
@@ -125,7 +126,7 @@ public class SedaEndpoint extends Defaul
if (size > 1) {
if (multicastExecutor == null) {
// create multicast executor as we need it when we have more than 1 processor
- multicastExecutor = getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, getEndpointUri() + "(multicast)");
+ multicastExecutor = getCamelContext().getExecutorServiceManager().newDefaultThreadPool(this, URISupport.sanitizeUri(getEndpointUri()) + "(multicast)");
}
// create list of consumers to multicast to
List<Processor> processors = new ArrayList<Processor>(size);
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/seda/SedaProducer.java Sat May 19 14:25:35 2012
@@ -27,6 +27,7 @@ import org.apache.camel.WaitForTaskToCom
import org.apache.camel.impl.DefaultAsyncProducer;
import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.util.ExchangeHelper;
+import org.apache.camel.util.URISupport;
/**
* @version
@@ -104,7 +105,7 @@ public class SedaProducer extends Defaul
@Override
public String toString() {
- return "onDone at [" + endpoint.getEndpointUri() + "]";
+ return "onDone at endpoint: " + endpoint;
}
});
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Sat May 19 14:25:35 2012
@@ -398,7 +398,7 @@ public class DefaultCamelContext extends
answer.add(oldEndpoint);
endpoints.remove(entry.getKey());
} catch (Exception e) {
- log.warn("Endpoint '{}' matching pattern '{}' should be removed, but could not be stopped. Remove ignored...");
+ log.warn("Error stopping endpoint {}. This exception will be ignored.", oldEndpoint);
}
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToEndpoint.java Sat May 19 14:25:35 2012
@@ -117,7 +117,7 @@ public class InterceptSendToEndpoint imp
public void process(Exchange exchange) throws Exception {
// process the detour so we do the detour routing
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending to endpoint: {} is intercepted and detoured to: {} for exchange: {}", new Object[]{getEndpointUri(), detour, exchange});
+ LOG.debug("Sending to endpoint: {} is intercepted and detoured to: {} for exchange: {}", new Object[]{getEndpoint(), detour, exchange});
}
// add header with the real endpoint uri
exchange.getIn().setHeader(Exchange.INTERCEPTED_ENDPOINT, delegate.getEndpointUri());
@@ -130,7 +130,7 @@ public class InterceptSendToEndpoint imp
// Decide whether to continue or not; similar logic to the Pipeline
// check for error if so we should break out
- if (!continueProcessing(exchange, "skip sending to original intended destination: " + getEndpointUri(), LOG)) {
+ if (!continueProcessing(exchange, "skip sending to original intended destination: " + getEndpoint(), LOG)) {
return;
}
@@ -153,7 +153,7 @@ public class InterceptSendToEndpoint imp
// route to original destination
producer.process(exchange);
} else {
- LOG.debug("Stop() means skip sending exchange to original intended destination: {} for exchange: {}", getEndpointUri(), exchange);
+ LOG.debug("Stop() means skip sending exchange to original intended destination: {} for exchange: {}", getEndpoint(), exchange);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ScheduledPollConsumer.java Sat May 19 14:25:35 2012
@@ -161,14 +161,14 @@ public abstract class ScheduledPollConsu
}
} catch (Throwable t) {
// catch throwable to not let the thread die
- getExceptionHandler().handleException("Consumer " + this + " failed polling endpoint: " + getEndpoint().getEndpointUri()
+ getExceptionHandler().handleException("Consumer " + this + " failed polling endpoint: " + getEndpoint()
+ ". Will try again at next poll", t);
// we are done due this fatal error
done = true;
}
} catch (Throwable t) {
// catch throwable to not let the thread die
- getExceptionHandler().handleException("Consumer " + this + " failed polling endpoint: " + getEndpoint().getEndpointUri()
+ getExceptionHandler().handleException("Consumer " + this + " failed polling endpoint: " + getEndpoint()
+ ". Will try again at next poll", t);
// we are done due this fatal error
done = true;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java Sat May 19 14:25:35 2012
@@ -312,7 +312,7 @@ public class DefaultManagementLifecycleS
}
manageObject(me);
} catch (Exception e) {
- LOG.warn("Could not register Endpoint MBean for uri: " + endpoint.getEndpointUri(), e);
+ LOG.warn("Could not register Endpoint MBean for endpoint: " + endpoint + ". This exception will be ignored.", e);
}
}
@@ -326,7 +326,7 @@ public class DefaultManagementLifecycleS
Object me = getManagementObjectStrategy().getManagedObjectForEndpoint(camelContext, endpoint);
unmanageObject(me);
} catch (Exception e) {
- LOG.warn("Could not unregister Endpoint MBean for uri: " + endpoint.getEndpointUri(), e);
+ LOG.warn("Could not unregister Endpoint MBean for endpoint: " + endpoint + ". This exception will be ignored.", e);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/PublishEventNotifier.java Sat May 19 14:25:35 2012
@@ -26,6 +26,7 @@ import org.apache.camel.Producer;
import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.URISupport;
/**
* A {@link org.apache.camel.spi.EventNotifier} which publishes the {@link EventObject} to some
@@ -122,7 +123,7 @@ public class PublishEventNotifier extend
@Override
public String toString() {
- return "PublishEventNotifier[" + (endpoint != null ? endpoint.getEndpointUri() : endpointUri) + "]";
+ return "PublishEventNotifier[" + (endpoint != null ? endpoint : URISupport.sanitizeUri(endpointUri)) + "]";
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSendingEvent.java Sat May 19 14:25:35 2012
@@ -48,7 +48,7 @@ public class ExchangeSendingEvent extend
@Override
public String toString() {
- return getExchange().getExchangeId() + " exchange " + getExchange() + " is being sent to: " + endpoint.getEndpointUri();
+ return getExchange().getExchangeId() + " exchange " + getExchange() + " is being sent to: " + endpoint;
}
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/ExchangeSentEvent.java Sat May 19 14:25:35 2012
@@ -47,7 +47,7 @@ public class ExchangeSentEvent extends A
@Override
public String toString() {
- return getExchange().getExchangeId() + " exchange " + getExchange() + " sent to: " + endpoint.getEndpointUri() + " took: " + timeTaken + " ms.";
+ return getExchange().getExchangeId() + " exchange " + getExchange() + " sent to: " + endpoint + " took: " + timeTaken + " ms.";
}
}
\ No newline at end of file
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Enricher.java Sat May 19 14:25:35 2012
@@ -214,7 +214,7 @@ public class Enricher extends ServiceSup
@Override
public String toString() {
- return "Enrich[" + producer.getEndpoint().getEndpointUri() + "]";
+ return "Enrich[" + producer.getEndpoint() + "]";
}
protected void doStart() throws Exception {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java Sat May 19 14:25:35 2012
@@ -32,6 +32,7 @@ import org.apache.camel.support.ServiceS
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
+import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +74,7 @@ public class SendProcessor extends Servi
}
public String getTraceLabel() {
- return destination.getEndpointUri();
+ return URISupport.sanitizeUri(destination.getEndpointUri());
}
public void process(final Exchange exchange) throws Exception {
@@ -158,7 +159,8 @@ public class SendProcessor extends Servi
Endpoint lookup = camelContext.hasEndpoint(destination.getEndpointKey());
if (lookup instanceof InterceptSendToEndpoint) {
if (log.isDebugEnabled()) {
- log.debug("Intercepted sending to {} -> {}", destination.getEndpointUri(), lookup.getEndpointUri());
+ log.debug("Intercepted sending to {} -> {}",
+ URISupport.sanitizeUri(destination.getEndpointUri()), URISupport.sanitizeUri(lookup.getEndpointUri()));
}
destination = lookup;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java?rev=1340486&r1=1340485&r2=1340486&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/WireTapProcessor.java Sat May 19 14:25:35 2012
@@ -70,12 +70,12 @@ public class WireTapProcessor extends Se
@Override
public String toString() {
- return "WireTap[" + destination.getEndpointUri() + "]";
+ return "WireTap[" + destination + "]";
}
@Override
public String getTraceLabel() {
- return "wireTap(" + destination.getEndpointUri() + ")";
+ return "wireTap(" + destination + ")";
}
public void process(Exchange exchange) throws Exception {