JBoss Portal SVN: r11775 - branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-01 03:36:20 -0400 (Mon, 01 Sep 2008)
New Revision: 11775
Modified:
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
Log:
JBPORTAL-2145: Ability to override the CMS ACLEnforcer for additional commands
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-09-01 07:27:33 UTC (rev 11774)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-09-01 07:36:20 UTC (rev 11775)
@@ -196,7 +196,7 @@
* @param command
* @return
*/
- private boolean hasReadAccess(User user, JCRCommand command)
+ protected boolean hasReadAccess(User user, JCRCommand command)
{
boolean hasReadAccess = false;
@@ -217,9 +217,12 @@
{
path = ((FileGetListCommand)command).sFilePath;
}
+
+ if (path != null)
+ {
+ hasReadAccess = this.hasReadAccess(user, path);
+ }
- hasReadAccess = this.hasReadAccess(user, path);
-
return hasReadAccess;
}
@@ -229,7 +232,7 @@
* @param path
* @return
*/
- private boolean hasReadAccess(User user, String path)
+ protected boolean hasReadAccess(User user, String path)
{
boolean hasAccess = this.computeAccess(user, path, "read");
if (!hasAccess)
@@ -250,7 +253,7 @@
* @param command
* @return
*/
- private boolean hasWriteAccess(User user, JCRCommand command)
+ protected boolean hasWriteAccess(User user, JCRCommand command)
{
boolean hasWriteAccess = false;
@@ -284,11 +287,14 @@
path = ((UpdateFileCommand)command).getPath();
}
- hasWriteAccess = this.computeAccess(user, path, "write");
- if (!hasWriteAccess)
+ if (path != null)
{
- //make sure implied manage is not available
- hasWriteAccess = this.computeAccess(user, path, "manage");
+ hasWriteAccess = this.computeAccess(user, path, "write");
+ if (!hasWriteAccess)
+ {
+ //make sure implied manage is not available
+ hasWriteAccess = this.computeAccess(user, path, "manage");
+ }
}
return hasWriteAccess;
@@ -300,7 +306,7 @@
* @param path
* @return
*/
- private boolean hasWriteAccess(User user, String path)
+ protected boolean hasWriteAccess(User user, String path)
{
boolean hasAccess = this.computeAccess(user, path, "write");
if (!hasAccess)
@@ -316,7 +322,7 @@
* @param command
* @return
*/
- private boolean hasManageAccess(User user, JCRCommand command)
+ protected boolean hasManageAccess(User user, JCRCommand command)
{
boolean hasManageAccess = false;
@@ -353,7 +359,7 @@
/**
*
*/
- private boolean computeAccess(User user, String path, String action)
+ protected boolean computeAccess(User user, String path, String action)
{
boolean hasAccess = false;
17 years, 8 months
- 1
- 0
JBoss Portal SVN: r11774 - branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-09-01 03:27:33 -0400 (Mon, 01 Sep 2008)
New Revision: 11774
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
Log:
JBPORTAL-2145: Ability to override the CMS ACLEnforcer for additional commands
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-08-31 22:12:48 UTC (rev 11773)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ACLEnforcer.java 2008-09-01 07:27:33 UTC (rev 11774)
@@ -196,7 +196,7 @@
* @param command
* @return
*/
- private boolean hasReadAccess(User user, JCRCommand command)
+ protected boolean hasReadAccess(User user, JCRCommand command)
{
boolean hasReadAccess = false;
@@ -217,9 +217,12 @@
{
path = ((FileGetListCommand)command).sFilePath;
}
+
+ if (path != null)
+ {
+ hasReadAccess = this.hasReadAccess(user, path);
+ }
- hasReadAccess = this.hasReadAccess(user, path);
-
return hasReadAccess;
}
@@ -229,7 +232,7 @@
* @param path
* @return
*/
- private boolean hasReadAccess(User user, String path)
+ protected boolean hasReadAccess(User user, String path)
{
boolean hasAccess = this.computeAccess(user, path, "read");
if (!hasAccess)
@@ -250,7 +253,7 @@
* @param command
* @return
*/
- private boolean hasWriteAccess(User user, JCRCommand command)
+ protected boolean hasWriteAccess(User user, JCRCommand command)
{
boolean hasWriteAccess = false;
@@ -284,11 +287,14 @@
path = ((UpdateFileCommand)command).getPath();
}
- hasWriteAccess = this.computeAccess(user, path, "write");
- if (!hasWriteAccess)
+ if (path != null)
{
- //make sure implied manage is not available
- hasWriteAccess = this.computeAccess(user, path, "manage");
+ hasWriteAccess = this.computeAccess(user, path, "write");
+ if (!hasWriteAccess)
+ {
+ //make sure implied manage is not available
+ hasWriteAccess = this.computeAccess(user, path, "manage");
+ }
}
return hasWriteAccess;
@@ -300,7 +306,7 @@
* @param path
* @return
*/
- private boolean hasWriteAccess(User user, String path)
+ protected boolean hasWriteAccess(User user, String path)
{
boolean hasAccess = this.computeAccess(user, path, "write");
if (!hasAccess)
@@ -316,7 +322,7 @@
* @param command
* @return
*/
- private boolean hasManageAccess(User user, JCRCommand command)
+ protected boolean hasManageAccess(User user, JCRCommand command)
{
boolean hasManageAccess = false;
@@ -353,7 +359,7 @@
/**
*
*/
- private boolean computeAccess(User user, String path, String action)
+ protected boolean computeAccess(User user, String path, String action)
{
boolean hasAccess = false;
17 years, 8 months
- 1
- 0