EFRS-1316: Changed a special characters regex to a new one

VolodymyrBushko · VolodymyrBushko · commit b2b4104f0ee5 · 2022-11-03T16:29:57.000+02:00
diff --git a/java/admin/src/main/java/com/exadel/frs/dto/ui/AppCreateDto.java b/java/admin/src/main/java/com/exadel/frs/dto/ui/AppCreateDto.java
@@ -16,7 +16,7 @@
 
 package com.exadel.frs.dto.ui;
 
-import static com.exadel.frs.commonservice.system.global.RegExConstants.DOES_NOT_CONTAIN_SPECIAL_CHARACTERS;
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -33,6 +33,6 @@ public class AppCreateDto {
 
     @NotBlank(message = "Application name cannot be empty")
     @Size(min = 1, max = 50, message = "Application name size must be between 1 and 50")
-    @Pattern(regexp = DOES_NOT_CONTAIN_SPECIAL_CHARACTERS, message = "Only the following special characters are allowed: [].-_")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 }
diff --git a/java/admin/src/main/java/com/exadel/frs/dto/ui/AppUpdateDto.java b/java/admin/src/main/java/com/exadel/frs/dto/ui/AppUpdateDto.java
@@ -16,7 +16,7 @@
 
 package com.exadel.frs.dto.ui;
 
-import static com.exadel.frs.commonservice.system.global.RegExConstants.DOES_NOT_CONTAIN_SPECIAL_CHARACTERS;
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -33,6 +33,6 @@ public class AppUpdateDto {
 
     @NotBlank(message = "Application name cannot be empty")
     @Size(min = 1, max = 50, message = "Application name size must be between 1 and 50")
-    @Pattern(regexp = DOES_NOT_CONTAIN_SPECIAL_CHARACTERS, message = "Only the following special characters are allowed: [].-_")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 }
diff --git a/java/admin/src/main/java/com/exadel/frs/dto/ui/ModelCloneDto.java b/java/admin/src/main/java/com/exadel/frs/dto/ui/ModelCloneDto.java
@@ -16,7 +16,7 @@
 
 package com.exadel.frs.dto.ui;
 
-import static com.exadel.frs.commonservice.system.global.RegExConstants.DOES_NOT_CONTAIN_SPECIAL_CHARACTERS;
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -33,6 +33,6 @@ public class ModelCloneDto {
 
     @NotBlank(message = "Model name cannot be empty")
     @Size(min = 1, max = 50, message = "Model name size must be between 1 and 50")
-    @Pattern(regexp = DOES_NOT_CONTAIN_SPECIAL_CHARACTERS, message = "Only the following special characters are allowed: [].-_")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 }
diff --git a/java/admin/src/main/java/com/exadel/frs/dto/ui/ModelCreateDto.java b/java/admin/src/main/java/com/exadel/frs/dto/ui/ModelCreateDto.java
@@ -16,7 +16,7 @@
 
 package com.exadel.frs.dto.ui;
 
-import static com.exadel.frs.commonservice.system.global.RegExConstants.DOES_NOT_CONTAIN_SPECIAL_CHARACTERS;
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import com.exadel.frs.commonservice.enums.ModelType;
 import com.exadel.frs.validation.ValidEnum;
 import javax.validation.constraints.NotBlank;
