added docker dev environment and fixed some bugs
This commit is contained in:
parent
1a907de8ba
commit
99c67eaaba
16 changed files with 1897 additions and 34 deletions
|
|
@ -8,6 +8,7 @@ import javax.naming.InitialContext;
|
|||
import javax.naming.NamingException;
|
||||
import javax.servlet.ServletConfig;
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.annotation.WebServlet;
|
||||
import javax.servlet.http.Cookie;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
|
|
@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
|
|||
import zutil.db.DBConnection;
|
||||
import zutil.log.LogUtil;
|
||||
|
||||
@WebServlet(value = "/init", loadOnStartup = 1)
|
||||
public class Zallery extends HttpServlet{
|
||||
private static Logger logger = LogUtil.getLogger();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package zall;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* Zallery globally defined constants
|
||||
*/
|
||||
|
|
@ -7,11 +9,12 @@ public interface ZalleryConstant {
|
|||
|
||||
/** Session Constants **/
|
||||
|
||||
String SESSION_KEY_USER = "zal_user";
|
||||
String SESSION_KEY_AUTH_HASH = "zal_session_hash";
|
||||
String SESSION_KEY_USER = "zall_user";
|
||||
String SESSION_KEY_AUTH_HASH = "zall_ueser_session_hash";
|
||||
|
||||
/** Language Key Constants **/
|
||||
|
||||
String LANG_BASENAME = "zallery_lang";
|
||||
String LANG_BASENAME = "zall.lang.zallery_lang";
|
||||
Locale LANG_DEFAULT = Locale.ENGLISH;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package zall;
|
||||
|
||||
import zall.util.UserMessage;
|
||||
import zutil.db.DBConnection;
|
||||
import zutil.log.LogUtil;
|
||||
|
||||
|
|
@ -9,16 +8,15 @@ import javax.servlet.ServletException;
|
|||
import javax.servlet.http.*;
|
||||
import java.io.IOException;
|
||||
import java.sql.SQLException;
|
||||
import java.util.Locale;
|
||||
import java.util.PropertyResourceBundle;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
import static zall.ZalleryConstant.LANG_BASENAME;
|
||||
import static zall.ZalleryConstant.*;
|
||||
|
||||
public abstract class ZalleryServlet extends HttpServlet {
|
||||
private static Logger logger = LogUtil.getLogger();
|
||||
protected ResourceBundle lang = PropertyResourceBundle.getBundle(LANG_BASENAME, Locale.getDefault());
|
||||
protected ResourceBundle lang = PropertyResourceBundle.getBundle(LANG_BASENAME, LANG_DEFAULT);
|
||||
|
||||
|
||||
public final void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import zall.manager.AuthenticationManager;
|
|||
import javax.servlet.*;
|
||||
import javax.servlet.annotation.WebFilter;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
|
|
@ -15,6 +14,7 @@ import java.io.IOException;
|
|||
@WebFilter(urlPatterns = "/")
|
||||
public class AuthenticationFilter implements Filter {
|
||||
private static final String LOGIN_URI = "/login";
|
||||
private static final String REGISTER_URI = "/register";
|
||||
|
||||
|
||||
@Override
|
||||
|
|
@ -26,14 +26,13 @@ public class AuthenticationFilter implements Filter {
|
|||
User user = null;
|
||||
|
||||
// continue the request via the filter pipeline if it is login page or it is a isValid User
|
||||
if (requestURI.equals(LOGIN_URI) || AuthenticationManager.isValid(user, (HttpServletRequest) request)) {
|
||||
if (requestURI.equals(LOGIN_URI) ||
|
||||
requestURI.equals(REGISTER_URI) ||
|
||||
AuthenticationManager.isValid(user, (HttpServletRequest) request)) {
|
||||
chain.doFilter(request, response);
|
||||
} else {
|
||||
// do not continue the filter pipeline but respond back to client
|
||||
HttpServletResponse resp = (HttpServletResponse) response;
|
||||
resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
|
||||
resp.setContentType("text/plain");
|
||||
resp.sendRedirect(LOGIN_URI);
|
||||
// do not continue the filter pipeline forward to login page
|
||||
request.getRequestDispatcher(LOGIN_URI).forward(request, response);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ import java.sql.SQLException;
|
|||
import java.util.List;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
@WebServlet("/register")
|
||||
@WebServlet("/users")
|
||||
public class UserListServlet extends ZalleryServlet {
|
||||
private static Logger logger = LogUtil.getLogger();
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ import zutil.StringUtil;
|
|||
import zutil.db.DBConnection;
|
||||
import zutil.log.LogUtil;
|
||||
|
||||
@WebServlet(value = "/transcoder", loadOnStartup = 1)
|
||||
@WebServlet(value = "/transcoder", loadOnStartup = 100)
|
||||
public class ZalleryTranscoder extends HttpServlet{
|
||||
private static final Logger logger = LogUtil.getLogger();
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue