+import freemarker.template.SimpleHash;\r
+import freemarker.template.SimpleList;\r
+import freemarker.template.SimpleScalar;\r
+import freemarker.template.TemplateModel;\r
+\r
+import mir.config.MirPropertiesConfiguration;\r
+\r
+import mir.generator.FreemarkerGenerator;\r
+\r
+import mir.misc.HTMLTemplateProcessor;\r
+import mir.misc.StringUtil;\r
+\r
+import mir.servlet.AbstractServlet;\r
+import mir.servlet.ServletModule;\r
+import mir.servlet.ServletModuleDispatch;\r
+import mir.servlet.ServletModuleException;\r
+import mir.servlet.ServletModuleUserException;\r
+\r
+import mir.util.StringRoutines;\r
+\r
+import mircoders.entity.EntityUsers;\r
+\r
+import mircoders.global.MirGlobal;\r
+\r
+import mircoders.module.ModuleMessage;\r
+import mircoders.module.ModuleUsers;\r
+\r
+import mircoders.storage.DatabaseArticleType;\r
+import mircoders.storage.DatabaseMessages;\r
+import mircoders.storage.DatabaseUsers;\r
+\r
+import org.apache.struts.util.MessageResources;\r
+\r
/*\r
* Copyright (C) 2001, 2002 The Mir-coders group\r
*\r
* to your version of the file, but you are not obligated to do so. If you do\r
* not wish to do so, delete this exception statement from your version.\r
*/\r
-\r
import java.io.IOException;\r
import java.io.PrintWriter;\r
+\r
import java.lang.reflect.Method;\r
+\r
import java.util.GregorianCalendar;\r
import java.util.HashMap;\r
import java.util.Iterator;\r
import javax.servlet.http.HttpServletResponse;\r
import javax.servlet.http.HttpSession;\r
\r
-import mir.config.MirPropertiesConfiguration;\r
-import mir.generator.FreemarkerGenerator;\r
-import mir.misc.HTMLTemplateProcessor;\r
-import mir.misc.StringUtil;\r
-import mir.servlet.AbstractServlet;\r
-import mir.servlet.ServletModule;\r
-import mir.servlet.ServletModuleDispatch;\r
-import mir.servlet.ServletModuleException;\r
-import mir.servlet.ServletModuleUserException;\r
-import mir.util.StringRoutines;\r
-import mircoders.entity.EntityUsers;\r
-import mircoders.global.MirGlobal;\r
-import mircoders.module.ModuleMessage;\r
-import mircoders.module.ModuleUsers;\r
-import mircoders.storage.DatabaseArticleType;\r
-import mircoders.storage.DatabaseMessages;\r
-import mircoders.storage.DatabaseUsers;\r
-\r
-import org.apache.struts.util.MessageResources;\r
-\r
-import freemarker.template.SimpleHash;\r
-import freemarker.template.SimpleList;\r
-import freemarker.template.SimpleScalar;\r
-import freemarker.template.TemplateModel;\r
\r
/**\r
* Mir.java - main servlet, that dispatches to servletmodules\r
*\r
* @author $Author: idfx $\r
- * @version $Id: Mir.java,v 1.27 2003/01/25 17:50:34 idfx Exp $\r
+ * @version $Id: Mir.java,v 1.28 2003/01/28 23:37:08 idfx Exp $\r
*\r
*/\r
-\r
public class Mir extends AbstractServlet {\r
-\r
private static ModuleUsers usersModule = null;\r
private static ModuleMessage messageModule = null;\r
private final static HashMap servletModuleInstanceHash = new HashMap();\r
//I don't know about making this static cause it removes the \r
//possibility to change the config on the fly.. -mh\r
private static List loginLanguages = null;\r
-\r
public HttpSession session;\r
- \r
- \r
\r
- public void doGet(HttpServletRequest req, HttpServletResponse res) throws\r
- ServletException, IOException {\r
+ public void doGet(HttpServletRequest req, HttpServletResponse res)\r
+ throws ServletException, IOException {\r
doPost(req, res);\r
}\r
\r
protected TemplateModel getLoginLanguages() throws ServletException {\r
synchronized (Mir.class) {\r
try {\r
-\r
if (loginLanguages == null) {\r
- MessageResources messageResources2 = MessageResources.\r
- getMessageResources("bundles.admin");\r
- MessageResources messageResources = MessageResources.\r
- getMessageResources("bundles.adminlocal");\r
- List languages = StringRoutines.splitString(MirGlobal.\r
- getConfigPropertyWithDefault("Mir.Login.Languages", "en"), ";");\r
+ MessageResources messageResources2 =\r
+ MessageResources.getMessageResources("bundles.admin");\r
+ MessageResources messageResources =\r
+ MessageResources.getMessageResources("bundles.adminlocal");\r
+ List languages =\r
+ StringRoutines.splitString(MirGlobal.getConfigPropertyWithDefault(\r
+ "Mir.Login.Languages", "en"), ";");\r
\r
loginLanguages = new Vector();\r
+\r
Iterator i = languages.iterator();\r
\r
while (i.hasNext()) {\r
String code = (String) i.next();\r
Locale locale = new Locale(code, "");\r
String name = messageResources.getMessage(locale, "languagename");\r
- if (name == null)\r
+\r
+ if (name == null) {\r
name = messageResources2.getMessage(locale, "languagename");\r
- if (name == null)\r
+ }\r
+\r
+ if (name == null) {\r
name = code;\r
+ }\r
\r
Map record = new HashMap();\r
record.put("name", name);\r
}\r
\r
return FreemarkerGenerator.makeAdapter(loginLanguages);\r
- }\r
- catch (Throwable t) {\r
+ } catch (Throwable t) {\r
throw new ServletException(t.getMessage());\r
}\r
}\r
\r
// FIXME: this should probalby go into AbstractServlet so it can be used in \r
// OpenMir as well -mh\r
- protected String getDefaultLanguage (HttpServletRequest req) {\r
- String defaultlanguage = MirGlobal.getConfigPropertyWithDefault("Mir.Login.DefaultLanguage", "");\r
+ protected String getDefaultLanguage(HttpServletRequest req) {\r
+ String defaultlanguage =\r
+ MirGlobal.getConfigPropertyWithDefault("Mir.Login.DefaultLanguage", "");\r
+\r
if (defaultlanguage.length() == 0) {\r
Locale locale = req.getLocale();\r
defaultlanguage = locale.getLanguage();\r
}\r
- \r
- return defaultlanguage; \r
- }\r
\r
- public void doPost(HttpServletRequest req, HttpServletResponse res) throws\r
- ServletException, IOException, UnavailableException {\r
+ return defaultlanguage;\r
+ }\r
\r
+ public void doPost(HttpServletRequest req, HttpServletResponse res)\r
+ throws ServletException, IOException, UnavailableException {\r
long startTime = System.currentTimeMillis();\r
long sessionConnectTime = 0;\r
EntityUsers userEntity;\r
String http = "";\r
\r
- configuration.addProperty("ServletName",getServletName());\r
+ if ((configuration.getString("RootUri") == null) ||\r
+ configuration.getString("RootUri").equals("")) {\r
+ configuration.setProperty("RootUri", req.getContextPath());\r
+ }\r
\r
- //*** test\r
- // Log.info(this, "blalalala");\r
+ configuration.addProperty("ServletName", getServletName());\r
\r
+ //*** test\r
+ // Log.info(this, "blalalala");\r
session = req.getSession(true);\r
userEntity = (EntityUsers) session.getAttribute("login.uid");\r
\r
- if (req.getServerPort() == 443)\r
+ if (req.getServerPort() == 443) {\r
http = "https";\r
- else\r
+ } else {\r
http = "http";\r
-\r
+ }\r
\r
//make sure client browsers don't cache anything\r
setNoCaching(res);\r
//FIXME: this seems kind of hackish and only here because we can have \r
// default other than the one that the browser is set to.\r
Locale locale = new Locale(getDefaultLanguage(req), "");\r
- MessageResources messageResources = MessageResources.getMessageResources("bundles.admin");\r
+ MessageResources messageResources =\r
+ MessageResources.getMessageResources("bundles.admin");\r
String htmlcharset = messageResources.getMessage(locale, "htmlcharset");\r
\r
res.setContentType("text/html; charset=" + htmlcharset);\r
\r
/** @todo for cleanup and readability this should be moved to\r
* method loginIfNecessary() */\r
-\r
- if (moduleName != null && moduleName.equals("direct")) {\r
+ if ((moduleName != null) && moduleName.equals("direct")) {\r
//...\r
}\r
\r
// Authentication\r
- if ( (moduleName != null && moduleName.equals("login")) || (userEntity == null)) {\r
+ if (((moduleName != null) && moduleName.equals("login")) ||\r
+ (userEntity == null)) {\r
String user = req.getParameter("login");\r
String passwd = req.getParameter("password");\r
logger.debug("--login: evaluating for user: " + user);\r
userEntity = allowedUser(user, passwd);\r
+\r
if (userEntity == null) {\r
// login failed: redirecting to login\r
logger.warn("--login: failed!");\r
_sendLoginPage(res, req, res.getWriter());\r
+\r
return;\r
- }\r
- else if (moduleName != null && moduleName.equals("login")) {\r
+ } else if ((moduleName != null) && moduleName.equals("login")) {\r
// login successful\r
-\r
- logger.info("--login: successful! setting uid: " +\r
- userEntity.getId());\r
+ logger.info("--login: successful! setting uid: " + userEntity.getId());\r
session.setAttribute("login.uid", userEntity);\r
logger.debug("--login: trying to retrieve login.target");\r
+\r
String target = (String) session.getAttribute("login.target");\r
\r
if (target != null) {\r
logger.debug("Redirect: " + target);\r
+\r
int serverPort = req.getServerPort();\r
String redirect = "";\r
String redirectString = "";\r
\r
if (serverPort == 80) {\r
- redirect = res.encodeURL(http + "://" + req.getServerName() +\r
- target);\r
+ redirect =\r
+ res.encodeURL(http + "://" + req.getServerName() + target);\r
redirectString =\r
- "<html><head><meta http-equiv=refresh content=\"1;URL="\r
- + redirect\r
- + "\"></head><body>going <a href=\"" + redirect +\r
- "\">Mir</a></body></html>";\r
- }\r
- else {\r
- redirect = res.encodeURL(http + "://" + req.getServerName() + ":" +\r
- req.getServerPort() + target);\r
+ "<html><head><meta http-equiv=refresh content=\"1;URL=" +\r
+ redirect + "\"></head><body>going <a href=\"" + redirect +\r
+ "\">Mir</a></body></html>";\r
+ } else {\r
+ redirect =\r
+ res.encodeURL(http + "://" + req.getServerName() + ":" +\r
+ req.getServerPort() + target);\r
redirectString =\r
- "<html><head><meta http-equiv=refresh content=\"1;URL="\r
- + redirect\r
- + "\"></head><body>going <a href=\"" + redirect +\r
- "\">Mir</a></body></html>";\r
+ "<html><head><meta http-equiv=refresh content=\"1;URL=" +\r
+ redirect + "\"></head><body>going <a href=\"" + redirect +\r
+ "\">Mir</a></body></html>";\r
}\r
+\r
res.getWriter().println(redirectString);\r
\r
//res.sendRedirect(redirect);\r
-\r
- }\r
- else {\r
+ } else {\r
// redirecting to default target\r
logger.debug("--login: no target - redirecting to default");\r
_sendStartPage(res, req, res.getWriter(), userEntity);\r
}\r
+\r
return;\r
- } // if login succesful\r
- } // if login\r
+ }\r
+ // if login succesful\r
+ }\r
+ // if login\r
\r
- if (moduleName != null && moduleName.equals("logout")) {\r
+ if ((moduleName != null) && moduleName.equals("logout")) {\r
logger.info("--logout");\r
session.invalidate();\r
\r
//session = req.getSession(true);\r
//checkLanguage(session, req);\r
_sendLoginPage(res, req, res.getWriter());\r
+\r
return;\r
}\r
\r
// redirect to loginpage\r
String redirectString = req.getRequestURI();\r
String queryString = req.getQueryString();\r
- if (queryString != null && !queryString.equals("")) {\r
- redirectString += "?" + req.getQueryString();\r
+\r
+ if ((queryString != null) && !queryString.equals("")) {\r
+ redirectString += ("?" + req.getQueryString());\r
logger.debug("STORING: " + redirectString);\r
session.setAttribute("login.target", redirectString);\r
}\r
+\r
_sendLoginPage(res, req, res.getWriter());\r
+\r
return;\r
}\r
\r
// If no module is specified goto standard startpage\r
- if (moduleName == null || moduleName.equals("")) {\r
+ if ((moduleName == null) || moduleName.equals("")) {\r
logger.debug("no module: redirect to standardpage");\r
_sendStartPage(res, req, res.getWriter(), userEntity);\r
+\r
return;\r
}\r
- // end of auth\r
\r
+ // end of auth\r
// From now on regular dispatching...\r
try {\r
// get servletmodule by parameter and continue with dispacher\r
ServletModule smod = getServletModuleForName(moduleName);\r
ServletModuleDispatch.dispatch(smod, req, res);\r
- }\r
- catch (ServletModuleException e) {\r
+ } catch (ServletModuleException e) {\r
handleError(req, res, res.getWriter(),\r
- "ServletException in Module " + moduleName + " -- " +\r
- e.getMessage());\r
- }\r
- catch (ServletModuleUserException e) {\r
+ "ServletException in Module " + moduleName + " -- " + e.getMessage());\r
+ } catch (ServletModuleUserException e) {\r
handleUserError(req, res, res.getWriter(), e.getMessage());\r
}\r
\r
// timing...\r
sessionConnectTime = System.currentTimeMillis() - startTime;\r
- logger.info("EXECTIME (" + moduleName + "): " + sessionConnectTime +\r
- " ms");\r
+ logger.info("EXECTIME (" + moduleName + "): " + sessionConnectTime + " ms");\r
}\r
\r
/**\r
* @return ServletModule\r
*\r
*/\r
- private static ServletModule getServletModuleForName(String moduleName) throws\r
- ServletModuleException {\r
-\r
+ private static ServletModule getServletModuleForName(String moduleName)\r
+ throws ServletModuleException {\r
// Instance in Map ?\r
if (!servletModuleInstanceHash.containsKey(moduleName)) {\r
// was not found in hash...\r
try {\r
Class theServletModuleClass = null;\r
+\r
try {\r
// first we try to get ServletModule from stern.che3.servlet\r
- theServletModuleClass = Class.forName(\r
- "mircoders.servlet.ServletModule" + moduleName);\r
- }\r
- catch (ClassNotFoundException e) {\r
+ theServletModuleClass =\r
+ Class.forName("mircoders.servlet.ServletModule" + moduleName);\r
+ } catch (ClassNotFoundException e) {\r
// on failure, we try to get it from lib-layer\r
- theServletModuleClass = Class.forName("mir.servlet.ServletModule" +\r
- moduleName);\r
+ theServletModuleClass =\r
+ Class.forName("mir.servlet.ServletModule" + moduleName);\r
}\r
+\r
Method m = theServletModuleClass.getMethod("getInstance", null);\r
ServletModule smod = (ServletModule) m.invoke(null, null);\r
+\r
// we put it into map for further reference\r
servletModuleInstanceHash.put(moduleName, smod);\r
+\r
return smod;\r
- }\r
- catch (Exception e) {\r
+ } catch (Exception e) {\r
throw new ServletModuleException("*** error resolving classname for " +\r
- moduleName + " -- " + e.getMessage());\r
+ moduleName + " -- " + e.getMessage());\r
}\r
- }\r
- else\r
+ } else {\r
return (ServletModule) servletModuleInstanceHash.get(moduleName);\r
+ }\r
}\r
\r
private void handleError(HttpServletRequest req, HttpServletResponse res,\r
- PrintWriter out, String errorString) {\r
-\r
+ PrintWriter out, String errorString) {\r
try {\r
logger.error(errorString);\r
+\r
SimpleHash modelRoot = new SimpleHash();\r
modelRoot.put("errorstring", new SimpleScalar(errorString));\r
modelRoot.put("date",\r
- new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));\r
- HTMLTemplateProcessor.process(res, MirPropertiesConfiguration.instance().getString("Mir.ErrorTemplate"),\r
- modelRoot, out, getLocale(req));\r
+ new SimpleScalar(StringUtil.date2readableDateTime(\r
+ new GregorianCalendar())));\r
+ HTMLTemplateProcessor.process(res,\r
+ MirPropertiesConfiguration.instance().getString("Mir.ErrorTemplate"),\r
+ modelRoot, out, getLocale(req));\r
out.close();\r
- }\r
- catch (Exception e) {\r
+ } catch (Exception e) {\r
e.printStackTrace(System.out);\r
System.err.println("Error in ErrorTemplate: " + e.getMessage());\r
}\r
}\r
\r
private void handleUserError(HttpServletRequest req, HttpServletResponse res,\r
- PrintWriter out, String errorString) {\r
+ PrintWriter out, String errorString) {\r
try {\r
logger.error(errorString);\r
+\r
SimpleHash modelRoot = new SimpleHash();\r
modelRoot.put("errorstring", new SimpleScalar(errorString));\r
modelRoot.put("date",\r
- new SimpleScalar(StringUtil.date2readableDateTime(new GregorianCalendar())));\r
+ new SimpleScalar(StringUtil.date2readableDateTime(\r
+ new GregorianCalendar())));\r
HTMLTemplateProcessor.process(res,\r
- MirPropertiesConfiguration.instance().getString("Mir.UserErrorTemplate"),\r
- modelRoot, out, getLocale(req));\r
+ MirPropertiesConfiguration.instance().getString("Mir.UserErrorTemplate"),\r
+ modelRoot, out, getLocale(req));\r
out.close();\r
- }\r
- catch (Exception e) {\r
+ } catch (Exception e) {\r
System.err.println("Error in UserErrorTemplate");\r
}\r
-\r
}\r
\r
/**\r
*/\r
protected EntityUsers allowedUser(String user, String password) {\r
try {\r
- if (usersModule == null)\r
+ if (usersModule == null) {\r
usersModule = new ModuleUsers(DatabaseUsers.getInstance());\r
+ }\r
+\r
return usersModule.getUserForLogin(user, password);\r
- }\r
- catch (Exception e) {\r
+ } catch (Exception e) {\r
logger.debug(e.getMessage());\r
e.printStackTrace();\r
+\r
return null;\r
}\r
}\r
\r
// Redirect-methods\r
private void _sendLoginPage(HttpServletResponse res, HttpServletRequest req,\r
- PrintWriter out) {\r
- String loginTemplate = \r
- configuration.getString("Mir.LoginTemplate");\r
+ PrintWriter out) {\r
+ String loginTemplate = configuration.getString("Mir.LoginTemplate");\r
String sessionUrl = res.encodeURL("");\r
\r
try {\r
\r
mergeData.put("session", sessionUrl);\r
\r
- mergeData.put("defaultlanguage", getDefaultLanguage(req));\r
+ mergeData.put("defaultlanguage", getDefaultLanguage(req));\r
mergeData.put("languages", getLoginLanguages());\r
\r
- HTMLTemplateProcessor.process(res, loginTemplate, mergeData, out, getLocale(req));\r
- }\r
- catch (Throwable e) {\r
+ HTMLTemplateProcessor.process(res, loginTemplate, mergeData, out,\r
+ getLocale(req));\r
+ } catch (Throwable e) {\r
handleError(req, res, out, "Error sending login page: " + e.getMessage());\r
}\r
}\r
\r
private void _sendStartPage(HttpServletResponse res, HttpServletRequest req,\r
- PrintWriter out, EntityUsers userEntity) {\r
+ PrintWriter out, EntityUsers userEntity) {\r
String startTemplate = "templates/admin/start_admin.template";\r
String sessionUrl = res.encodeURL("");\r
\r
SimpleHash mergeData = new SimpleHash();\r
mergeData.put("session", sessionUrl);\r
mergeData.put("login_user", userEntity);\r
- if (messageModule == null)\r
+\r
+ if (messageModule == null) {\r
messageModule = new ModuleMessage(DatabaseMessages.getInstance());\r
+ }\r
+\r
mergeData.put("messages",\r
- messageModule.getByWhereClause(null, "webdb_create desc", 0,\r
- 10));\r
+ messageModule.getByWhereClause(null, "webdb_create desc", 0, 10));\r
\r
mergeData.put("articletypes",\r
- DatabaseArticleType.getInstance().\r
- selectByWhereClause("", "id", 0, 20));\r
+ DatabaseArticleType.getInstance().selectByWhereClause("", "id", 0, 20));\r
\r
- HTMLTemplateProcessor.process(res, startTemplate, mergeData, out, getLocale(req));\r
- }\r
- catch (Exception e) {\r
+ HTMLTemplateProcessor.process(res, startTemplate, mergeData, out,\r
+ getLocale(req));\r
+ } catch (Exception e) {\r
e.printStackTrace(System.out);\r
- handleError(req, res, out, "error while trying to send startpage. " + e.getMessage());\r
+ handleError(req, res, out,\r
+ "error while trying to send startpage. " + e.getMessage());\r
}\r
}\r
\r
private void checkLanguage(HttpSession session, HttpServletRequest req) {\r
// a lang parameter always sets the language\r
String lang = req.getParameter("language");\r
+\r
if (lang != null) {\r
logger.info("selected language " + lang + " overrides accept-language");\r
setLanguage(session, lang);\r
projects / mir.git / blobdiff