| 
						
						
							
								
							
						
						
					 | 
					@ -16,7 +16,7 @@ import java.util.regex.Pattern; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 * | 
					 | 
					 | 
					 * | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 */ | 
					 | 
					 | 
					 */ | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					public class BCryptPasswordEncoder implements PasswordEncoder { | 
					 | 
					 | 
					public class BCryptPasswordEncoder implements PasswordEncoder { | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
						private Pattern BCRYPT_PATTERN = Pattern | 
					 | 
					 | 
						private static final Pattern BCRYPT_PATTERN = Pattern | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
								.compile("\\A\\$2a?\\$\\d\\d\\$[./0-9A-Za-z]{53}"); | 
					 | 
					 | 
								.compile("\\A\\$2a?\\$\\d\\d\\$[./0-9A-Za-z]{53}"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						private final Log logger = LogFactory.getLog(getClass()); | 
					 | 
					 | 
						private final Log logger = LogFactory.getLog(getClass()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -72,10 +72,10 @@ public class BCryptPasswordEncoder implements PasswordEncoder { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								return false; | 
					 | 
					 | 
								return false; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							} | 
					 | 
					 | 
							} | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
							if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { | 
					 | 
					 | 
							/*if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
								logger.warn("Encoded password does not look like BCrypt"); | 
					 | 
					 | 
								logger.warn("Encoded password does not look like BCrypt"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
								return false; | 
					 | 
					 | 
								return false; | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
							} | 
					 | 
					 | 
							}*/ | 
				
			
			
				
				
			
		
	
		
		
	
		
		
			
				
					 | 
					 | 
					
 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
							return BCrypt.checkpw(rawPassword.toString(), encodedPassword); | 
					 | 
					 | 
							return BCrypt.checkpw(rawPassword.toString(), encodedPassword); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
						} | 
					 | 
					 | 
						} | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |