Merge branch 'master' of tkfftk@dev.intra.insomnia.fi:/data/bortal

Conflicts:
	code/LanBortalWeb/WebContent/resources/tools/role/list.xhtml

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/SessionHandlerBean.java

@@ -3,8 +3,11 @@ package fi.insomnia.bortal.beans;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.annotation.Resource;
 import javax.ejb.EJB;
+import javax.ejb.SessionContext;
 import javax.ejb.Stateless;
+import javax.servlet.http.HttpSession;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +38,7 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal {
         // TODO Auto-generated constructor stub
     }
 
+
     @Override
     public boolean hasPermission(String target, User user, RolePermission permission) {
 

code/LanBortalWeb/WebContent/WEB-INF/faces-config.xml

@@ -22,6 +22,7 @@
             <supported-locale>fi_IN_XII</supported-locale>
             <supported-locale>en_ST_v7</supported-locale>
 
+	
         </locale-config>
     </application>
     

code/LanBortalWeb/WebContent/WEB-INF/web.xml

@@ -17,13 +17,14 @@
     <servlet-name>Faces Servlet</servlet-name>
     <url-pattern>*.jsf</url-pattern>
   </servlet-mapping>
+
   <filter>
-    <display-name>EventI18nFilter</display-name>
-    <filter-name>EventI18nFilter</filter-name>
-    <filter-class>fi.insomnia.bortal.i18n.EventI18nFilter</filter-class>
+    <display-name>HostnameFilter</display-name>
+    <filter-name>HostnameFilter</filter-name>
+    <filter-class>fi.insomnia.bortal.HostnameFilter</filter-class>
   </filter>
   <filter-mapping>
-    <filter-name>EventI18nFilter</filter-name>
-    <url-pattern>/EventI18nFilter</url-pattern>
+    <filter-name>HostnameFilter</filter-name>
+    <servlet-name>Faces Servlet</servlet-name>
   </filter-mapping>
 </web-app>
\ No newline at end of file

code/LanBortalWeb/WebContent/user/list.xhtml

@@ -16,8 +16,8 @@
 		<ui:define name="header">Edit user</ui:define>
 		<ui:define name="content">
 
-			<users:list />
-
+			<users:list />	
+	
 		</ui:define>
 		<ui:define name="footer">footer</ui:define>
 	</ui:composition>

code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java

+package fi.insomnia.bortal;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Servlet Filter implementation class HostnameFilter
+ */
+public class HostnameFilter implements Filter {
+
+    private static final String HTTP_URL_HOSTNAME = "HTTP_URL_HOSTNAME";
+    private static final Logger logger = LoggerFactory.getLogger(HostnameFilter.class);
+
+    /**
+     * Default constructor.
+     */
+    public HostnameFilter() {
+        // TODO Auto-generated constructor stub
+    }
+
+    /**
+     * @see Filter#destroy()
+     */
+    public void destroy() {
+        // Nothing...
+    }
+
+    /**
+     * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)
+     */
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+
+        if (request != null && request instanceof HttpServletRequest) {
+            HttpServletRequest httpRequest = ((HttpServletRequest) request);
+            StringBuffer url = httpRequest.getRequestURL();
+            logger.warn("request URL: {}", url);
+            int beginindex = 7; // Let's skip http://
+
+            int slashindex = url.indexOf("/", beginindex); // Find the first
+                                                           // / from URL
+                                                           // after http://
+            int colonindex = url.indexOf(":", beginindex);
+            int lastindex = slashindex;
+            if (slashindex > colonindex) {
+                lastindex = colonindex;
+            }
+            if (lastindex < 0) {
+                lastindex = url.length() - 1;
+            }
+            logger.warn("begin: {}, last {}", beginindex, lastindex);
+            String hostname = url.substring(beginindex, lastindex);
+            logger.info("Setting hostname to {} ", hostname);
+            httpRequest.getSession().setAttribute(HTTP_URL_HOSTNAME, hostname);
+        }
+        // pass the request along the filter chain
+        chain.doFilter(request, response);
+    }
+
+    /**
+     * @see Filter#init(FilterConfig)
+     */
+    public void init(FilterConfig fConfig) throws ServletException {
+        // Nothing...
+    }
+
+    public static String getHostname(HttpSession sess) {
+        String ret = null;
+        if (sess != null) {
+            Object retObj = sess.getAttribute(HTTP_URL_HOSTNAME);
+            if (retObj != null)
+                ret = retObj.toString();
+        }
+        return ret;
+    }
+
+}

