This commit is contained in:
@@ -13,7 +13,7 @@ import java.util.*;
|
|||||||
|
|
||||||
@Component
|
@Component
|
||||||
public class RegRequestValidator implements Validator {
|
public class RegRequestValidator implements Validator {
|
||||||
private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
|
private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()\"\"]{1,200}$";
|
||||||
|
|
||||||
private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
|
private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
|
||||||
|
|
||||||
@@ -74,21 +74,6 @@ public class RegRequestValidator implements Validator {
|
|||||||
errors.rejectValue("companyName", "companyName.invalid.chars",
|
errors.rejectValue("companyName", "companyName.invalid.chars",
|
||||||
"Company name contains invalid characters");
|
"Company name contains invalid characters");
|
||||||
}
|
}
|
||||||
|
|
||||||
validateForbiddenWords(trimmedCompany, "companyName", errors,
|
|
||||||
Arrays.asList("admin", "root", "system", "test"));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void validateForbiddenWords(String text, String fieldName,
|
|
||||||
Errors errors, List<String> forbiddenWords) {
|
|
||||||
String lowerText = text.toLowerCase();
|
|
||||||
for (String word : forbiddenWords) {
|
|
||||||
if (lowerText.contains(word)) {
|
|
||||||
errors.rejectValue(fieldName, fieldName + ".forbidden.word",
|
|
||||||
"Contains forbidden word: " + word);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void validateEmail(String email, Errors errors) {
|
private void validateEmail(String email, Errors errors) {
|
||||||
|
|||||||
Reference in New Issue
Block a user