From f46dd9445cc4b906c35df5e5306574d0694eafc5 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Sun, 29 Jan 2017 13:46:52 +0100 Subject: [PATCH] Fix #1079 --- .../java/fr/xephi/authme/service/ValidationService.java | 2 +- .../java/fr/xephi/authme/service/ValidationServiceTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/service/ValidationService.java b/src/main/java/fr/xephi/authme/service/ValidationService.java index 8ef7b1daa..7905b3671 100644 --- a/src/main/java/fr/xephi/authme/service/ValidationService.java +++ b/src/main/java/fr/xephi/authme/service/ValidationService.java @@ -80,7 +80,7 @@ public class ValidationService implements Reloadable { * @return true if the email is valid, false otherwise */ public boolean validateEmail(String email) { - if (!email.contains("@") || "your@email.com".equalsIgnoreCase(email)) { + if (!email.contains("@") || email.endsWith("@") || "your@email.com".equalsIgnoreCase(email)) { return false; } final String emailDomain = email.split("@")[1]; diff --git a/src/test/java/fr/xephi/authme/service/ValidationServiceTest.java b/src/test/java/fr/xephi/authme/service/ValidationServiceTest.java index a011d212e..21ffa9525 100644 --- a/src/test/java/fr/xephi/authme/service/ValidationServiceTest.java +++ b/src/test/java/fr/xephi/authme/service/ValidationServiceTest.java @@ -187,6 +187,12 @@ public class ValidationServiceTest { assertThat(validationService.validateEmail("invalidinput"), equalTo(false)); } + @Test + public void shouldRejectInvalidEmailWithoutDomain() { + // given/when/then + assertThat(validationService.validateEmail("invalidinput@"), equalTo(false)); + } + @Test public void shouldRejectDefaultEmail() { // given/when/then