dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7341 from YevhenBondarenko/feature/email-validation-improvements

Browse Source 
[3.4.2] email pattern improvements
This commit is contained in:
Andrew Shvayka 2022-09-28 10:37:32 +03:00 committed by GitHub
commit c8f2fac91b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java
View File

@ -35,7 +35,7 @@ import java.util.regex.Pattern;
@Slf4j
public abstract class DataValidator<D extends BaseData<?>> {
private static final Pattern EMAIL_PATTERN =
Pattern.compile("^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$", Pattern.CASE_INSENSITIVE);
Pattern.compile("^[A-Z0-9_!#$%&'*+/=?`{|}~^.-]+@[A-Z0-9.-]+\\.[A-Z]{2,}$", Pattern.CASE_INSENSITIVE);
private static final Pattern QUEUE_PATTERN = Pattern.compile("^[a-zA-Z0-9_.\\-]+$");

63
dao/src/test/java/org/thingsboard/server/dao/service/DataValidatorTest.java Normal file
View File

@ -0,0 +1,63 @@
/**
* Copyright © 2016-2022 The Thingsboard Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.thingsboard.server.dao.service;
import org.junit.Test;
import org.thingsboard.server.dao.exception.DataValidationException;
public class DataValidatorTest {
@Test
public void validateEmail() {
String email = "aZ1_!#$%&'*+/=?`{|}~^.-@mail.io";
DataValidator.validateEmail(email);
}
@Test(expected = DataValidationException.class)
public void validateInvalidEmail1() {
String email = "test:1@mail.io";
DataValidator.validateEmail(email);
}
@Test(expected = DataValidationException.class)
public void validateInvalidEmail2() {
String email = "test()1@mail.io";
DataValidator.validateEmail(email);
}
@Test(expected = DataValidationException.class)
public void validateInvalidEmail3() {
String email = "test[]1@mail.io";
DataValidator.validateEmail(email);
}
@Test(expected = DataValidationException.class)
public void validateInvalidEmail4() {
String email = "test\\1@mail.io";
DataValidator.validateEmail(email);
}
@Test(expected = DataValidationException.class)
public void validateInvalidEmail5() {
String email = "test\"1@mail.io";
DataValidator.validateEmail(email);
}
@Test(expected = DataValidationException.class)
public void validateInvalidEmail6() {
String email = "test<>1@mail.io";
DataValidator.validateEmail(email);
}
}