diff --git a/spring-security-login-and-registration/pom.xml b/spring-security-login-and-registration/pom.xml index 89ef8d571c..2f0988ea2d 100644 --- a/spring-security-login-and-registration/pom.xml +++ b/spring-security-login-and-registration/pom.xml @@ -67,6 +67,14 @@ test + + + org.passay + passay + 1.0 + + + org.springframework.data diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java index 50466449a1..7ec07e9488 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java @@ -32,4 +32,6 @@ public interface IUserService { User getUserByID(long id); void changeUserPassword(User user, String password); + + boolean checkIfValidOldPassword(User user, String password); } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java index feaa3351e3..627aac81c4 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java @@ -1,32 +1,32 @@ package org.baeldung.persistence.service; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import org.baeldung.validation.PasswordMatches; import org.baeldung.validation.ValidEmail; -import org.hibernate.validator.constraints.NotEmpty; +import org.baeldung.validation.ValidPassword; @PasswordMatches public class UserDto { @NotNull - @NotEmpty + @Size(min = 1) private String firstName; @NotNull - @NotEmpty + @Size(min = 1) private String lastName; - @NotNull - @NotEmpty + @ValidPassword private String password; @NotNull - @NotEmpty + @Size(min = 1) private String matchingPassword; @ValidEmail @NotNull - @NotEmpty + @Size(min = 1) private String email; public String getEmail() { diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java index b9509f4f3a..fafe52953f 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java @@ -120,6 +120,11 @@ public class UserService implements IUserService { repository.save(user); } + @Override + public boolean checkIfValidOldPassword(final User user, final String oldPassword) { + return passwordEncoder.matches(oldPassword, user.getPassword()); + } + private boolean emailExist(final String email) { final User user = repository.findByEmail(email); if (user != null) { diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java index 3f1702defe..dc550d8c04 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/AuthenticationFailureListener.java @@ -14,6 +14,8 @@ public class AuthenticationFailureListener implements ApplicationListener { + + @Override + public void initialize(final ValidPassword arg0) { + + } + + @Override + public boolean isValid(final String password, final ConstraintValidatorContext context) { + final PasswordValidator validator = new PasswordValidator(Arrays.asList(new LengthRule(8, 30), new UppercaseCharacterRule(1), new DigitCharacterRule(1), new SpecialCharacterRule(1), new WhitespaceRule())); + final RuleResult result = validator.validate(new PasswordData(password)); + if (result.isValid()) { + return true; + } + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(Joiner.on("\n").join(validator.getMessages(result))).addConstraintViolation(); + return false; + } + +} diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java new file mode 100644 index 0000000000..37b217213a --- /dev/null +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java @@ -0,0 +1,27 @@ +package org.baeldung.validation; + +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.validation.Constraint; +import javax.validation.Payload; + +@Documented +@Constraint(validatedBy = PasswordConstraintValidator.class) +@Target({ TYPE, FIELD, ANNOTATION_TYPE }) +@Retention(RUNTIME) +public @interface ValidPassword { + + String message() default "Invalid Password"; + + Class[] groups() default {}; + + Class[] payload() default {}; + +} diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java index 10f2c64bc5..ab8d3feb66 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java @@ -14,6 +14,7 @@ import org.baeldung.persistence.service.IUserService; import org.baeldung.persistence.service.UserDto; import org.baeldung.registration.OnRegistrationCompleteEvent; import org.baeldung.validation.EmailExistsException; +import org.baeldung.web.error.InvalidOldPasswordException; import org.baeldung.web.error.UserAlreadyExistException; import org.baeldung.web.error.UserNotFoundException; import org.baeldung.web.util.GenericResponse; @@ -133,7 +134,6 @@ public class RegistrationController { final String appUrl = "http://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath(); final SimpleMailMessage email = constructResetTokenEmail(appUrl, request.getLocale(), token, user); mailSender.send(email); - return new GenericResponse(messages.getMessage("message.resetPasswordEmail", null, request.getLocale())); } @@ -168,6 +168,19 @@ public class RegistrationController { return new GenericResponse(messages.getMessage("message.resetPasswordSuc", null, locale)); } + // change user password + + @RequestMapping(value = "/user/updatePassword", method = RequestMethod.POST) + @ResponseBody + public GenericResponse changeUserPassword(final Locale locale, @RequestParam("password") final String password, @RequestParam("oldpassword") final String oldPassword) { + final User user = userService.findUserByEmail(SecurityContextHolder.getContext().getAuthentication().getName()); + if (!userService.checkIfValidOldPassword(user, oldPassword)) { + throw new InvalidOldPasswordException(); + } + userService.changeUserPassword(user, password); + return new GenericResponse(messages.getMessage("message.updatePasswordSuc", null, locale)); + } + // NON-API private final SimpleMailMessage constructResendVerificationTokenEmail(final String contextPath, final Locale locale, final VerificationToken newToken, final User user) { diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/InvalidOldPasswordException.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/InvalidOldPasswordException.java new file mode 100644 index 0000000000..74b4e04c1a --- /dev/null +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/InvalidOldPasswordException.java @@ -0,0 +1,23 @@ +package org.baeldung.web.error; + +public final class InvalidOldPasswordException extends RuntimeException { + + private static final long serialVersionUID = 5861310537366287163L; + + public InvalidOldPasswordException() { + super(); + } + + public InvalidOldPasswordException(final String message, final Throwable cause) { + super(message, cause); + } + + public InvalidOldPasswordException(final String message) { + super(message); + } + + public InvalidOldPasswordException(final Throwable cause) { + super(cause); + } + +} diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java index 58c089a733..c74cf25c2b 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/error/RestResponseEntityExceptionHandler.java @@ -29,7 +29,7 @@ public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionH // 400 @Override - protected ResponseEntity handleBindException(BindException ex, HttpHeaders headers, HttpStatus status, WebRequest request) { + protected ResponseEntity handleBindException(final BindException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) { logger.error("400 Status Code", ex); final BindingResult result = ex.getBindingResult(); final GenericResponse bodyOfResponse = new GenericResponse(result.getFieldErrors(), result.getGlobalErrors()); @@ -44,6 +44,13 @@ public class RestResponseEntityExceptionHandler extends ResponseEntityExceptionH return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.BAD_REQUEST, request); } + @ExceptionHandler({ InvalidOldPasswordException.class }) + public ResponseEntity handleInvalidOldPassword(final RuntimeException ex, final WebRequest request) { + logger.error("400 Status Code", ex); + final GenericResponse bodyOfResponse = new GenericResponse(messages.getMessage("message.invalidOldPassword", null, request.getLocale()), "InvalidOldEmail"); + return handleExceptionInternal(ex, bodyOfResponse, new HttpHeaders(), HttpStatus.BAD_REQUEST, request); + } + // 404 @ExceptionHandler({ UserNotFoundException.class }) public ResponseEntity handleUserNotFound(final RuntimeException ex, final WebRequest request) { diff --git a/spring-security-login-and-registration/src/main/resources/messages_en.properties b/spring-security-login-and-registration/src/main/resources/messages_en.properties index f3ad8d2307..74fd761c69 100644 --- a/spring-security-login-and-registration/src/main/resources/messages_en.properties +++ b/spring-security-login-and-registration/src/main/resources/messages_en.properties @@ -64,4 +64,9 @@ message.accountVerified=Your account verified successfully message.resetPasswordSuc=Password reset successfully message.resetYourPassword=Reset your password message.resetPasswordEmail=You should receive an Password Reset Email shortly -message.error=Error Occurred \ No newline at end of file +message.error=Error Occurred +message.updatePasswordSuc=Password updated successfully +message.changePassword=Change Password +message.invalidOldPassword=Invalid Old Password +label.user.newPassword=New Password +label.user.oldPassword=Old Password \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/resources/messages_es_ES.properties b/spring-security-login-and-registration/src/main/resources/messages_es_ES.properties index 0830f94336..b6cef686ca 100644 --- a/spring-security-login-and-registration/src/main/resources/messages_es_ES.properties +++ b/spring-security-login-and-registration/src/main/resources/messages_es_ES.properties @@ -64,4 +64,9 @@ message.accountVerified=Su cuenta verificada con message.resetPasswordSuc=Contraseña reajusta correctamente message.resetYourPassword=Restablecer su contraseña message.resetPasswordEmail=Te enviaremos un correo electrónico para restablecer su contraseña -message.error=Se produjo un error \ No newline at end of file +message.error=Se produjo un error +message.updatePasswordSuc=Contraseña actualizado correctamente +message.changePassword=Cambiar La Contraseña +message.invalidOldPassword=Inválida contraseña antigua +label.user.newPassword=Nueva Contraseña +label.user.oldPassword=Contraseña Anterior \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp index b31fbaef45..db3d8f20ba 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp @@ -1,29 +1,34 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> -" rel="stylesheet"> + <spring:message code="label.pages.home.title"></spring:message> -
-
- - - - -

- -

- - "> "> -
-
+ + +
+ + + + +

+ +

+ +
- + \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp index e090c55e29..c2ad64ec6a 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp @@ -1,38 +1,37 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> <%@ page session="true"%> -" rel="stylesheet"> - <spring:message +<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"> + <title><spring:message code="label.badUser.title"></spring:message> -

-
- ${param.message} +
+

+ ${param.message}


-">">

${label.form.resendRegistrationToken}

- +
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp new file mode 100644 index 0000000000..21f4e52c23 --- /dev/null +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp @@ -0,0 +1,72 @@ + +<%@ page contentType="text/html;charset=UTF-8" language="java"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="sec" + uri="http://www.springframework.org/security/tags"%> +<%@ page session="false"%> + + + + +<spring:message code="message.changePassword"></spring:message> + + + +
+
+ +

+
+
+ + + + +

+ + + +

+ + + + +

+ +
+ +
+
+ + + + + \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp index cd3146914d..1cf661af87 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp @@ -1,29 +1,42 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> -" rel="stylesheet"> + -
-
-

This is the landing page for the admin

- - This text is only visible to a user -
- - - This text is only visible to an admin -
- - "> "> -
-
+ + +
+ +
+${param.message} +
+ +

This is the landing page for the admin

+ + This text is only visible to a user +
+ + + This text is only visible to an admin +
+ + "> + + "> +
\ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp index ca94dbdfb0..ed25d1f2cd 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp @@ -2,18 +2,16 @@ <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> -" rel="stylesheet"> + <spring:message code="label.pages.home.title"></spring:message> -
-
-

- -

- -
-
+
+

+ +

+ +
- + \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp index 6d45aa3da4..e829daaa61 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> @@ -8,16 +8,17 @@ -" rel="stylesheet"> - <spring:message code="label.pages.home.title"></spring:message> + + <spring:message code="label.pages.home.title"></spring:message> -

+
+


-">"> - +
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp index 7e7ee0c01f..cff325846d 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp @@ -4,41 +4,30 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@ page session="false"%> -" rel="stylesheet"> + <spring:message code="message.resetPassword"></spring:message>
-
-

- -

-
-
- - - - - - - +

+
+
+ + +

-"> -
-"> +"> +

+">
-
- + @@ -68,42 +72,38 @@ ${param.message}
-
-
-

- -

- - | -
- - - - - - - - - - - - -
/>
+
+
+

+ +

+ + | +

+ + + + + +

+ + + +

+ /> - -
Current Locale : ${pageContext.response.locale}
"> -


- "> +
Current Locale : ${pageContext.response.locale}

+ "> +

+ "> -
-
+
+
\ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp index b83c558577..284cdc6621 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp @@ -1,32 +1,31 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> -" rel="stylesheet"> + -
- -
+

+ +

<spring:message code="label.pages.home.title"></spring:message> -
-
- -
- -
- - "> -
-
+
+ + +

+ +

+ + "> +
\ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp index 34f51c2881..52f61ff93b 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp @@ -6,7 +6,13 @@ + + <spring:message code="label.form.title"></spring:message> @@ -57,6 +63,14 @@