svn commit: [jahia] r18265 - in /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params: ParamBean.java ProcessingContext.java

[tdraier]

Author: tdraier
Date: Fri Aug 24 17:15:01 2007
New Revision: 18265

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18265&repname=
=3Djahia
Log:
fixed parambean construction when access is denied to the page

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Param=
Bean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ParamBean.java&rev=3D18265&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ParamBean.j=
ava Fri Aug 24 17:15:01 2007
@@ -344,6 +344,9 @@
         if (contentPage !=3D null) {
             thePage =3D contentPage.getPage(this.getEntryLoadRequest(),
                                           this.getOperationMode(), this.ge=
tUser());
+            if(getPage()=3D=3Dnull && !getEngine().equals(Login_Engine.ENG=
INE_NAME)) {
+                throw new JahiaForbiddenAccessException();
+            }
             if(getPage()=3D=3Dnull) throw new JahiaPageNotFoundException(c=
ontentPage.getPageID());
         }
     }
@@ -521,8 +524,8 @@
             resolveCacheStatus();
 =

             processActivationAction();
-            if(contentPage!=3Dnull) {
-            if(getPage()=3D=3Dnull) throw new JahiaPageNotFoundException(c=
ontentPage.getPageID());
+            if(contentPage!=3Dnull && getPage()=3D=3Dnull && !getEngine().=
equals(Login_Engine.ENGINE_NAME)) {
+                throw new JahiaForbiddenAccessException();
             }
             //////////////////////////////////////////////////////////////=
/////////////////////////
             // FIXME -Fulco-

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/Proce=
ssingContext.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/params/ProcessingContext.java&rev=3D18265&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/params/ProcessingC=
ontext.java Fri Aug 24 17:15:01 2007
@@ -3183,6 +3183,9 @@
         if (getContentPage().getJahiaID() !=3D this.getSiteID()) {
             setContentPage(this.getSite().getHomeContentPage());
         }
+        if(contentPage!=3Dnull && getPage()=3D=3Dnull && !getEngine().equa=
ls(Login_Engine.ENGINE_NAME)) {
+            throw new JahiaForbiddenAccessException();
+        }
         if(getPage()=3D=3Dnull) throw new JahiaPageNotFoundException(pageI=
D);
         // last requested page
         Integer lrpID =3D (Integer) getSessionState().getAttribute(

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list