shuber 2005/08/10 20:15:23 CEST
Modified files:
core/src/webapp/WEB-INF/etc/config auth-pipeline.xml
jahia.skeleton
Added files:
core/src/java/org/jahia/params/valves
ContainerAuthValveImpl.java
Log:
Implemented container-wide login support
Revision Changes Path
1.1 +49 -0
jahia/core/src/java/org/jahia/params/valves/ContainerAuthValveImpl.java (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/params/valves/ContainerAuthValveImpl.java?rev=1.1&content-type=text/plain
1.3 +3 -0
jahia/core/src/webapp/WEB-INF/etc/config/auth-pipeline.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/auth-pipeline.xml.diff?r1=1.2&r2=1.3&f=h
1.19 +1 -1 jahia/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/config/jahia.skeleton.diff?r1=1.18&r2=1.19&f=h
Index: auth-pipeline.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/auth-pipeline.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- auth-pipeline.xml 12 Apr 2005 13:39:52 -0000 1.2
+++ auth-pipeline.xml 10 Aug 2005 18:15:22 -0000 1.3
@@ -25,5 +25,8 @@
<valveDescriptor>
<className>org.jahia.params.valves.CookieAuthValveImpl</className>
</valveDescriptor>
+ <valveDescriptor>
+ <className>org.jahia.params.valves.ContainerAuthValveImpl</className>
+ </valveDescriptor>
</valveDescriptors>
</pipelineDescriptor>
Index: jahia.skeleton
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/config/jahia.skeleton,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jahia.skeleton 8 Jul 2005 16:12:40 -0000 1.18
+++ jahia.skeleton 10 Aug 2005 18:15:22 -0000 1.19
@@ -29,7 +29,7 @@
jahiaSharedComponentsDiskPath =
jahiaLdapDiskPath =
$context/WEB-INF/etc/ldap/
-jahiaCasDiskPath =
$context/WEB-INF/etc/cas/
+jahiaCasDiskPath =
$context/WEB-INF/etc/cas/
jahiaOutputCacheConfigDiskPath =
$context/WEB-INF/etc/outputcache/
Index: ContainerAuthValveImpl.java
====================================================================
package org.jahia.params.valves;
import org.jahia.pipelines.valves.Valve;
import org.jahia.pipelines.valves.ValveContext;
import org.jahia.pipelines.PipelineException;
import org.jahia.params.ProcessingContext;
import org.jahia.params.ParamBean;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.registries.ServicesRegistry;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
/**
* This valve retrieves the authentification that was done on the container,
if there is one.
* User: Serge Huber
* Date: Aug 10, 2005
* Time: 7:03:55 PM
* Copyright (C) Jahia Inc.
*/
public class ContainerAuthValveImpl implements Valve {
public ContainerAuthValveImpl() {
}
public void invoke(Object context, ValveContext valveContext) throws
PipelineException {
ProcessingContext processingContext = (ProcessingContext) context;
HttpServletRequest request =
((ParamBean)processingContext).getRequest();
Principal principal = request.getUserPrincipal();
if (principal != null) {
try {
JahiaSite site = (JahiaSite)
request.getSession().getAttribute(ProcessingContext.SESSION_SITE);
JahiaUser jahiaUser = null;
jahiaUser =
ServicesRegistry.getInstance().getJahiaSiteUserManagerService().getMember(site.getID(),
principal.getName());
if (jahiaUser != null) {
processingContext.setTheUser(jahiaUser);
return;
}
} catch (Exception e) {
}
}
valveContext.invokeNext(context);
}
public void initialize() {
}
}
