admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-07 01:18:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

captcha fix

Browse Source 
use config/kaptcha.properties
This commit is contained in:
shimingxy 2020-05-15 12:46:17 +08:00
parent a6e7612ff3
commit 0e44a18f40
6 changed files with 212 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

317
maxkey-core/src/main/java/org/maxkey/config/ApplicationConfig.java
View File

@ -8,13 +8,8 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component; 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 * 其中1、2、3项在applicationContext.xml中配置，配置文件applicationConfig.properties
* 4项根据dynamic的属性判断是否动态从sysConfigService动态读取 * 4项根据dynamic的属性判断是否动态从sysConfigService动态读取
@ -25,195 +20,185 @@ import org.springframework.stereotype.Component;
@Component @Component
@PropertySource("classpath:/config/applicationConfig.properties") @PropertySource("classpath:/config/applicationConfig.properties")
public class ApplicationConfig { public class ApplicationConfig {
private static final Logger _logger = LoggerFactory.getLogger(ApplicationConfig.class); private static final Logger _logger = LoggerFactory.getLogger(ApplicationConfig.class);
@Autowired @Autowired
DataSoruceConfig dataSoruceConfig; DataSoruceConfig dataSoruceConfig;
@Autowired @Autowired
EmailConfig emailConfig; EmailConfig emailConfig;
@Autowired @Autowired
CharacterEncodingConfig characterEncodingConfig; CharacterEncodingConfig characterEncodingConfig;
@Autowired @Autowired
LoginConfig loginConfig; LoginConfig loginConfig;
@Value("${config.server.domain}") @Value("${config.server.domain}")
String domainName; String domainName;
@Value("${config.server.domain.sub}") @Value("${config.server.domain.sub}")
String subDomainName; String subDomainName;
@Value("${config.server.name}") @Value("${config.server.name}")
String serverName; String serverName;
@Value("${config.server.prefix.uri}") @Value("${config.server.prefix.uri}")
String serverPrefix; String serverPrefix;
@Value("${config.server.default.uri}") @Value("${config.server.default.uri}")
String defaultUri; String defaultUri;
@Value("${config.server.manage.uri}") @Value("${config.server.manage.uri}")
String manageUri; 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>
* anonymousAccessUrls;
*/
//All user have permission Access URL public ApplicationConfig() {
public ConcurrentHashMap<String,String> anonymousAccessUrls; super();
*/
/*
* anonymousAccessUrls=new ConcurrentHashMap<String,String>();
* anonymousAccessUrls.put("/index/", "/index/");
* anonymousAccessUrls.put("/index/top","/index/top/");
* anonymousAccessUrls.put("/index/left/","/index/left/");
* 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/loadMenu/","/menus/loadMenu/");
*
* anonymousAccessUrls.put("/enterprises/select/","/enterprises/select/");
* anonymousAccessUrls.put("/employees/selectAppRoles/",
* "/employees/selectAppRoles/");
* anonymousAccessUrls.put("/approles/appRolesGrid/","/approles/appRolesGrid/");
*
* _logger.debug("Anonymous Access Urls : \n"+anonymousAccessUrls);
*/
}
public DataSoruceConfig getDataSoruceConfig() {
return dataSoruceConfig;
}
public ApplicationConfig() { public void setDataSoruceConfig(DataSoruceConfig dataSoruceConfig) {
super(); this.dataSoruceConfig = dataSoruceConfig;
}
/*anonymousAccessUrls=new ConcurrentHashMap<String,String>(); /**
anonymousAccessUrls.put("/index/", "/index/"); * @return the characterEncodingConfig
anonymousAccessUrls.put("/index/top","/index/top/"); */
anonymousAccessUrls.put("/index/left/","/index/left/"); public CharacterEncodingConfig getCharacterEncodingConfig() {
anonymousAccessUrls.put("/index/main/","/index/main/"); return characterEncodingConfig;
anonymousAccessUrls.put("/index/bottom/","/index/bottom/"); }
anonymousAccessUrls.put("/menus/onelevelchild/","/menus/onelevelchild/"); /**
anonymousAccessUrls.put("/menus/leftchild/","/menus/leftchild/"); * @param characterEncodingConfig the characterEncodingConfig to set
anonymousAccessUrls.put("/menus/loadMenu/","/menus/loadMenu/"); */
public void setCharacterEncodingConfig(CharacterEncodingConfig characterEncodingConfig) {
this.characterEncodingConfig = characterEncodingConfig;
}
anonymousAccessUrls.put("/enterprises/select/","/enterprises/select/"); public LoginConfig getLoginConfig() {
anonymousAccessUrls.put("/employees/selectAppRoles/","/employees/selectAppRoles/"); return loginConfig;
anonymousAccessUrls.put("/approles/appRolesGrid/","/approles/appRolesGrid/"); }
_logger.debug("Anonymous Access Urls : \n"+anonymousAccessUrls); public void setLoginConfig(LoginConfig loginConfig) {
*/ this.loginConfig = loginConfig;
}
} public String getServerName() {
return serverName;
}
public DataSoruceConfig getDataSoruceConfig() { public void setServerName(String serverName) {
return dataSoruceConfig; this.serverName = serverName;
} }
public String getServerPrefix() {
return serverPrefix;
}
public void setDataSoruceConfig(DataSoruceConfig dataSoruceConfig) { public void setServerPrefix(String serverPrefix) {
this.dataSoruceConfig = dataSoruceConfig; this.serverPrefix = serverPrefix;
} }
/** /**
* @return the characterEncodingConfig * @return the domainName
*/ */
public CharacterEncodingConfig getCharacterEncodingConfig() { public String getDomainName() {
return characterEncodingConfig; return domainName;
} }
/** /**
* @param characterEncodingConfig the characterEncodingConfig to set * @param domainName the domainName to set
*/ */
public void setCharacterEncodingConfig( public void setDomainName(String domainName) {
CharacterEncodingConfig characterEncodingConfig) { this.domainName = domainName;
this.characterEncodingConfig = characterEncodingConfig; String[] domainSubStrings = domainName.split("\\.");
} if (domainSubStrings.length >= 3) {
this.subDomainName = domainSubStrings[domainSubStrings.length - 2] + "."
+ domainSubStrings[domainSubStrings.length - 1];
_logger.debug("subDomainName " + subDomainName);
} else {
this.subDomainName = domainName;
}
}
public String getSubDomainName() {
return subDomainName;
}
public LoginConfig getLoginConfig() { public void setSubDomainName(String subDomainName) {
return loginConfig; this.subDomainName = subDomainName;
} }
public void setLoginConfig(LoginConfig loginConfig) { /*
this.loginConfig = loginConfig; * public ConcurrentHashMap<String, String> getAnonymousAccessUrls() { return
} * anonymousAccessUrls; }
*
* public void setAnonymousAccessUrls(ArrayList<String> anonymousAccessUrls) {
* //this.anonymousAccessUrls = anonymousAccessUrls; for (String
* anonymousAccessUrl: anonymousAccessUrls){
* this.anonymousAccessUrls.put(anonymousAccessUrl,anonymousAccessUrl); } }
*/
/**
* @return the emailConfig
*/
public EmailConfig getEmailConfig() {
return emailConfig;
}
public String getServerName() { /**
return serverName; * @param emailConfig the emailConfig to set
} */
public void setEmailConfig(EmailConfig emailConfig) {
this.emailConfig = emailConfig;
}
public void setServerName(String serverName) { public String getManageUri() {
this.serverName = serverName; return manageUri;
} }
public String getServerPrefix() { public void setManageUri(String manageUri) {
return serverPrefix; this.manageUri = manageUri;
} }
public void setServerPrefix(String serverPrefix) { public String getDefaultUri() {
this.serverPrefix = serverPrefix; return defaultUri;
} }
/** public void setDefaultUri(String defaultUri) {
* @return the domainName this.defaultUri = defaultUri;
*/ }
public String getDomainName() {
return domainName;
}
/** /*
* @param domainName the domainName to set * public boolean isWhiteList() { return whiteList; }
*/ *
public void setDomainName(String domainName) { * public void setWhiteList(boolean whiteList) { this.whiteList = whiteList; }
this.domainName = domainName; */
String []domainSubStrings=domainName.split("\\.");
if(domainSubStrings.length>=3){
this.subDomainName=domainSubStrings[domainSubStrings.length-2]+"."+domainSubStrings[domainSubStrings.length-1];
_logger.debug("subDomainName "+subDomainName);
}else{
this.subDomainName=domainName;
}
}
public String getSubDomainName() {
return subDomainName;
}
public void setSubDomainName(String subDomainName) {
this.subDomainName = subDomainName;
}
/*
public ConcurrentHashMap<String, String> getAnonymousAccessUrls() {
return anonymousAccessUrls;
}
public void setAnonymousAccessUrls(ArrayList<String> anonymousAccessUrls) {
//this.anonymousAccessUrls = anonymousAccessUrls;
for (String anonymousAccessUrl: anonymousAccessUrls){
this.anonymousAccessUrls.put(anonymousAccessUrl,anonymousAccessUrl);
}
}
*/
/**
* @return the emailConfig
*/
public EmailConfig getEmailConfig() {
return emailConfig;
}
/**
* @param emailConfig the emailConfig to set
*/
public void setEmailConfig(EmailConfig emailConfig) {
this.emailConfig = emailConfig;
}
public String getManageUri() {
return manageUri;
}
public void setManageUri(String manageUri) {
this.manageUri = manageUri;
}
public String getDefaultUri() {
return defaultUri;
}
public void setDefaultUri(String defaultUri) {
this.defaultUri = defaultUri;
}
/*
public boolean isWhiteList() {
return whiteList;
}
public void setWhiteList(boolean whiteList) {
this.whiteList = whiteList;
}*/
} }

