Trying to fix XSS issues

[holmes/common.git] / holmes-actions / src / main / java / org / onap / holmes / common / utils / transactionid / TransactionIdUtils.java

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdUtils.java b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdUtils.java
index 7d04257..9d301ec 100644 (file)
--- a/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdUtils.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/utils/transactionid/TransactionIdUtils.java
@@ -15,23 +15,24 @@
  */
 package org.onap.holmes.common.utils.transactionid;
 
-import lombok.extern.slf4j.Slf4j;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-@Slf4j
 public class TransactionIdUtils {
     public static final String REQUEST_ID_HEADER = "X-TransactionID";
     public static final String INVOCATIONIDID_HEADER = "X-InvocationID";
-    private static final Pattern UUID_PATTERN = Pattern.compile("[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}");
+    private static final Pattern UUID_PATTERN = Pattern.compile("^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$");
 
     public static String getUUID() {
         return java.util.UUID.randomUUID().toString();
     }
 
-    public static boolean validate(String uuid) {
+    public static String validate(String uuid) {
         Matcher matcher = UUID_PATTERN.matcher(uuid);
-        return matcher.matches();
+        if (matcher.matches()) {
+            return uuid;
+        }
+
+        return null;
     }
 }