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

Jump to bottom

Handle trailing spaces after email address when converting to Punycode #782

Merged
merged 3 commits into from
Mar 29, 2021
Merged

Handle trailing spaces after email address when converting to Punycode #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cb8126
Separate email address and leading/trailing space matching into separ…
eshryane Mar 12, 2021
6fbacea
Merge branch 'master' into punycode_trailing_spaces
eshryane Mar 15, 2021
9c78751
Merge branch 'master' into punycode_trailing_spaces
eshryane Mar 29, 2021
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
34 changes: 21 additions & 13 deletions whois-rpsl/src/main/java/net/ripe/db/whois/common/PunycodeConversion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,33 @@ public class PunycodeConversion {

private static final IDNEmailAddressConverter CONVERTER = new IDNEmailAddressConverter();

private static final Pattern EMAIL_ADDRESS_PATTERN = Pattern.compile("(?m)^(abuse-mailbox|e-mail|irt-nfy|mnt-nfy|notify|ref-nfy|upd-to)(?:\\:)(\\s+)(.*)(\\n|$)");
private static final Pattern EMAIL_ADDRESS_PATTERN = Pattern.compile("(?m)^(abuse-mailbox|e-mail|irt-nfy|mnt-nfy|notify|ref-nfy|upd-to)(?:\\:)([^#\\n]*)(.*)(\\n|$)");
private static final Pattern WHITESPACE_PATTERN = Pattern.compile("^(\\s*)(.*?)(\\s*)$");

private PunycodeConversion() {
// do not instantiate
}

public static String convert(final String value) {
final Matcher matcher = EMAIL_ADDRESS_PATTERN.matcher(value);
while (matcher.find()) {
final String key = matcher.group(1);
final String space = matcher.group(2);
final String address = matcher.group(3);
final String newline = matcher.group(4);

final String convertedAddress = toAscii(address);
if (!convertedAddress.equals(address)) {
final String originalMatch = matcher.group(0);
final String convertedMatch = String.format("%s:%s%s%s", key, space, convertedAddress, newline);
return convert(value.replace(originalMatch, convertedMatch));
final Matcher emailMatcher = EMAIL_ADDRESS_PATTERN.matcher(value);
while (emailMatcher.find()) {
final String attrKey = emailMatcher.group(1);
final String attrValue = emailMatcher.group(2);
final String attrComment = emailMatcher.group(3);
final String newline = emailMatcher.group(4);

final Matcher whitespaceMatcher = WHITESPACE_PATTERN.matcher(attrValue);
if (whitespaceMatcher.find()) {
final String leadingSpaces = whitespaceMatcher.group(1);
final String address = whitespaceMatcher.group(2);
final String trailingSpaces = whitespaceMatcher.group(3);

final String convertedAddress = toAscii(address);
if (!convertedAddress.equals(address)) {
final String originalMatch = emailMatcher.group(0);
final String convertedMatch = String.format("%s:%s%s%s%s%s", attrKey, leadingSpaces, convertedAddress, trailingSpaces, attrComment, newline);
return convert(value.replace(originalMatch, convertedMatch));
}
}
}

Expand Down
87 changes: 86 additions & 1 deletion whois-rpsl/src/test/java/net/ripe/db/whois/common/PunycodeConversionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import org.junit.Test;

import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;

public class PunycodeConversionTest {

Expand All @@ -24,6 +24,74 @@ public void convert_email() {
"source: TEST\n"));
}

@Test
public void convert_email_trailing_spaces() {
final String value =
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail: no-reply@zürich.example \n" +
"source: TEST\n";

final String result = PunycodeConversion.convert(value);

assertThat(result, is(
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail: no-reply@xn--zrich-kva.example \n" +
"source: TEST\n"));
}

@Test
public void convert_email_trailing_spaces_with_comment() {
final String value =
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail: no-reply@zürich.example # TODO \n" +
"source: TEST\n";

final String result = PunycodeConversion.convert(value);

assertThat(result, is(
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail: no-reply@xn--zrich-kva.example # TODO \n" +
"source: TEST\n"));
}

@Test
public void convert_email_many_trailing_spaces() {
final String value =
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail: no-reply@zürich.example" + " ".repeat(100) + "\n" +
"source: TEST\n";

final String result = PunycodeConversion.convert(value);

assertThat(result, is(
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail: no-reply@xn--zrich-kva.example" + " ".repeat(100) + "\n" +
"source: TEST\n"));
}

@Test
public void convert_email_many_trailing_spaces_with_comment() {
final String value =
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail: no-reply@zürich.example" + " ".repeat(100)+ "# TODO \n" +
"source: TEST\n";

final String result = PunycodeConversion.convert(value);

assertThat(result, is(
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail: no-reply@xn--zrich-kva.example" + " ".repeat(100)+ "# TODO \n" +
"source: TEST\n"));
}

@Test
public void convert_email_local_part_only() {
final String value =
Expand Down Expand Up @@ -92,6 +160,23 @@ public void convert_email_name_and_address() {
"source: TEST\n"));
}

@Test
public void convert_email_name_and_address_and_many_spaces_and_comment() {
final String value =
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail:" + " ".repeat(100) + "Example Test Usër <example@zürich.example>" + " ".repeat(100) + "# comment \n" +
"source: TEST\n";

final String result = PunycodeConversion.convert(value);

assertThat(result, is(
"role: Test Role\n" +
"nic-hdl: TR1-TEST\n" +
"e-mail:" + " ".repeat(100) + "Example Test Usër <example@xn--zrich-kva.example>" + " ".repeat(100) + "# comment \n" +
"source: TEST\n"));
}

@Test
public void convert_email_domain_only_not_local_part() {
final String value =
Expand Down