captcha fix

use config/kaptcha.properties

maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java

@@ -8,13 +8,8 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
 /**
- * 全局应用程序配置
+ * 全局应用程序配置 包含 1、数据源配置 dataSoruceConfig 2、字符集转换配置 characterEncodingConfig
- * 包含
+ * 3、webseal认证集成配置 webSealConfig 4、系统的配置 sysConfig 5、所有用户可访问地址配置 allAccessUrl
- * 	1、数据源配置 dataSoruceConfig
- * 	2、字符集转换配置 characterEncodingConfig
- * 	3、webseal认证集成配置 webSealConfig
- * 	4、系统的配置 sysConfig
- *  5、所有用户可访问地址配置  allAccessUrl
  * 
  * 其中1、2、3项在applicationContext.xml中配置，配置文件applicationConfig.properties
  * 4项根据dynamic的属性判断是否动态从sysConfigService动态读取
@@ -54,35 +49,33 @@ public class ApplicationConfig {
     String manageUri;
 
     /*
-	//is enable whiteList for ipAddress filter
+     * //is enable whiteList for ipAddress filter boolean whiteList;
-	boolean whiteList;
+     * 
-	
+     * //All user have permission Access URL public ConcurrentHashMap<String,String>
-	//All user have permission Access URL
+     * anonymousAccessUrls;
-	public  ConcurrentHashMap<String,String> anonymousAccessUrls;
      */
 
-	
-	
-	
     public ApplicationConfig() {
         super();
 
-		/*anonymousAccessUrls=new ConcurrentHashMap<String,String>();
+        /*
-		anonymousAccessUrls.put("/index/", "/index/");
+         * anonymousAccessUrls=new ConcurrentHashMap<String,String>();
-		anonymousAccessUrls.put("/index/top","/index/top/");
+         * anonymousAccessUrls.put("/index/", "/index/");
-		anonymousAccessUrls.put("/index/left/","/index/left/");
+         * anonymousAccessUrls.put("/index/top","/index/top/");
-		anonymousAccessUrls.put("/index/main/","/index/main/");
+         * anonymousAccessUrls.put("/index/left/","/index/left/");
-		anonymousAccessUrls.put("/index/bottom/","/index/bottom/");
+         * anonymousAccessUrls.put("/index/main/","/index/main/");
-		
+         * anonymousAccessUrls.put("/index/bottom/","/index/bottom/");
-		anonymousAccessUrls.put("/menus/onelevelchild/","/menus/onelevelchild/");
+         * 
-		anonymousAccessUrls.put("/menus/leftchild/","/menus/leftchild/");
+         * anonymousAccessUrls.put("/menus/onelevelchild/","/menus/onelevelchild/");
-		anonymousAccessUrls.put("/menus/loadMenu/","/menus/loadMenu/");
+         * anonymousAccessUrls.put("/menus/leftchild/","/menus/leftchild/");
-		
+         * anonymousAccessUrls.put("/menus/loadMenu/","/menus/loadMenu/");
-		anonymousAccessUrls.put("/enterprises/select/","/enterprises/select/");
+         * 
-		anonymousAccessUrls.put("/employees/selectAppRoles/","/employees/selectAppRoles/");
+         * anonymousAccessUrls.put("/enterprises/select/","/enterprises/select/");
-		anonymousAccessUrls.put("/approles/appRolesGrid/","/approles/appRolesGrid/");
+         * anonymousAccessUrls.put("/employees/selectAppRoles/",
-		
+         * "/employees/selectAppRoles/");
-		_logger.debug("Anonymous Access Urls : \n"+anonymousAccessUrls);
+         * anonymousAccessUrls.put("/approles/appRolesGrid/","/approles/appRolesGrid/");
+         * 
+         * _logger.debug("Anonymous Access Urls : \n"+anonymousAccessUrls);
          */
 
     }
@@ -91,7 +84,6 @@ public class ApplicationConfig {
         return dataSoruceConfig;
     }
 
-
     public void setDataSoruceConfig(DataSoruceConfig dataSoruceConfig) {
         this.dataSoruceConfig = dataSoruceConfig;
     }
@@ -106,12 +98,10 @@ public class ApplicationConfig {
     /**
      * @param characterEncodingConfig the characterEncodingConfig to set
      */
-	public void setCharacterEncodingConfig(
+    public void setCharacterEncodingConfig(CharacterEncodingConfig characterEncodingConfig) {
-			CharacterEncodingConfig characterEncodingConfig) {
         this.characterEncodingConfig = characterEncodingConfig;
     }
 
-
     public LoginConfig getLoginConfig() {
         return loginConfig;
     }
@@ -150,7 +140,8 @@ public class ApplicationConfig {
         this.domainName = domainName;
         String[] domainSubStrings = domainName.split("\\.");
         if (domainSubStrings.length >= 3) {
-			this.subDomainName=domainSubStrings[domainSubStrings.length-2]+"."+domainSubStrings[domainSubStrings.length-1];
+            this.subDomainName = domainSubStrings[domainSubStrings.length - 2] + "."
+                    + domainSubStrings[domainSubStrings.length - 1];
             _logger.debug("subDomainName " + subDomainName);
         } else {
             this.subDomainName = domainName;
@@ -164,17 +155,15 @@ public class ApplicationConfig {
     public void setSubDomainName(String subDomainName) {
         this.subDomainName = subDomainName;
     }
-	/*
-	public ConcurrentHashMap<String, String> getAnonymousAccessUrls() {
-		return anonymousAccessUrls;
-	}
 
-	public void setAnonymousAccessUrls(ArrayList<String> anonymousAccessUrls) {
+    /*
-		//this.anonymousAccessUrls = anonymousAccessUrls;
+     * public ConcurrentHashMap<String, String> getAnonymousAccessUrls() { return
-		for (String anonymousAccessUrl: anonymousAccessUrls){
+     * anonymousAccessUrls; }
-			this.anonymousAccessUrls.put(anonymousAccessUrl,anonymousAccessUrl);
+     * 
-		}
+     * public void setAnonymousAccessUrls(ArrayList<String> anonymousAccessUrls) {
-	}
+     * //this.anonymousAccessUrls = anonymousAccessUrls; for (String
+     * anonymousAccessUrl: anonymousAccessUrls){
+     * this.anonymousAccessUrls.put(anonymousAccessUrl,anonymousAccessUrl); } }
      */
     /**
      * @return the emailConfig
@@ -190,7 +179,6 @@ public class ApplicationConfig {
         this.emailConfig = emailConfig;
     }
 
-
     public String getManageUri() {
         return manageUri;
     }
@@ -208,12 +196,9 @@ public class ApplicationConfig {
     }
 
     /*
-	public boolean isWhiteList() {
+     * public boolean isWhiteList() { return whiteList; }
-		return whiteList;
+     * 
-	}
+     * public void setWhiteList(boolean whiteList) { this.whiteList = whiteList; }
-
+     */
-	public void setWhiteList(boolean whiteList) {
-		this.whiteList = whiteList;
-	}*/
 
 }

maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java

@@ -11,7 +11,7 @@ public class LoginConfig {
     boolean captcha;
     
     //验证码类型 text 文本 ， arithmetic算术验证码
-    @Value("${config.login.captcha.type}")
+    @Value("${config.login.captcha.type:text}")
     String captchaType;
     
     @Value("${config.login.onetimepwd}")

maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java

@@ -1,10 +1,17 @@
 package org.maxkey;
 
+import java.io.IOException;
+import java.util.Properties;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.connector.Connector;
 import org.apache.tomcat.util.descriptor.web.SecurityCollection;
 import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
 import org.maxkey.authz.oauth2.provider.endpoint.TokenEndpointAuthenticationFilter;
+import org.maxkey.authn.SavedRequestAwareAuthenticationSuccessHandler;
+import org.maxkey.crypto.password.PasswordReciprocal;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.server.ConfigurableWebServerFactory;
@@ -15,12 +22,19 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
 
+import com.google.code.kaptcha.Producer;
+import com.google.code.kaptcha.impl.DefaultKaptcha;
+import com.google.code.kaptcha.util.Config;
+
 @Configuration
 @ImportResource(locations = { "classpath:spring/maxkey.xml" })
 @PropertySource("classpath:/application.properties")
 public class MaxKeyConfig {
+    private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyConfig.class);
     @Value("${server.port:8080}")
     private int port;
 
@@ -87,4 +101,31 @@ public class MaxKeyConfig {
         return tomcat;
     }
     
+    @Bean(name = "passwordReciprocal")
+    public PasswordReciprocal passwordReciprocal() {
+        return new PasswordReciprocal();
+    }
+    
+    @Bean(name = "savedRequestSuccessHandler")
+    public SavedRequestAwareAuthenticationSuccessHandler SavedRequestAwareAuthenticationSuccessHandler() {
+        return new SavedRequestAwareAuthenticationSuccessHandler();
+    }
+    
+    /**
+     * Captcha Producer  Config .
+     * @return Producer
+     * @throws IOException
+     */
+    @Bean(name = "captchaProducer")
+    public Producer captchaProducer() throws IOException{
+        Resource resource = new ClassPathResource("config/kaptcha.properties");
+        _logger.debug("Kaptcha config file " + resource.getURL());
+        DefaultKaptcha  kaptcha=new DefaultKaptcha();
+        Properties properties = new Properties();
+        properties.load(resource.getInputStream());
+        Config config = new Config(properties);
+        kaptcha.setConfig(config);
+        return kaptcha;
+    }
+
 }

maxkey-web-maxkey/src/main/resources/config/kaptcha.properties

@@ -0,0 +1,9 @@
+kaptcha.image.width=80
+kaptcha.image.height=25
+kaptcha.border=no
+kaptcha.obscurificator.impl=com.google.code.kaptcha.impl.ShadowGimpy
+kaptcha.textproducer.font.size=23
+kaptcha.textproducer.char.string=0123456789
+kaptcha.textproducer.char.length=4
+kaptcha.noise.impl=com.google.code.kaptcha.impl.NoNoise
+#kaptcha.noise.color=white

maxkey-web-maxkey/src/main/resources/spring/maxkey-security.xml

@@ -72,12 +72,6 @@
 		
 		<ref bean="localeChangeInterceptor" />
 	</mvc:interceptors>
-     <!--
-	<bean id="remeberMeService" class="org.maxkey.authn.support.rememberme.JdbcRemeberMeService">
-		<constructor-arg ref="jdbcTemplate"/>
-		<property name="validity" value="${config.login.remeberme.validity}"/>
-	</bean>
-	  -->
 	  
 	<bean id="remeberMeService" class="org.maxkey.authn.support.rememberme.InMemoryRemeberMeService">
 	</bean>
@@ -88,7 +82,6 @@
 		<property name="issuer" value="MaxKey" />
 		<property name="domain" value="MaxKey.org" />
 		<property name="period" value="30" />
-		
 	</bean>
 	
 	<bean id="tfaOptAuthn" class="org.maxkey.crypto.password.opt.impl.TimeBasedOtpAuthn">
@@ -109,33 +102,6 @@
 	<!-- Authentication Password Encoder Config -->
 	<bean id="passwordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder"></bean>   
 	
-	<bean id="passwordReciprocal" class="org.maxkey.crypto.password.PasswordReciprocal"></bean>
-	
-	<!-- Captcha Producer  Config -->
-	<bean id="captchaProducer" class="com.google.code.kaptcha.impl.DefaultKaptcha">
-        <property name="config">
-	        <bean id="kaptchaConfig" class="com.google.code.kaptcha.util.Config">
-	             <constructor-arg type="java.util.Properties">
-	                     <props>
-	                             <prop key="kaptcha.image.width">80</prop> 
-	                             <prop key="kaptcha.image.height">25</prop>
-	                             <prop key="kaptcha.border">no</prop>
-	                             <prop key="kaptcha.obscurificator.impl">com.google.code.kaptcha.impl.ShadowGimpy</prop>
-	                             <prop key="kaptcha.textproducer.font.size">23</prop>
-	                             <prop key="kaptcha.textproducer.char.string">0123456789</prop>
-	                             <prop key="kaptcha.textproducer.char.length">4</prop>
-	                             <prop key="kaptcha.noise.impl">com.google.code.kaptcha.impl.NoNoise</prop>
-	                             <!-- 干扰线
-	                             <prop key="kaptcha.noise.color">white</prop>
-	                               -->
-	                     </props>
-	             </constructor-arg>
-	     </bean>
-	    </property>
-	</bean>
-	
-   	<bean id="savedRequestSuccessHandler" class="org.maxkey.authn.SavedRequestAwareAuthenticationSuccessHandler"> </bean>
-
 	<!-- LDAP Realm 
 	<bean id="authenticationRealm" class="org.maxkey.web.authentication.realm.ldap.LdapAuthenticationRealm">
 		<constructor-arg ref="jdbcTemplate"/>

maxkey-web-maxkey/src/main/resources/spring/maxkey-web.xml

@@ -101,9 +101,6 @@
 		</property>
 	</bean>
 
-	<!-- View Resolver
-	<bean id="viewResolver"  class="org.springframework.web.servlet.view.InternalResourceViewResolver" p:prefix="/templates/" p:suffix=".jsp" p:order="2" />
-	 -->
 	<!-- upload file support -->
     <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
     	<property name="maxUploadSize" value="4194304" />