Fixed #2265

cerberustesting · Aug 18, 2021 · 12c7ff0 · 12c7ff0
1 parent 422766b
commit 12c7ff0
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 1 deletion.
diff --git a/source/src/main/java/org/cerberus/crud/entity/Invariant.java b/source/src/main/java/org/cerberus/crud/entity/Invariant.java
@@ -52,6 +52,7 @@ public class Invariant {
     public static final String IDNAME_COUNTRY = "COUNTRY";
     public static final String IDNAME_PRIORITY = "PRIORITY";
     public static final String IDNAME_ENVIRONMENT = "ENVIRONMENT";
+    public static final String IDNAME_SYSTEM = "SYSTEM";
 
     public String getDescription() {
         return description;

diff --git a/source/src/main/java/org/cerberus/servlet/crud/transversaltables/CreateInvariant.java b/source/src/main/java/org/cerberus/servlet/crud/transversaltables/CreateInvariant.java
@@ -50,7 +50,7 @@
 public class CreateInvariant extends HttpServlet {
 
     private static final Logger LOG = LogManager.getLogger(CreateInvariant.class);
-    
+
     /**
      * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
      * methods.
@@ -109,6 +109,27 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
                     .replace("%OPERATION%", "Create")
                     .replace("%REASON%", "Could not manage to convert sort to an integer value!"));
             ans.setResultMessage(msg);
+        } else if ((id.equals(Invariant.IDNAME_COUNTRY) || id.equals(Invariant.IDNAME_ENVIRONMENT) || id.equals(Invariant.IDNAME_SYSTEM))
+                && StringUtil.isNullOrEmpty(value)) {
+            msg = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_EXPECTED);
+            msg.setDescription(msg.getDescription().replace("%ITEM%", "Invariant")
+                    .replace("%OPERATION%", "Create")
+                    .replace("%REASON%", "Value is empty !! COUNTRY, ENVIRONMENT or SYSTEM invariant can't have empty value. "));
+            ans.setResultMessage(msg);
+        } else if ((id.equals(Invariant.IDNAME_COUNTRY) || id.equals(Invariant.IDNAME_ENVIRONMENT) || id.equals(Invariant.IDNAME_SYSTEM))
+                && value.length() > 45) {
+            msg = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_EXPECTED);
+            msg.setDescription(msg.getDescription().replace("%ITEM%", "Invariant")
+                    .replace("%OPERATION%", "Create")
+                    .replace("%REASON%", "Value is too large !! COUNTRY, ENVIRONMENT or SYSTEM invariant can't have more than 45 characters. "));
+            ans.setResultMessage(msg);
+        } else if ((id.equals(Invariant.IDNAME_COUNTRY) || id.equals(Invariant.IDNAME_ENVIRONMENT) || id.equals(Invariant.IDNAME_SYSTEM))
+                && (!value.matches("[a-zA-Z0-9-]+"))) {
+            msg = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_EXPECTED);
+            msg.setDescription(msg.getDescription().replace("%ITEM%", "Invariant")
+                    .replace("%OPERATION%", "Create")
+                    .replace("%REASON%", "Value contains special characters !! COUNTRY, ENVIRONMENT or SYSTEM invariant only allow letter, digits or -. "));
+            ans.setResultMessage(msg);
         } else {
             /**
              * All data seems cleans so we can call the services.

diff --git a/source/src/main/java/org/cerberus/servlet/crud/transversaltables/UpdateInvariant.java b/source/src/main/java/org/cerberus/servlet/crud/transversaltables/UpdateInvariant.java
@@ -125,6 +125,27 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
                     .replace("%OPERATION%", "Update")
                     .replace("%REASON%", "Could not manage to convert sort to an integer value!"));
             finalAnswer.setResultMessage(msg);
+        } else if ((id.equals(Invariant.IDNAME_COUNTRY) || id.equals(Invariant.IDNAME_ENVIRONMENT) || id.equals(Invariant.IDNAME_SYSTEM))
+                && StringUtil.isNullOrEmpty(value)) {
+            msg = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_EXPECTED);
+            msg.setDescription(msg.getDescription().replace("%ITEM%", "Invariant")
+                    .replace("%OPERATION%", "Create")
+                    .replace("%REASON%", "Value is empty !! COUNTRY, ENVIRONMENT or SYSTEM invariant can't have empty value. "));
+            finalAnswer.setResultMessage(msg);
+        } else if ((id.equals(Invariant.IDNAME_COUNTRY) || id.equals(Invariant.IDNAME_ENVIRONMENT) || id.equals(Invariant.IDNAME_SYSTEM))
+                && value.length() > 45) {
+            msg = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_EXPECTED);
+            msg.setDescription(msg.getDescription().replace("%ITEM%", "Invariant")
+                    .replace("%OPERATION%", "Create")
+                    .replace("%REASON%", "Value is too large !! COUNTRY, ENVIRONMENT or SYSTEM invariant can't have more than 45 characters. "));
+            finalAnswer.setResultMessage(msg);
+        } else if ((id.equals(Invariant.IDNAME_COUNTRY) || id.equals(Invariant.IDNAME_ENVIRONMENT) || id.equals(Invariant.IDNAME_SYSTEM))
+                && (!value.matches("[a-zA-Z0-9-]+"))) {
+            msg = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_EXPECTED);
+            msg.setDescription(msg.getDescription().replace("%ITEM%", "Invariant")
+                    .replace("%OPERATION%", "Create")
+                    .replace("%REASON%", "Value contains special characters !! COUNTRY, ENVIRONMENT or SYSTEM invariant only allow letter, digits or -. "));
+            finalAnswer.setResultMessage(msg);
         } else if (!userHasPermissions) {
             msg = new MessageEvent(MessageEventEnum.DATA_OPERATION_ERROR_EXPECTED);
             msg.setDescription(msg.getDescription().replace("%ITEM%", "Invariant")