taylor 2004/11/18 19:06:44 Modified: components/page-manager/src/java/org/apache/jetspeed/om/page/psml AbstractBaseElement.java LinkImpl.java components/page-manager/src/java/org/apache/jetspeed/page/impl DatabasePageManager.java CastorXmlPageManager.java AbstractPageManager.java components/page-manager/testdata/pages/folder1/folder3 folder.metadata test001.psml components/page-manager/src/java/org/apache/jetspeed/om/folder/impl FolderImpl.java components/page-manager/src/java/org/apache/jetspeed/page/document AbstractNode.java DocumentHandlerFactoryImpl.java CastorFileSystemDocumentHandler.java components/page-manager/src/java/META-INF page-mapping.xml components/page-manager/src/test/org/apache/jetspeed/page TestCastorXmlPageManager.java components/page-manager/testdata/pages test001.psml components/page-manager/src/test/org/apache/jetspeed/om/page TestPageObjectModel.java Added: components/page-manager/src/java/org/apache/jetspeed/om/page/psml SecurityConstraintsDefImpl.java SecurityConstraintsImpl.java PageSecurityImpl.java SecurityConstraintImpl.java Log: ** File and Folder Security Permission Checking ** patch by contrinbuted by Randy Watler - Both permissions, (JAAS), and constraints, (J1 style), are enabled, (in assembly/page-manager.xml on the CastorXmlPageManager init) - Both are configured to secure the same entities, except the testsuite page access is specified only in the constraints. - The permissions are configured in the 4 populate-userinfo sql scripts. - The constraints are set up in WEB-INF/pages: /page.security /folder.metadata /Administrative/folder.metadata /default-page.psml /testsuite.psml /_user/user/folder.metadata - We'll need to add a CVS text wrapper for *.security. To test: 1. When you start the portal, you should see only the default page and additional links, (no customizer buttons) 2. Login as user: you should see everything as before except the testsuite page and the Administrative sub directory, (customizer buttons only visible on user pages) 3. Login as manager: everything should be be visible except the testsuite page, (no customizer buttons) 4. Login as jetspeed: everything should be visible, (no customizer buttons) 5. Login as admin: everything should be visible, (full customizer buttons) Revision Changes Path 1.5 +378 -16 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java.diff?r1=1.4&r2=1.5 1.3 +67 -1 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/LinkImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/LinkImpl.java.diff?r1=1.2&r2=1.3 1.1 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsDefImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsDefImpl.java?rev=1.1 1.1 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java?rev=1.1 1.1 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java?rev=1.1 1.1 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/SecurityConstraintImpl.java?rev=1.1 1.10 +21 -4 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java.diff?r1=1.9&r2=1.10 1.22 +75 -55 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java.diff?r1=1.21&r2=1.22 1.8 +206 -80 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java.diff?r1=1.7&r2=1.8 1.4 +11 -11 jakarta-jetspeed-2/components/page-manager/testdata/pages/folder1/folder3/folder.metadata http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/testdata/pages/folder1/folder3/folder.metadata.diff?r1=1.3&r2=1.4 1.2 +1 -1 jakarta-jetspeed-2/components/page-manager/testdata/pages/folder1/folder3/test001.psml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/testdata/pages/folder1/folder3/test001.psml.diff?r1=1.1&r2=1.2 1.19 +136 -31 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java.diff?r1=1.18&r2=1.19 1.7 +110 -11 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/AbstractNode.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/AbstractNode.java.diff?r1=1.6&r2=1.7 1.3 +72 -5 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/DocumentHandlerFactoryImpl.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/DocumentHandlerFactoryImpl.java.diff?r1=1.2&r2=1.3 1.8 +80 -20 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java.diff?r1=1.7&r2=1.8 1.8 +139 -42 jakarta-jetspeed-2/components/page-manager/src/java/META-INF/page-mapping.xml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/java/META-INF/page-mapping.xml.diff?r1=1.7&r2=1.8 1.16 +7 -2 jakarta-jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java.diff?r1=1.15&r2=1.16 1.3 +1 -1 jakarta-jetspeed-2/components/page-manager/testdata/pages/test001.psml http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/testdata/pages/test001.psml.diff?r1=1.2&r2=1.3 1.3 +1 -4 jakarta-jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/om/page/TestPageObjectModel.java http://cvs.apache.org/viewcvs/jakarta-jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/om/page/TestPageObjectModel.java.diff?r1=1.2&r2=1.3
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]