lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2017-05-14 12:27:27 +08:00
parent 6cc90ac7fe
commit f15754386b
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/org/redkale/net/http/HttpPrepareServlet.java
View File

@@ -41,16 +41,29 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
private final Object excludeLock = new Object(); private final Object excludeLock = new Object();
private Map<String, Predicate<String>> excludeUrlMaps; //禁用的URL的正则表达式, 必须与 excludeUrlPredicates 保持一致 private Map<String, BiPredicate<String, String>> excludeUrlMaps; //禁用的URL的正则表达式, 必须与 excludeUrlPredicates 保持一致
private Predicate<String>[] excludeUrlPredicates; //禁用的URL的Predicate, 必须与 excludeUrlMaps 保持一致 private BiPredicate<String, String>[] excludeUrlPredicates; //禁用的URL的Predicate, 必须与 excludeUrlMaps 保持一致
public void addExcludeUrlReg(final String urlreg) { public void addExcludeUrlReg(final String urlreg) {
if (urlreg == null || urlreg.isEmpty()) return; if (urlreg == null || urlreg.isEmpty()) return;
synchronized (excludeLock) { synchronized (excludeLock) {
if (excludeUrlMaps != null && excludeUrlMaps.containsKey(urlreg)) return; if (excludeUrlMaps != null && excludeUrlMaps.containsKey(urlreg)) return;
if (excludeUrlMaps == null) excludeUrlMaps = new HashMap<>(); if (excludeUrlMaps == null) excludeUrlMaps = new HashMap<>();
Predicate<String> predicate = Pattern.compile(urlreg).asPredicate(); String mapping = urlreg;
if (Utility.contains(mapping, '.', '*', '{', '[', '(', '|', '^', '$', '+', '?', '\\')) { //是否是正则表达式))
if (mapping.endsWith("/*")) {
mapping = mapping.substring(0, mapping.length() - 1) + ".*";
} else {
mapping = mapping + "$";
}
}
final String reg = mapping;
final boolean begin = mapping.charAt(0) == '^';
final Predicate regPredicate = Pattern.compile(reg).asPredicate();
BiPredicate<String, String> predicate = (prefix, uri) -> {
return begin || prefix.isEmpty() ? regPredicate.test(uri) : uri.matches(prefix + reg);
};
excludeUrlMaps.put(urlreg, predicate); excludeUrlMaps.put(urlreg, predicate);
excludeUrlPredicates = Utility.append(excludeUrlPredicates, predicate); excludeUrlPredicates = Utility.append(excludeUrlPredicates, predicate);
} }
@@ -60,7 +73,7 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
if (urlreg == null || urlreg.isEmpty()) return; if (urlreg == null || urlreg.isEmpty()) return;
synchronized (excludeLock) { synchronized (excludeLock) {
if (excludeUrlMaps == null || excludeUrlPredicates == null || !excludeUrlMaps.containsKey(urlreg)) return; if (excludeUrlMaps == null || excludeUrlPredicates == null || !excludeUrlMaps.containsKey(urlreg)) return;
Predicate<String> predicate = excludeUrlMaps.get(urlreg); BiPredicate<String, String> predicate = excludeUrlMaps.get(urlreg);
excludeUrlMaps.remove(urlreg); excludeUrlMaps.remove(urlreg);
int index = -1; int index = -1;
for (int i = 0; i < excludeUrlPredicates.length; i++) { for (int i = 0; i < excludeUrlPredicates.length; i++) {
@@ -74,7 +87,7 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
excludeUrlPredicates = null; excludeUrlPredicates = null;
} else { } else {
int newlen = excludeUrlPredicates.length - 1; int newlen = excludeUrlPredicates.length - 1;
Predicate[] news = new Predicate[newlen]; BiPredicate[] news = new BiPredicate[newlen];
System.arraycopy(excludeUrlPredicates, 0, news, 0, index); System.arraycopy(excludeUrlPredicates, 0, news, 0, index);
System.arraycopy(excludeUrlPredicates, index + 1, news, index, newlen - index); System.arraycopy(excludeUrlPredicates, index + 1, news, index, newlen - index);
excludeUrlPredicates = news; excludeUrlPredicates = news;
@@ -127,20 +140,7 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
public void execute(HttpRequest request, HttpResponse response) throws IOException { public void execute(HttpRequest request, HttpResponse response) throws IOException {
try { try {
final String uri = request.getRequestURI(); final String uri = request.getRequestURI();
boolean forbid = false; HttpServlet servlet = null;
if (excludeUrlPredicates != null && excludeUrlPredicates.length > 0) {
for (Predicate<String> predicate : excludeUrlPredicates) {
if (predicate != null && predicate.test(uri)) {
forbid = true;
break;
}
}
}
if (forbid) {
response.finish(403, response.getHttpCode(403));
return;
}
Servlet<HttpContext, HttpRequest, HttpResponse> servlet = null;
if (request.isWebSocket()) { if (request.isWebSocket()) {
servlet = wsmappings.get(uri); servlet = wsmappings.get(uri);
if (servlet == null && this.regWsArray != null) { if (servlet == null && this.regWsArray != null) {
@@ -168,6 +168,19 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
//找不到匹配的HttpServlet则使用静态资源HttpResourceServlet //找不到匹配的HttpServlet则使用静态资源HttpResourceServlet
if (servlet == null) servlet = this.resourceHttpServlet; if (servlet == null) servlet = this.resourceHttpServlet;
} }
boolean forbid = false;
if (excludeUrlPredicates != null && excludeUrlPredicates.length > 0) {
for (BiPredicate<String, String> predicate : excludeUrlPredicates) {
if (predicate != null && predicate.test(servlet._prefix, uri)) {
forbid = true;
break;
}
}
}
if (forbid) {
response.finish(403, response.getHttpCode(403));
return;
}
servlet.execute(request, response); servlet.execute(request, response);
} catch (Exception e) { } catch (Exception e) {
request.getContext().getLogger().log(Level.WARNING, "Servlet occur, forece to close channel. request = " + request, e); request.getContext().getLogger().log(Level.WARNING, "Servlet occur, forece to close channel. request = " + request, e);