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 2023/06/21 12:09:23 UTC
[camel] branch camel-3.x updated (48b332d1b59 -> e84c687d018)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 48b332d1b59 CAMEL-18890: Remove camel-vertx-kafka (#10463)
new 30ab63e1eb7 CAMEL-19477: camel-micrometer - Use sanitized endpoint uri for captured events to avoid showing sensitive data such as passwords from URIs
new e84c687d018 Rename package name
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/component/micrometer/MicrometerEndpoint.java | 3 +--
.../MicrometerExchangeEventNotifierNamingStrategy.java | 3 ++-
.../apache/camel/component/micrometer/MicrometerEndpointTest.java | 8 --------
.../AbstractMicrometerEventNotifierTest.java | 3 +--
.../MicrometerExchangeEventNotifierTest.java | 7 +++----
.../MicrometerRouteEventNotifierTest.java | 4 +---
6 files changed, 8 insertions(+), 20 deletions(-)
rename components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/{eventNotifier => eventnotifier}/AbstractMicrometerEventNotifierTest.java (94%)
rename components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/{eventNotifier => eventnotifier}/MicrometerExchangeEventNotifierTest.java (92%)
rename components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/{eventNotifier => eventnotifier}/MicrometerRouteEventNotifierTest.java (91%)
[camel] 01/02: CAMEL-19477: camel-micrometer - Use sanitized endpoint uri for captured events to avoid showing sensitive data such as passwords from URIs
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 30ab63e1eb7ca531cd97ea9723298587c49faf19
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 21 14:03:31 2023 +0200
CAMEL-19477: camel-micrometer - Use sanitized endpoint uri for captured events to avoid showing sensitive data such as passwords from URIs
---
.../org/apache/camel/component/micrometer/MicrometerEndpoint.java | 3 +--
.../MicrometerExchangeEventNotifierNamingStrategy.java | 3 ++-
.../apache/camel/component/micrometer/MicrometerEndpointTest.java | 8 --------
.../eventNotifier/MicrometerExchangeEventNotifierTest.java | 3 ++-
4 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java
index b9b9f4e7325..886ada0bf90 100644
--- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java
+++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerEndpoint.java
@@ -24,7 +24,6 @@ import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
@@ -71,7 +70,7 @@ public class MicrometerEndpoint extends DefaultEndpoint {
@Override
public Consumer createConsumer(Processor processor) {
- throw new RuntimeCamelException("Cannot consume from " + getClass().getSimpleName() + ": " + getEndpointUri());
+ throw new UnsupportedOperationException("Consumer not supported");
}
@Override
diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierNamingStrategy.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierNamingStrategy.java
index 5092340669c..c7f935a9569 100644
--- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierNamingStrategy.java
+++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierNamingStrategy.java
@@ -48,7 +48,8 @@ public interface MicrometerExchangeEventNotifierNamingStrategy {
default Tags getTags(ExchangeEvent event, Endpoint endpoint) {
String uri = "";
if (endpoint != null) {
- uri = endpoint.getEndpointUri();
+ // use sanitized uri to not reveal sensitive information
+ uri = endpoint.toString();
}
return Tags.of(
CAMEL_CONTEXT_TAG, event.getExchange().getContext().getName(),
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java
index f2782d0308d..06ef6e8ec72 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/MicrometerEndpointTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
-import org.apache.camel.RuntimeCamelException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -35,7 +34,6 @@ import org.mockito.junit.jupiter.MockitoExtension;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
-import static org.junit.jupiter.api.Assertions.assertThrows;
@ExtendWith(MockitoExtension.class)
public class MicrometerEndpointTest {
@@ -85,12 +83,6 @@ public class MicrometerEndpointTest {
assertThat(endpoint.getRegistry(), is(registry));
}
- @Test
- public void testCreateConsumer() {
- assertThrows(RuntimeCamelException.class,
- () -> endpoint.createConsumer(processor));
- }
-
@Test
public void testIsSingleton() {
assertThat(endpoint.isSingleton(), is(true));
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
index 5b035212573..57dbc32ec3f 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
@@ -43,7 +43,8 @@ public class MicrometerExchangeEventNotifierTest extends AbstractMicrometerEvent
@Override
protected AbstractMicrometerEventNotifier<?> getEventNotifier() {
MicrometerExchangeEventNotifier eventNotifier = new MicrometerExchangeEventNotifier();
- eventNotifier.setNamingStrategy((exchange, endpoint) -> endpoint.getEndpointUri());
+ // use sanitized uri to not reveal sensitive information
+ eventNotifier.setNamingStrategy((exchange, endpoint) -> endpoint.toString());
return eventNotifier;
}
[camel] 02/02: Rename package name
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e84c687d018e529b491a06a02936b73c8adc88bb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 21 14:03:55 2023 +0200
Rename package name
---
.../AbstractMicrometerEventNotifierTest.java | 3 +--
.../MicrometerExchangeEventNotifierTest.java | 4 +---
.../MicrometerRouteEventNotifierTest.java | 4 +---
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java
similarity index 94%
rename from components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
rename to components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java
index 412b8a5daad..f86c02a49e1 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/AbstractMicrometerEventNotifierTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.micrometer.eventNotifier;
+package org.apache.camel.component.micrometer.eventnotifier;
import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
@@ -25,7 +25,6 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
-import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEventNotifier;
import org.apache.camel.test.junit5.CamelTestSupport;
abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport {
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java
similarity index 93%
rename from components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
rename to components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java
index 57dbc32ec3f..61271520e63 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerExchangeEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifierTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.micrometer.eventNotifier;
+package org.apache.camel.component.micrometer.eventnotifier;
import java.util.concurrent.TimeUnit;
@@ -22,8 +22,6 @@ import io.micrometer.core.instrument.Timer;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEventNotifier;
-import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifier;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.ExpressionAdapter;
import org.junit.jupiter.api.Test;
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerRouteEventNotifierTest.java
similarity index 91%
rename from components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java
rename to components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerRouteEventNotifierTest.java
index 3e914588219..a5e5e48f70a 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/MicrometerRouteEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerRouteEventNotifierTest.java
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.micrometer.eventNotifier;
+package org.apache.camel.component.micrometer.eventnotifier;
import io.micrometer.core.instrument.Gauge;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEventNotifier;
-import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifier;
import org.junit.jupiter.api.Test;
import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTES_ADDED;