You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2024/03/12 00:31:20 UTC
(cxf) branch 3.5.x-fixes updated (f13e2aab02 -> 6e4e54f0ee)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from f13e2aab02 Recording .gitmergeinfo Changes
new 6677639982 Bump org.apache.maven.plugins:maven-assembly-plugin from 3.6.0 to 3.7.0 (#1734)
new b4cecb6ce5 Update maven-remote-resources-plugin to 3.2.0
new 674eb17a1c [CXF-8982] add optional namespace prefix in template (#1721)
new 6e4e54f0ee Recording .gitmergeinfo Changes
The 4 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:
.gitmergeinfo | 4 ++++
parent/pom.xml | 2 +-
pom.xml | 2 +-
.../java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java | 11 ++++++++---
.../org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java | 12 ++++++++++--
5 files changed, 24 insertions(+), 7 deletions(-)
(cxf) 04/04: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6e4e54f0ee23d8da20d24500cf69ac3b8054e8ab
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Mar 11 20:23:54 2024 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index fc63c5dbb2..995c76a496 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -304,6 +304,7 @@ B ac6f425a395cb627ad794ac3750924d7eb791ed3
B aceb5a29385099ff0f3bbf88c2bdcabb4147c39d
B ad496ed008ae0b0d2636bc307559749fc28287c1
B ad6d812221f2ae859991ef5b7a5b9442c778ba10
+B ae72d14f86afc0c984c0f4d4ff3a6a26421d247f
B ae865c4aeb8d3ed8019fd0d23b0bbc38f0e66506
B aefd691b25c581317b43d46b1dd78ef1399a97fd
B af151eef0f4c90a9a538ca31023198c370164e99
@@ -536,6 +537,7 @@ M 310f93d91a00f4ab6297af2f574a0bfeda3e94f0
M 314c6c7f011f12f7b5715e11bea042585a9c79fd
M 31e00d4ec03b22d358af62fe0cb2b8785c856400
M 31f6f59502e16bc6c16817d246a9e08349f48da7
+M 338818fa1c5f3aee7d533199797b61a694dcbb46
M 34fb77e6ee1d061ebe5fc24e5f01d578ae31ae4f
M 35635cb20c474945adfe02f6b3e6d8d7dbf52b19
M 36453932d815079572cd5d9ff14eec328bf49786
@@ -642,6 +644,7 @@ M 659a083f2ff7e20df40f4e92e3aa2fed93b54ffc
M 65fd67d7e3d9ad8ed211c1fdeca91c4e75d81149
M 6618c5404b2a84ae9e40180dffbf90061026dc62
M 66afbe72d25741389d362bfb0c8bec9f5dbb5ee4
+M 66d5b9efd02243c13018fd3fcb652c8ceb037315
M 67d98fdc015ec4abba00cfac833e41481617c394
M 68acd8632245c4c80eda297bbd55c2f278ce1c0d
M 6a30d229f487a9446431a4c254c46d74be26a200
@@ -791,6 +794,7 @@ M b89e493384de54e2cad06914c244bd2d3af0f563
M b8cf8354e8828c1d6918d20b25967e28c49fe019
M b917c4635abc4d4a06cc7ce771a94ebd94c9d794
M b975e3c7cab1cea9220399e2a52e7d171d89b9b2
+M ba28396bbe6e2c457ca4b62a110048e71a6bdaa2
M ba34800cb3432e310d9fb5f9165619baa55c8bec
M ba58c444dd835e105136b9eab74e5c0e9e80914b
M bb048f3554f56ac31b139ff79984f0c332abd148
(cxf) 03/04: [CXF-8982] add optional namespace prefix in template (#1721)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 674eb17a1c55953389e4254af511bb52a4644fe5
Author: Gaëtan Pitteloud <ga...@generali.com>
AuthorDate: Tue Mar 12 01:05:22 2024 +0100
[CXF-8982] add optional namespace prefix in template (#1721)
* [CXF-8982] add optional namespace prefix in template
* [CXF-8982] add more characters to namespace prefix following W3C
* [CXF-8982] fixed checkstyle errors
(cherry picked from commit 275aa9f2c1b95b609ad7e0a4dc1c80d9e132924a)
(cherry picked from commit ba28396bbe6e2c457ca4b62a110048e71a6bdaa2)
# Conflicts:
# rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
---
.../java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java | 11 ++++++++---
.../org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java | 12 ++++++++++--
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
index 062a0e4d4b..94f2aa7c4a 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/MaskSensitiveHelper.java
@@ -27,8 +27,13 @@ import org.apache.cxf.message.Message;
public class MaskSensitiveHelper {
private static final String ELEMENT_NAME_TEMPLATE = "-ELEMENT_NAME-";
- private static final String MATCH_PATTERN_XML_TEMPLATE = "(<-ELEMENT_NAME-.*?>)(.*?)(</-ELEMENT_NAME->)";
- private static final String REPLACEMENT_XML_TEMPLATE = "$1XXX$3";
+ // see https://www.w3.org/TR/REC-xml-names/#NT-NCName for allowed chars in namespace prefix
+ private static final String PATTERN_XML_NAMESPACE_PREFIX = "[\\w.\\-\\u00B7\\u00C0-\\u00D6\\u00D8-\\u00F6"
+ + "\\u00F8-\\u02FF\\u0300-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u203F-\\u2040\\u2070-\\u218F"
+ + "\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD]+";
+ private static final String MATCH_PATTERN_XML_TEMPLATE = "(<(" + PATTERN_XML_NAMESPACE_PREFIX
+ + ":)?-ELEMENT_NAME-.*?>)(.*?)(</(" + PATTERN_XML_NAMESPACE_PREFIX + ":)?-ELEMENT_NAME->)";
+ private static final String REPLACEMENT_XML_TEMPLATE = "$1XXX$4";
private static final String MATCH_PATTERN_JSON_TEMPLATE = "\"-ELEMENT_NAME-\"[ \\t]*:[ \\t]*\"(.*?)\"";
private static final String REPLACEMENT_JSON_TEMPLATE = "\"-ELEMENT_NAME-\": \"XXX\"";
private static final String MASKED_HEADER_VALUE = "XXX";
@@ -55,7 +60,7 @@ public class MaskSensitiveHelper {
replacementsJSON.clear();
addSensitiveElementNames(inSensitiveElementNames);
}
-
+
public void addSensitiveElementNames(final Set<String> inSensitiveElementNames) {
for (final String sensitiveName : inSensitiveElementNames) {
addReplacementPair(MATCH_PATTERN_XML_TEMPLATE, REPLACEMENT_XML_TEMPLATE, sensitiveName, replacementsXML);
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
index 46450d9797..a61e5032b8 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/MaskSensitiveHelperTest.java
@@ -45,6 +45,7 @@ import static org.junit.Assert.assertNotNull;
@RunWith(Parameterized.class)
public class MaskSensitiveHelperTest {
+
private static final String SENSITIVE_LOGGING_CONTENT_XML =
"<user>testUser</user><password>my secret password</password>";
private static final String MASKED_LOGGING_CONTENT_XML =
@@ -59,7 +60,7 @@ public class MaskSensitiveHelperTest {
"\"user\":\"testUser\", \"password\": \"my secret password\"";
private static final String MASKED_LOGGING_CONTENT_JSON =
"\"user\":\"testUser\", \"password\": \"XXX\"";
-
+
private static final String SENSITIVE_LOGGING_MULTIPLE_ELEMENT_XML =
"<item><user>testUser1</user><password myAttribute=\"test\">my secret password 1</password></item>"
+ "<item><user>testUser2</user><password>my secret password 2</password></item>";
@@ -67,7 +68,13 @@ public class MaskSensitiveHelperTest {
"<item><user>testUser1</user><password myAttribute=\"test\">XXX</password></item>"
+ "<item><user>testUser2</user><password>XXX</password></item>";
- private static final Set<String> SENSITIVE_ELEMENTS = new HashSet(Arrays.asList("password"));
+ private static final String SENSITIVE_LOGGING_CONTENT_XML_WITH_NAMESPACE =
+ "<ns:user>testUser</ns:user><ns:password>my secret password</ns:password>";
+
+ private static final String MASKED_LOGGING_CONTENT_XML_WITH_NAMESPACE =
+ "<ns:user>testUser</ns:user><ns:password>XXX</ns:password>";
+
+ private static final Set<String> SENSITIVE_ELEMENTS = new HashSet<>(Arrays.asList("password"));
private static final String APPLICATION_XML = "application/xml";
private static final String APPLICATION_JSON = "application/json";
@@ -87,6 +94,7 @@ public class MaskSensitiveHelperTest {
{SENSITIVE_LOGGING_CONTENT_XML, MASKED_LOGGING_CONTENT_XML, APPLICATION_XML},
{SENSITIVE_LOGGING_CONTENT_XML_WITH_ATTRIBUTE, MASKED_LOGGING_CONTENT_XML_WITH_ATTRIBUTE, APPLICATION_XML},
{SENSITIVE_LOGGING_MULTIPLE_ELEMENT_XML, MASKED_LOGGING_MULTIPLE_ELEMENT_XML, APPLICATION_XML},
+ {SENSITIVE_LOGGING_CONTENT_XML_WITH_NAMESPACE, MASKED_LOGGING_CONTENT_XML_WITH_NAMESPACE, APPLICATION_XML},
{SENSITIVE_LOGGING_CONTENT_JSON, MASKED_LOGGING_CONTENT_JSON, APPLICATION_JSON}
});
}
(cxf) 01/04: Bump org.apache.maven.plugins:maven-assembly-plugin from 3.6.0 to 3.7.0 (#1734)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6677639982c4409d7cae24b1b56174a62f1e3ddb
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Mar 11 15:00:01 2024 -0400
Bump org.apache.maven.plugins:maven-assembly-plugin from 3.6.0 to 3.7.0 (#1734)
Bumps [org.apache.maven.plugins:maven-assembly-plugin](https://github.com/apache/maven-assembly-plugin) from 3.6.0 to 3.7.0.
- [Commits](https://github.com/apache/maven-assembly-plugin/compare/maven-assembly-plugin-3.6.0...maven-assembly-plugin-3.7.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-assembly-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 1d26f0fef7cb9578373a081548c5c18cd0b2be56)
(cherry picked from commit 3d973779dbd79b6fc8b8555117e4cc542524b046)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 593b1b9664..012fc878cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,7 +539,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.6.0</version>
+ <version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
(cxf) 02/04: Update maven-remote-resources-plugin to 3.2.0
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit b4cecb6ce5bbeb8a8935c553bf45b40465289b92
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Mar 11 15:08:05 2024 -0400
Update maven-remote-resources-plugin to 3.2.0
(cherry picked from commit 9632ed59d996a0404a5fe4969e3145b790742df5)
(cherry picked from commit 0192f8fc56e9b64e7c5a6c644078fa81774708d4)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 978f9ea3af..f7b416ea28 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -616,7 +616,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.2.0</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>