code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java

@@ -7,11 +7,14 @@ package fi.insomnia.bortal.handler;
 
 import javax.ejb.EJB;
 import javax.faces.bean.ManagedBean;
+import javax.faces.bean.SessionScoped;
+import javax.faces.context.FacesContext;
+import javax.servlet.http.HttpSession;
 
+import fi.insomnia.bortal.HostnameFilter;
 import fi.insomnia.bortal.beans.RolePermission;
 import fi.insomnia.bortal.beans.SessionHandlerBeanLocal;
 import fi.insomnia.bortal.model.User;
-import javax.faces.bean.SessionScoped;
 
 /**
  * 
@@ -43,6 +46,13 @@ public class SessionHandler {
 
         return hasPermission(target, perm);
     }
+    
+    public String getHostname()
+    {
+        FacesContext ctx = FacesContext.getCurrentInstance();
+        HttpSession sess =(HttpSession) ctx.getExternalContext().getSession(false);
+        return HostnameFilter.getHostname(sess);
+    }
 
     public boolean hasPermission(String target, RolePermission permission) {
         return true;

code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java

@@ -6,12 +6,16 @@ import javax.ejb.EJB;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ManagedProperty;
 import javax.faces.bean.SessionScoped;
+import javax.faces.context.FacesContext;
 import javax.faces.model.ListDataModel;
+import javax.servlet.http.HttpSession;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import fi.insomnia.bortal.HostnameFilter;
 import fi.insomnia.bortal.beans.SecurityBeanLocal;
+import fi.insomnia.bortal.beans.SessionHandlerBeanLocal;
 import fi.insomnia.bortal.beans.UserBeanLocal;
 import fi.insomnia.bortal.exceptions.PermissionDeniedException;
 import fi.insomnia.bortal.handler.SessionHandler;
@@ -20,9 +24,12 @@ import fi.insomnia.bortal.model.User;
 @ManagedBean(name = "userView")
 @SessionScoped
 public class UserView {
-
+    
     @ManagedProperty("#{sessionHandler}")
     private SessionHandler sessionhandler;
+    
+    @EJB
+    private SessionHandlerBeanLocal sessionbean;
 
     @EJB
     private UserBeanLocal userBean;
@@ -39,12 +46,14 @@ public class UserView {
         return "userEdit";
     }
 
+  
+    
     public String getLocale() {
         return "en_ST_v7";
     }
 
     public String createUser() {
-        if (!sessionhandler.canWrite("userManagement")) {
+        if (!getSessionhandler().canWrite("userManagement")) {
             // Give message to administration what happened here.
             throw new PermissionDeniedException(securitybean, getSessionhandler().getUser(), "User " + getSessionhandler().getUser() + " does not have permission to create user!");
         }
@@ -102,18 +111,11 @@ public class UserView {
     public User getUser() {
         return user;
     }
+    public void setSessionhandler(SessionHandler sessionhandler) {
+        this.sessionhandler = sessionhandler;
+    }
 
-    /**
-     * @return the sessionhandler
-     */
     public SessionHandler getSessionhandler() {
         return sessionhandler;
     }
-
-    /**
-     * @param sessionhandler the sessionhandler to set
-     */
-    public void setSessionhandler(SessionHandler sessionhandler) {
-        this.sessionhandler = sessionhandler;
-    }
 }