2
maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java
View File

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

41
maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java
View File

@ -1,10 +1,17 @@
package org.maxkey; package org.maxkey;
import java.io.IOException;
import java.util.Properties;
import org.apache.catalina.Context; import org.apache.catalina.Context;
import org.apache.catalina.connector.Connector; import org.apache.catalina.connector.Connector;
import org.apache.tomcat.util.descriptor.web.SecurityCollection; import org.apache.tomcat.util.descriptor.web.SecurityCollection;
import org.apache.tomcat.util.descriptor.web.SecurityConstraint; import org.apache.tomcat.util.descriptor.web.SecurityConstraint;
import org.maxkey.authz.oauth2.provider.endpoint.TokenEndpointAuthenticationFilter; 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.beans.factory.annotation.Value;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.web.server.ConfigurableWebServerFactory; 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.Configuration;
import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.ImportResource;
import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySource;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.http.HttpStatus; 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 @Configuration
@ImportResource(locations = { "classpath:spring/maxkey.xml" }) @ImportResource(locations = { "classpath:spring/maxkey.xml" })
@PropertySource("classpath:/application.properties") @PropertySource("classpath:/application.properties")
public class MaxKeyConfig { public class MaxKeyConfig {
private static final Logger _logger = LoggerFactory.getLogger(MaxKeyConfig.class);
@Value("${server.port:8080}") @Value("${server.port:8080}")
private int port; private int port;
@ -87,4 +101,31 @@ public class MaxKeyConfig {
return tomcat; 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;
}
} }

