github
/
rk_svnadmin
mirror of https://github.com/Rekoe/rk_svnadmin
1
0
Fork 0
Code Issues Releases Wiki Activity

fix

pull/1/head
rekoe 2016-03-21 18:31:05 +08:00
parent 3b014956d6
commit 13490b8b6c
3 changed files with 0 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/main/java/com/rekoe/filter/IPFilter.java
View File

@ -1,120 +0,0 @@
package com.rekoe.filter;
import java.io.File;
import java.util.HashSet;
import java.util.Set;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.vfs2.FileChangeEvent;
import org.apache.commons.vfs2.FileListener;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.impl.DefaultFileMonitor;
import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.Files;
import org.nutz.lang.Lang;
import org.nutz.lang.util.Callback;
import org.nutz.log.Log;
import org.nutz.log.Logs;
import org.nutz.mvc.ActionContext;
import org.nutz.mvc.ActionFilter;
import org.nutz.mvc.Mvcs;
import org.nutz.mvc.View;
import org.nutz.mvc.view.RawView;
import org.nutz.mvc.view.ViewWrapper;
import com.rekoe.utils.CommonUtils;
@IocBean(create = "init")
public class IPFilter implements ActionFilter {
private final static Log log = Logs.get();
protected static final String IP_WHITE_LIST = "ipwhite";
protected String configPath = "";
protected Set<String> ipWhiteSet = new HashSet<String>();
private final View IP_FORBIT_ERROR = new ViewWrapper(new RawView(""), "非法IP");
/* 初始化 */
public void init() throws ServletException {
configPath = Mvcs.getNutConfig().getAppRoot() + "/../conf/";
refreshIPList();
initFileMonitor();
}
private void refreshIPList() {
try {
File file = Files.findFile(IP_WHITE_LIST);
if (Lang.isEmpty(file)) {
file = Files.findFile(configPath + IP_WHITE_LIST);
}
if (Lang.isEmpty(file)) {
this.ipWhiteSet = null;
return;
}
final Set<String> ips = new HashSet<String>();
Files.readLine(file, new Callback<String>() {
@Override
public void invoke(String str) {
ips.add(str);
}
});
this.ipWhiteSet = ips;
} catch (Exception e) {
log.error(e);
}
}
@Override
public View match(ActionContext actionContext) {
HttpServletRequest req = actionContext.getRequest();
String remoteIP = Lang.getIP(req);
if (log.isDebugEnabled()) {
log.debug(" ip file pass " + remoteIP);
}
if (this.ipWhiteSet == null || this.ipWhiteSet.isEmpty())
return null;
if (this.ipWhiteSet.contains(remoteIP) || CommonUtils.isInnerIP(remoteIP)) {
return null;
}
return IP_FORBIT_ERROR;
}
private void initFileMonitor() {
FileSystemManager fsManager = null;
org.apache.commons.vfs2.FileObject listendir = null;
try {
fsManager = VFS.getManager();
listendir = fsManager.resolveFile(new File(configPath).getAbsolutePath());
} catch (org.apache.commons.vfs2.FileSystemException e) {
log.error(e);
}
DefaultFileMonitor fm = new DefaultFileMonitor(new FileListener() {
public void fileCreated(FileChangeEvent event) throws Exception {
monitor(event);
}
public void fileDeleted(FileChangeEvent event) throws Exception {
monitor(event);
}
public void fileChanged(FileChangeEvent event) throws Exception {
monitor(event);
}
private void monitor(FileChangeEvent event) {
org.apache.commons.vfs2.FileObject fileObject = event.getFile();
FileName fileName = fileObject.getName();
if (fileName.getBaseName().contains(IP_WHITE_LIST)) {
refreshIPList();
}
}
});
fm.setRecursive(true);
fm.addFile(listendir);
fm.start();
}
}

5
src/main/java/com/rekoe/module/IndexAct.java
View File

@ -2,15 +2,10 @@ package com.rekoe.module;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.By;
import org.nutz.mvc.annotation.Filters;
import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Ok;
import com.rekoe.filter.IPFilter;
@IocBean @IocBean
@At("/user") @At("/user")
@Filters(@By(type = IPFilter.class, args = { "ioc:iPFilter" }))
public class IndexAct { public class IndexAct {
@At @At

4
src/main/java/com/rekoe/module/OauthLoginAct.java
View File

@ -32,8 +32,6 @@ import org.nutz.lang.Lang;
import org.nutz.lang.stream.NullInputStream; import org.nutz.lang.stream.NullInputStream;
import org.nutz.mvc.View; import org.nutz.mvc.View;
import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.By;
import org.nutz.mvc.annotation.Filters;
import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.view.ForwardView; import org.nutz.mvc.view.ForwardView;
import org.nutz.mvc.view.ServerRedirectView; import org.nutz.mvc.view.ServerRedirectView;
@ -42,7 +40,6 @@ import org.nutz.plugins.view.freemarker.FreeMarkerConfigurer;
import org.nutz.plugins.view.freemarker.FreemarkerView; import org.nutz.plugins.view.freemarker.FreemarkerView;
import com.rekoe.common.Message; import com.rekoe.common.Message;
import com.rekoe.filter.IPFilter;
import com.rekoe.shiro.realm.OAuthToken; import com.rekoe.shiro.realm.OAuthToken;
/** /**
@ -52,7 +49,6 @@ import com.rekoe.shiro.realm.OAuthToken;
*/ */
@IocBean(create = "init") @IocBean(create = "init")
@At("/user") @At("/user")
@Filters(@By(type = IPFilter.class, args = { "ioc:iPFilter" }))
public class OauthLoginAct { public class OauthLoginAct {
@Inject @Inject