Merge pull request eugenp#38 from egmp777/master

Security Registration Code

Author: Eugen

spring-security-login-error-handling/.classpath

@@ -17,16 +17,18 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

spring-security-login-error-handling/.project

@@ -26,7 +26,7 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.jboss.tools.jst.web.kb.kbbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -40,6 +40,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
@@ -50,5 +55,6 @@
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 		<nature>org.hibernate.eclipse.console.hibernateNature</nature>
+		<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
 	</natures>
 </projectDescription>

spring-security-login-error-handling/pom.xml

@@ -7,13 +7,11 @@
 	<name>spring-security-login-and-registration</name>
 	<packaging>war</packaging>
 	<version>1.0.0-BUILD-SNAPSHOT</version>
-
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
 		<version>1.1.5.RELEASE</version>
 	</parent>
-
 	<dependencies>
 		<!-- Spring -->
 		<dependency>
@@ -29,9 +27,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
-
-		<!-- Validation -->
-
 		<!-- logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -40,57 +35,47 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<!-- <scope>runtime</scope> -->
 		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
 			<!-- <scope>runtime</scope> --> <!-- some spring dependencies need to compile against jcl -->
 		</dependency>
-
 		<dependency> <!-- needed to bridge to slf4j for projects that use the log4j APIs directly -->
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
 		</dependency>
-
 		<!-- @Inject -->
 		<dependency>
 			<groupId>javax.inject</groupId>
 			<artifactId>javax.inject</artifactId>
 			<version>${javax.inject.version}</version>
 		</dependency>
-
 		<!-- Servlet -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>
 			<artifactId>javax.servlet.jsp-api</artifactId>
 			<version>${javax.servlet.jsp-api.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
 		</dependency>
-
 		<!-- Taglibs -->
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-taglibs</artifactId>
 		</dependency>
-
 		<!-- Test -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 		<!-- Spring Data JPA dependencies -->
 		<dependency>
 			<groupId>org.springframework.data</groupId>
@@ -104,7 +89,6 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
-
 		<!-- DB dependencies -->
 		<dependency>
 			<groupId>mysql</groupId>
@@ -129,7 +113,6 @@
 			<version>${guava.version}</version>
 		</dependency>
 	</dependencies>
-
 	<build>
 		<finalName>spring-security-login-and-registration</finalName>
 		<resources>
@@ -144,22 +127,16 @@
 		<org.springframework-version>3.1.1.RELEASE</org.springframework-version>
 		<org.springframework.security.version>3.2.5.RELEASE</org.springframework.security.version>
 		<org.aspectj-version>1.6.10</org.aspectj-version>
-
 		<!-- logging -->
 		<org.slf4j.version>1.7.6</org.slf4j.version>
 		<logback.version>1.1.1</logback.version>
-
 		<!-- javax jsp -->
 		<javax.servlet.jsp-api.version>2.3.2-b01</javax.servlet.jsp-api.version>
-
 		<!-- Inject -->
 		<javax.inject.version>1</javax.inject.version>
-
 		<!-- Spring Data Jpa -->
 		<spring-data-jpa.version>1.4.5.RELEASE</spring-data-jpa.version>
-
 		<!-- guava -->
 		<guava.version>17.0</guava.version>
 	</properties>
-
 </project>

spring-security-login-error-handling/src/main/java/org/baeldung/persistence/model/Role.java

@@ -23,6 +23,7 @@ public class Role {
     @JoinColumn(name = "user_id")
     private User user;
 
+
     @Column(name = "role")
     private Integer role;
 

spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/PasswordMatches.java

@@ -0,0 +1,22 @@
+package org.baeldung.persistence.service;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({TYPE,ANNOTATION_TYPE}) 
+@Retention(RUNTIME)
+@Constraint(validatedBy = PasswordMatchesValidator.class)
+@Documented
+public @interface PasswordMatches {
+    
+    String message() default "Passwords don't match";
+    Class<?>[] groups() default {}; 
+    Class<? extends Payload>[] payload() default {};
+}

spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/PasswordMatchesValidator.java

@@ -0,0 +1,16 @@
+package org.baeldung.persistence.service;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class PasswordMatchesValidator implements ConstraintValidator<PasswordMatches, Object> {
+    
+    @Override
+    public void initialize(PasswordMatches constraintAnnotation) {       
+    }
+    @Override
+    public boolean isValid(Object obj, ConstraintValidatorContext context){   
+        UserDto user = (UserDto) obj;
+        return user.getPassword().equals(user.getMatchingPassword());    
+    }     
+}

spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/RepositoryService.java

@@ -12,7 +12,6 @@
 public class RepositoryService implements UserService {
     @Autowired
     private UserRepository repository;
-
     @Autowired
     private Environment env;
 

spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/UserDto.java

@@ -1,9 +1,24 @@
 package org.baeldung.persistence.service;
 
+import javax.validation.constraints.NotNull;
+import org.hibernate.validator.constraints.NotEmpty;
+@PasswordMatches
 public class UserDto {
+    @NotNull
+    @NotEmpty
     private String firstName;
+    @NotNull
+    @NotEmpty
     private String lastName;
+    @NotNull
+    @NotEmpty
     private String password;
+    @NotNull
+    @NotEmpty
+    private String matchingPassword;
+    @ValidUsername
+    @NotNull
+    @NotEmpty
     private String username;
     private Integer role;
 
@@ -46,6 +61,12 @@ public String getPassword() {
     public void setPassword(String password) {
         this.password = password;
     }
+    public String getMatchingPassword() {
+        return matchingPassword;
+    }
+    public void setMatchingPassword(String matchingPassword) {
+        this.matchingPassword = matchingPassword;
+    }
 
     @Override
     public String toString() {

spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/UsernameValidator.java

@@ -0,0 +1,28 @@
+package org.baeldung.persistence.service;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+public class UsernameValidator implements ConstraintValidator<ValidUsername, String> {
+    private Pattern pattern;
+    private Matcher matcher;
+    private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@" + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
+
+    @Override
+    public void initialize(ValidUsername constraintAnnotation) {
+    }
+
+    @Override
+    public boolean isValid(String username, ConstraintValidatorContext context) {
+        return (validateEmail(username));
+    }
+
+    public boolean validateEmail(String email) {
+        pattern = Pattern.compile(EMAIL_PATTERN);
+        matcher = pattern.matcher(email);
+        return matcher.matches();
+    }
+}

spring-security-login-error-handling/src/main/java/org/baeldung/persistence/service/ValidUsername.java

@@ -0,0 +1,24 @@
+package org.baeldung.persistence.service;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({ TYPE, FIELD, ANNOTATION_TYPE })
+@Retention(RUNTIME)
+@Constraint(validatedBy = UsernameValidator.class)
+@Documented
+public @interface ValidUsername {
+
+    String message() default "Invalid Email";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}