@@ -35,7 +35,7 @@ public class ModelCreateDto {
 
     @NotBlank(message = "Model name cannot be empty")
     @Size(min = 1, max = 50, message = "Model name size must be between 1 and 50")
-    @Pattern(regexp = DOES_NOT_CONTAIN_SPECIAL_CHARACTERS, message = "Only the following special characters are allowed: [].-_")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 
     @NotBlank(message = "Model Type cannot be empty")
diff --git a/java/admin/src/main/java/com/exadel/frs/dto/ui/ModelUpdateDto.java b/java/admin/src/main/java/com/exadel/frs/dto/ui/ModelUpdateDto.java
@@ -16,7 +16,7 @@
 
 package com.exadel.frs.dto.ui;
 
-import static com.exadel.frs.commonservice.system.global.RegExConstants.DOES_NOT_CONTAIN_SPECIAL_CHARACTERS;
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -33,6 +33,6 @@ public class ModelUpdateDto {
 
     @NotBlank(message = "Model name cannot be empty")
     @Size(min = 1, max = 50, message = "Model name size must be between 1 and 50")
-    @Pattern(regexp = DOES_NOT_CONTAIN_SPECIAL_CHARACTERS, message = "Only the following special characters are allowed: [].-_")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String name;
 }
diff --git a/java/admin/src/test/java/com/exadel/frs/controller/AppControllerTest.java b/java/admin/src/test/java/com/exadel/frs/controller/AppControllerTest.java
@@ -370,7 +370,7 @@ public void shouldReturnOkWhenDeleteUserFromApp() throws Exception {
     public void shouldReturn400WhenTryingToSaveAppThatContainsSpecialCharactersWithinName() {
         var app = App.builder()
                      .id(APP_ID)
-                     .name("+(new@app)+!")
+                     .name("\\new;app//")
                      .build();
 
         val request = post(ADMIN + "/app")
@@ -380,7 +380,7 @@ public void shouldReturn400WhenTryingToSaveAppThatContainsSpecialCharactersWithi
                 .content(mapper.writeValueAsString(app)
                 );
 
-        val expectedContent = "{\"message\":\"Only the following special characters are allowed: [].-_\",\"code\":36}";
+        val expectedContent = "{\"message\":\"The name cannot contain the following special characters: ';', '/', '\\\\'\",\"code\":36}";
 
         mockMvc.perform(request)
                .andExpect(status().isBadRequest())
diff --git a/java/admin/src/test/java/com/exadel/frs/controller/ModelControllerTest.java b/java/admin/src/test/java/com/exadel/frs/controller/ModelControllerTest.java
@@ -259,14 +259,15 @@ void shouldReturnOkWhenDeleteModel() throws Exception {
     @SneakyThrows
     void shouldReturnErrorMessageWhenNameContainsSpecialCharactersOnCreateNewModel() {
         val bodyWithEmptyName = new ModelCreateDto();
-        bodyWithEmptyName.setName("(model!)");
+        bodyWithEmptyName.setName("\\new;model//");
         bodyWithEmptyName.setType("RECOGNITION");
 
         mockMvc.perform(post(ADMIN + "/app/" + APP_GUID + "/model")
                        .with(csrf())
                        .with(user(buildUser()))
                        .contentType(APPLICATION_JSON).content(mapper.writeValueAsString(bodyWithEmptyName)))
                .andExpect(status().isBadRequest())
-               .andExpect(content().string("{\"message\":\"Only the following special characters are allowed: [].-_\",\"code\":36}"));
+               .andExpect(content().string("{\"message\":\"The name cannot contain the following special characters: ';', '/', '\\\\'\"," +
+                       "\"code\":36}"));
     }
 }
diff --git a/java/api/src/main/java/com/exadel/frs/core/trainservice/dto/SubjectDto.java b/java/api/src/main/java/com/exadel/frs/core/trainservice/dto/SubjectDto.java
@@ -1,6 +1,6 @@
 package com.exadel.frs.core.trainservice.dto;
 
-import static com.exadel.frs.commonservice.system.global.RegExConstants.DOES_NOT_CONTAIN_SPECIAL_CHARACTERS;
+import static com.exadel.frs.commonservice.system.global.RegExConstants.ALLOWED_SPECIAL_CHARACTERS;
 import static com.exadel.frs.core.trainservice.system.global.Constants.SUBJECT_DESC;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +20,6 @@ public class SubjectDto {
     @JsonProperty("subject")
     @NotBlank(message = "Subject name cannot be empty")
     @Size(min = 1, max = 50, message = "Subject name size must be between 1 and 50")
-    @Pattern(regexp = DOES_NOT_CONTAIN_SPECIAL_CHARACTERS, message = "Only the following special characters are allowed: [].-_")
+    @Pattern(regexp = ALLOWED_SPECIAL_CHARACTERS, message = "The name cannot contain the following special characters: ';', '/', '\\'")
     private String subjectName;
 }
diff --git a/java/common/src/main/java/com/exadel/frs/commonservice/system/global/RegExConstants.java b/java/common/src/main/java/com/exadel/frs/commonservice/system/global/RegExConstants.java
@@ -5,6 +5,6 @@
 @UtilityClass
 public class RegExConstants {
 
-    public static final String CONTAINS_SPECIAL_CHARACTERS = "[`~!@\"#№$%^:;&?<>(){|},/\\\\*+=]+";
-    public static final String DOES_NOT_CONTAIN_SPECIAL_CHARACTERS = "[^`~!@\"#№$%^:;&?<>(){|},/\\\\*+=]+";
+    public static final String ALLOWED_SPECIAL_CHARACTERS = "[^;/\\\\]+";
+    public static final String PROHIBITED_SPECIAL_CHARACTERS = "[;/\\\\]+";
 }
diff --git a/java/common/src/main/java/com/exadel/frs/commonservice/system/liquibase/customchange/RemoveSpecialCharactersCustomChange.java b/java/common/src/main/java/com/exadel/frs/commonservice/system/liquibase/customchange/RemoveSpecialCharactersCustomChange.java
@@ -1,6 +1,6 @@
 package com.exadel.frs.commonservice.system.liquibase.customchange;
 
-import static com.exadel.frs.commonservice.system.global.RegExConstants.CONTAINS_SPECIAL_CHARACTERS;
+import static com.exadel.frs.commonservice.system.global.RegExConstants.PROHIBITED_SPECIAL_CHARACTERS;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -32,7 +32,7 @@
 @Setter
 public class RemoveSpecialCharactersCustomChange implements CustomTaskChange {
 
-    private static final Pattern SPECIAL_CHARACTERS_PATTERN = Pattern.compile(CONTAINS_SPECIAL_CHARACTERS);
+    private static final Pattern SPECIAL_CHARACTERS_PATTERN = Pattern.compile(PROHIBITED_SPECIAL_CHARACTERS);
 
     private static final String COUNT_SQL_TEMPLATE = "SELECT COUNT(*) FROM ${table}";
     private static final String SELECT_SQL_TEMPLATE = "SELECT ${primaryKey}, ${target} FROM ${table}";

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`	`@UtilityClass`
`6`	`6`	`public class RegExConstants {`
`7`	`7`
`8`		- public static final String CONTAINS_SPECIAL_CHARACTERS = "[`~!@\"#№$%^:;&?<>(){\|},/\\\\*+=]+";
`9`		- public static final String DOES_NOT_CONTAIN_SPECIAL_CHARACTERS = "[^`~!@\"#№$%^:;&?<>(){\|},/\\\\*+=]+";
	`8`	`+ public static final String ALLOWED_SPECIAL_CHARACTERS = "[^;/\\\\]+";`
	`9`	`+ public static final String PROHIBITED_SPECIAL_CHARACTERS = "[;/\\\\]+";`
`10`	`10`	`}`