Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update regex for email address #1826

Merged
merged 4 commits into from
Dec 6, 2023
Merged

Update regex for email address #1826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c37472a
Update regex for email address
yostyle Oct 23, 2023
80f965a
Add changelog
yostyle Oct 23, 2023
c038a67
Add unit test
yostyle Nov 25, 2023
f1dbc38
rename changelog
yostyle Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MatrixSDK/Utils/MXTools.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#warning File has not been annotated with nullability, see MX_ASSUME_MISSING_NULLABILITY_BEGIN

#pragma mark - Constant definition
NSString *const kMXToolsRegexStringForEmailAddress = @"[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,}";
NSString *const kMXToolsRegexStringForEmailAddress = @"^[a-zA-Z0-9_!#$%&'*+/=?`{|}~^-]+(?:\\.[a-zA-Z0-9_!#$%&'*+/=?`{|}~^-]+)*@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$";

// The HS domain part in Matrix identifiers
#define MATRIX_HOMESERVER_DOMAIN_REGEX @"[A-Z0-9]+((\\.|\\-)[A-Z0-9]+){0,}(:[0-9]{2,5})?"
Expand Down
52 changes: 52 additions & 0 deletions MatrixSDKTests/MXToolsUnitTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,58 @@ - (void)testMatrixIdentifiers
XCTAssertTrue([MXTools isMatrixGroupIdentifier:@"+matrix:matrix.org"]);
}

- (void)testEmailAddresses
{
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"alice@matrix"]);
XCTAssertTrue([MXTools isEmailAddress:@"al-i_ce@matrix"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"*@example.net"]);
XCTAssertTrue([MXTools isEmailAddress:@"fred&[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"mailbox.sub1.sub2@this-domain"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"admin@mailserver1"]);
XCTAssertTrue([MXTools isEmailAddress:@"#!$%&'*+-/=?^_`{}|[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"example@localhost"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"user@localserver"]);
XCTAssertTrue([MXTools isEmailAddress:@"user@tt"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertTrue([MXTools isEmailAddress:@"[email protected]"]);

XCTAssertFalse([MXTools isEmailAddress:@"alice.matrix.org"]);
XCTAssertFalse([MXTools isEmailAddress:@"al [email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"al([email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"alice@"]);
XCTAssertFalse([MXTools isEmailAddress:@"al\[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"al@[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"al@[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"Just a string"]);
XCTAssertFalse([MXTools isEmailAddress:@"string"]);
XCTAssertFalse([MXTools isEmailAddress:@"me@"]);
XCTAssertFalse([MXTools isEmailAddress:@"@example.com"]);
XCTAssertFalse([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"me\\@example.com"]);
XCTAssertFalse([MXTools isEmailAddress:@"Abc.example.com"]);
XCTAssertFalse([MXTools isEmailAddress:@"A@b@[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"a\"b(c)d,e:f;g<h>i[j\\k][email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"just\"not\"[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"this is\"not\\[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"this\\ still\\\"not\\\\[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"[email protected]"]);
XCTAssertFalse([MXTools isEmailAddress:@"[email protected]"]);
}


#pragma mark - Strings encoding

Expand Down
1 change: 1 addition & 0 deletions changelog.d/pr-1826.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update regex for email address to be aligned email format in RFC 5322
Loading