Add file path validation

Add file path validation for EnvVarFileResolver.  Refactored
PathValidator to org.onap.ccsdk.sli.core.utils so it can be used here.

Change-Id: Ibb50df0ad020cf376c1ce20e7b598f7ad7223d48
Issue-ID: CCSDK-2918
Signed-off-by: Dan Timoney <dtimoney@att.com>

5 files changed, 5 insertions, 19 deletions

diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CheckSumHelper.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CheckSumHelper.java
index 2f1f466c..9283cf65 100644
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CheckSumHelper.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/CheckSumHelper.java
@@ -28,6 +28,8 @@ import java.nio.file.Paths;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+import org.onap.ccsdk.sli.core.utils.PathValidator;
+
 import javax.xml.bind.DatatypeConverter;
 
 public class CheckSumHelper {
diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/PathValidator.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/PathValidator.java
deleted file mode 100644
index 511dbca7..00000000
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/PathValidator.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.onap.ccsdk.sli.core.sli;
-
-import java.util.regex.Pattern;
-
-public class PathValidator {
-    public static boolean isValidXmlPath(String path) {
-        Pattern allowList = Pattern.compile("[-\\w/\\/]+\\.xml$");
-        return (allowList.matcher(path).matches());
-    }
-    public static boolean isValidPropertiesPath(String path) {
-        Pattern allowList = Pattern.compile("[-\\w/\\/]+\\.properties$");
-        return (allowList.matcher(path).matches());
-    }
-    public static boolean isValidFilePath(String path) {
-        Pattern allowList = Pattern.compile("[-\\w/\\/]+");
-        return (allowList.matcher(path).matches());
-    }
-}
diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java
index cb78ac2e..adec7b27 100644
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicParser.java
@@ -35,6 +35,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.*;
 import org.xml.sax.helpers.DefaultHandler;
+import org.onap.ccsdk.sli.core.utils.PathValidator;
 
 /**
  * @author dt5972
diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStoreFactory.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStoreFactory.java
index f682bb52..e0eb5730 100644
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStoreFactory.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicStoreFactory.java
@@ -26,6 +26,7 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.Properties;
 import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
+import org.onap.ccsdk.sli.core.utils.PathValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/FileRecorder.java b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/FileRecorder.java
index ab6f8bcc..7d690e74 100644
--- a/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/FileRecorder.java
+++ b/sli/provider-base/src/main/java/org/onap/ccsdk/sli/core/sli/recording/FileRecorder.java
@@ -33,7 +33,7 @@ import java.util.Map;
 import java.util.TimeZone;
 
 import org.onap.ccsdk.sli.core.sli.ConfigurationException;
-import org.onap.ccsdk.sli.core.sli.PathValidator;
+import org.onap.ccsdk.sli.core.utils.PathValidator;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicRecorder;