cmailleux 2005/10/19 10:46:08 CEST
Modified files:
core/src/java/org/jahia/operations/valves
PageAccessCheckValve.java
Log:
Test if we try to access login engine an dthen avoid cheking page access (the
page access will be resolved after the login and rejected if it have to)
Correct JIRA entry JAHIA-455
Revision Changes Path
1.6 +7 -8
jahia/core/src/java/org/jahia/operations/valves/PageAccessCheckValve.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/operations/valves/PageAccessCheckValve.java.diff?r1=1.5&r2=1.6&f=h
Index: PageAccessCheckValve.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/operations/valves/PageAccessCheckValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PageAccessCheckValve.java 7 Jul 2005 10:16:24 -0000 1.5
+++ PageAccessCheckValve.java 19 Oct 2005 08:46:08 -0000 1.6
@@ -1,14 +1,13 @@
package org.jahia.operations.valves;
+import org.jahia.bin.Jahia;
+import org.jahia.engines.login.Login_Engine;
+import org.jahia.exceptions.JahiaException;
+import org.jahia.params.ParamBean;
+import org.jahia.params.ProcessingContext;
+import org.jahia.pipelines.PipelineException;
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.exceptions.JahiaException;
-import org.jahia.bin.Jahia;
-
-import java.io.IOException;
/**
* <p>Title: </p>
@@ -26,7 +25,7 @@
public void invoke (Object context, ValveContext valveContext)
throws PipelineException {
ProcessingContext processingContext = (ProcessingContext) context;
- if (processingContext.getContentPage() != null &&
+ if
(!processingContext.getEngineName().equals(Login_Engine.ENGINE_NAME) &&
processingContext.getContentPage() != null &&
!processingContext.getContentPage().checkReadAccess(processingContext.getUser()))
{
if (Jahia.usesSso()) {
try {
