You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/07/01 11:17:30 UTC
[jackrabbit-filevault] branch master updated: releng: fix some more
Sonar security hotspots
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new 7cbb891 releng: fix some more Sonar security hotspots
7cbb891 is described below
commit 7cbb8911fcabb974b8c7d3c424867b9c191d025e
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Jul 1 12:47:02 2021 +0200
releng: fix some more Sonar security hotspots
---
.../validation/spi/impl/AdvancedFilterValidatorFactory.java | 2 +-
.../vault/validation/spi/impl/PackageTypeValidatorFactory.java | 4 ++--
.../validation/spi/impl/nodetype/NodeTypeValidatorFactory.java | 9 +++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorFactory.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorFactory.java
index 170c012..3975231 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorFactory.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/AdvancedFilterValidatorFactory.java
@@ -140,7 +140,7 @@ public final class AdvancedFilterValidatorFactory implements ValidatorFactory {
validRoots.add("");
if (settings.getOptions().containsKey(OPTION_VALID_ROOTS)) {
String optionValue = settings.getOptions().get(OPTION_VALID_ROOTS);
- validRoots.addAll(Arrays.asList(optionValue.split("\\s*,\\s*")));
+ Arrays.stream(optionValue.split(",")).map(String::trim).forEach(validRoots::add);
} else {
validRoots.addAll(DEFAULT_VALID_ROOTS);
}
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidatorFactory.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidatorFactory.java
index 288d0ed..a5daff6 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidatorFactory.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/PackageTypeValidatorFactory.java
@@ -17,10 +17,10 @@
package org.apache.jackrabbit.vault.validation.spi.impl;
import java.util.Arrays;
-import java.util.HashSet;
import java.util.Set;
import java.util.TreeSet;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.vault.packaging.PackageType;
import org.apache.jackrabbit.vault.validation.spi.ValidationContext;
@@ -145,7 +145,7 @@ public final class PackageTypeValidatorFactory implements ValidatorFactory {
final Set<String> immutableRootNodeNames;
if (settings.getOptions().containsKey(OPTION_IMMUTABLE_ROOT_NODE_NAMES)) {
String immutableRootNodeNamesValue = settings.getOptions().get(OPTION_IMMUTABLE_ROOT_NODE_NAMES);
- immutableRootNodeNames = new HashSet<>(Arrays.asList(immutableRootNodeNamesValue.split("\\s*,\\s*")));
+ immutableRootNodeNames = Arrays.stream(immutableRootNodeNamesValue.split(",")).map(String::trim).collect(Collectors.toSet());
} else {
immutableRootNodeNames = DEFAULT_IMMUTABLE_ROOT_NODE_NAMES;
}
diff --git a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidatorFactory.java b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidatorFactory.java
index 4818fa9..8f4c6dd 100644
--- a/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidatorFactory.java
+++ b/vault-validation/src/main/java/org/apache/jackrabbit/vault/validation/spi/impl/nodetype/NodeTypeValidatorFactory.java
@@ -111,7 +111,7 @@ public class NodeTypeValidatorFactory implements ValidatorFactory {
try {
NodeTypeManagerProvider ntManagerProvider = null;
ntManagerProvider = new NodeTypeManagerProvider();
- for (String cndUrl : resolveJarUrls(cndUrls.split("\\s*,\\s*"))) {
+ for (String cndUrl : resolveJarUrls(cndUrls.split(","))) {
try (Reader reader = new InputStreamReader(URLFactory.createURL(cndUrl).openStream(), StandardCharsets.US_ASCII)) {
LOGGER.info("Register node types from {}", cndUrl);
ntManagerProvider.registerNodeTypes(reader);
@@ -137,6 +137,7 @@ public class NodeTypeValidatorFactory implements ValidatorFactory {
static List<String> resolveJarUrls(String... urls) {
List<String> resolvedUrls = new LinkedList<>();
for (String url : urls) {
+ url = url.trim();
if (url.endsWith(".jar")) {
// https://docs.oracle.com/javase/7/docs/api/java/net/JarURLConnection.html
URL jarUrl;
@@ -165,11 +166,11 @@ public class NodeTypeValidatorFactory implements ValidatorFactory {
static Map<String,String> parseNamespaces(String optionValue) {
Map<String,String> result = new HashMap<>();
- String[] namespaces = optionValue.split("\\s*,\\s*");
+ String[] namespaces = optionValue.split(",");
for (String namespace : namespaces) {
- String[] namespaceParts = namespace.split("\\s*=\\s*");
+ String[] namespaceParts = namespace.split("=");
if (namespaceParts.length == 2 && StringUtils.isNoneBlank(namespaceParts[0], namespaceParts[1])) {
- result.put(namespaceParts[0], namespaceParts[1]);
+ result.put(namespaceParts[0].trim(), namespaceParts[1].trim());
}
}
return result;