9
maxkey-web-maxkey/src/main/resources/config/kaptcha.properties Normal file
View File

@ -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

34
maxkey-web-maxkey/src/main/resources/spring/maxkey-security.xml
View File

@ -72,12 +72,6 @@
<ref bean="localeChangeInterceptor" /> <ref bean="localeChangeInterceptor" />
</mvc:interceptors> </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 id="remeberMeService" class="org.maxkey.authn.support.rememberme.InMemoryRemeberMeService">
</bean> </bean>
@ -88,7 +82,6 @@
<property name="issuer" value="MaxKey" /> <property name="issuer" value="MaxKey" />
<property name="domain" value="MaxKey.org" /> <property name="domain" value="MaxKey.org" />
<property name="period" value="30" /> <property name="period" value="30" />
</bean> </bean>
<bean id="tfaOptAuthn" class="org.maxkey.crypto.password.opt.impl.TimeBasedOtpAuthn"> <bean id="tfaOptAuthn" class="org.maxkey.crypto.password.opt.impl.TimeBasedOtpAuthn">
@ -109,33 +102,6 @@
<!-- Authentication Password Encoder Config --> <!-- Authentication Password Encoder Config -->
<bean id="passwordEncoder" class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder"></bean> <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 <!-- LDAP Realm
<bean id="authenticationRealm" class="org.maxkey.web.authentication.realm.ldap.LdapAuthenticationRealm"> <bean id="authenticationRealm" class="org.maxkey.web.authentication.realm.ldap.LdapAuthenticationRealm">
<constructor-arg ref="jdbcTemplate"/> <constructor-arg ref="jdbcTemplate"/>

3
maxkey-web-maxkey/src/main/resources/spring/maxkey-web.xml
View File

@ -101,9 +101,6 @@
</property> </property>
</bean> </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 --> <!-- upload file support -->
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"> <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
<property name="maxUploadSize" value="4194304" /> <property name="maxUploadSize" value="4194304" />