test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-04 20:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-9204 Ability to update "trusted client permitted ip list" without server restart

Browse Source
This commit is contained in:
Konstantin Krivopustov 2017-09-29 16:27:51 +04:00
parent 833d84b24b
commit ce9017a63c
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/com/haulmont/cuba/core/app/ServerConfig.java
View File

@ -48,6 +48,7 @@ public interface ServerConfig extends Config {
String getTrustedClientPassword();
@Property("cuba.trustedClientPermittedIpList")
@Source(type = SourceType.DATABASE)
String getTrustedClientPermittedIpList();
@Property("cuba.security.resetPasswordTemplateBody")

19
modules/core/src/com/haulmont/cuba/security/sys/TrustedLoginHandler.java
View File

@ -19,7 +19,6 @@ package com.haulmont.cuba.security.sys;
import com.haulmont.cuba.core.app.ServerConfig;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Component;
import javax.inject.Inject;
@ -32,23 +31,17 @@ public class TrustedLoginHandler {
@Inject
protected ServerConfig serverConfig;
protected Pattern permittedIpMaskPattern;
@Inject
public void setServerConfig(ServerConfig serverConfig) {
String permittedIpList = serverConfig.getTrustedClientPermittedIpList();
permittedIpList = convertToRegex(permittedIpList);
if (StringUtils.isEmpty(permittedIpList)) {
permittedIpList = "127\\.0\\.0\\.1";
}
permittedIpMaskPattern = Pattern.compile(permittedIpList);
}
/**
* @param address ip-address
* @return true if address in trusted list
*/
public boolean checkAddress(String address) {
String permittedIpList = serverConfig.getTrustedClientPermittedIpList();
permittedIpList = convertToRegex(permittedIpList);
if (StringUtils.isEmpty(permittedIpList)) {
permittedIpList = "127\\.0\\.0\\.1";
}
Pattern permittedIpMaskPattern = Pattern.compile(permittedIpList);
return permittedIpMaskPattern.matcher(address).matches();
}