Merge remote-tracking branch 'upstream/master'

This commit is contained in:
wenshao
2016-12-10 19:50:42 +08:00
@@ -214,6 +214,7 @@ public abstract class ResourceServlet extends HttpServlet {
if (isRequireAuth() //
&& !ContainsUser(request)//
&& !checkLoginParam(request)//
&& !("/login.html".equals(path) //
|| path.startsWith("/css")//
|| path.startsWith("/js") //
@@ -262,6 +263,17 @@ public abstract class ResourceServlet extends HttpServlet {
return session != null && session.getAttribute(SESSION_USER_KEY) != null;
}
public boolean checkLoginParam(HttpServletRequest request) {
String usernameParam = request.getParameter(PARAM_NAME_USERNAME);
String passwordParam = request.getParameter(PARAM_NAME_PASSWORD);
if(null == username || null == password){
return false;
} else if (username.equals(usernameParam) && password.equals(passwordParam)) {
return true;
}
return false;
}
public boolean isRequireAuth() {
return this.username != null;
}