davsclaus commented on code in PR #21741:
URL: https://github.com/apache/camel/pull/21741#discussion_r2895423363
##########
components/camel-mdc/src/main/java/org/apache/camel/mdc/MDCService.java:
##########
@@ -203,12 +206,51 @@ private void prepareMDC(Exchange exchange, boolean push) {
// Set/unset those headers selected by the user.
private void userSelectedHeadersMDC(Exchange exchange, boolean push) {
for (String customHeader : getCustomHeaders().split(",")) {
- if (exchange.getIn().getHeader(customHeader) != null) {
- if (push) {
- MDC.put(customHeader,
exchange.getIn().getHeader(customHeader, String.class));
- } else {
- MDC.remove(customHeader);
+ if (customHeader.contains("*")) {
+ for (String filteredHeader :
filter(exchange.getIn().getHeaders().keySet(), customHeader)) {
+ String value = exchange.getIn().getHeader(filteredHeader,
String.class);
+ mdcAction(exchange, filteredHeader, value, push);
}
+ } else {
+ String value = exchange.getIn().getHeader(customHeader,
String.class);
+ mdcAction(exchange, customHeader, value, push);
+ }
+ }
+ }
+
+ // filter returns a list of values matching the condition expressed in the
filter.
+ private List<String> filter(Set<String> all, String filter) {
+ List<String> filteredHeaders = new ArrayList<>();
+ for (String f : all) {
+ if (matches(filter, f)) {
+ filteredHeaders.add(f);
+ }
+ }
+
+ return filteredHeaders;
+ }
+
+ // NOTE: we avoid using regex on purpose in order to avoid potential
vulnerabilities and better performances.
+ private boolean matches(String filter, String value) {
+ String[] parts = filter.split("\\*", -1);
+
+ int pos = 0;
+ for (String part : parts) {
+ int idx = value.indexOf(part, pos);
+ if (idx == -1)
Review Comment:
Use { } for this if
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
