svn commit: r1362676 - in /rave/trunk/rave-components/rave-core/src: main/java/org/apache/rave/portal/security/impl/ test/java/org/apache/rave/portal/security/impl/

Tue, 17 Jul 2012 14:49:31 -0700 

Author: cgeer
Date: Tue Jul 17 21:49:08 2012
New Revision: 1362676

URL: http://svn.apache.org/viewvc?rev=1362676&view=rev
Log:
RAVE-723 Applied patch from Viknes B.

Modified:
    
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
    
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java

Modified: 
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java?rev=1362676&r1=1362675&r2=1362676&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
 (original)
+++ 
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
 Tue Jul 17 21:49:08 2012
@@ -110,6 +110,7 @@ public class DefaultWidgetCommentPermiss
                 hasPermission =  true;
                 break;
             case CREATE:
+            case CREATE_OR_UPDATE:
                 hasPermission = isWidgetCommentOwnerById(authentication, 
widgetComment.getUser().getId());
                 break;
             case DELETE:
@@ -147,6 +148,7 @@ public class DefaultWidgetCommentPermiss
                 case CREATE:
                 case DELETE:
                 case UPDATE:
+                case CREATE_OR_UPDATE:
                     // anyone can create, delete, read, or update a page that 
they own
                     hasPermission = isWidgetCommentOwnerById(authentication, 
(Long)raveSecurityContext.getId());
                     break;

Modified: 
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java?rev=1362676&r1=1362675&r2=1362676&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
 (original)
+++ 
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
 Tue Jul 17 21:49:08 2012
@@ -116,8 +116,7 @@ public class DefaultWidgetCommentPermiss
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 widgetComment, Permission.READ), is(true));
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 widgetComment, Permission.DELETE), is(true));
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 widgetComment, Permission.UPDATE), is(true));
-
-        
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 widgetComment, Permission.CREATE_OR_UPDATE), is(false));
+        
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 widgetComment, Permission.CREATE_OR_UPDATE), is(true));
         verify(mockAuthentication);
         verify(mockWidgetCommentRepository);
     }
@@ -136,7 +135,6 @@ public class DefaultWidgetCommentPermiss
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 widgetComment, Permission.DELETE), is(false));
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 widgetComment, Permission.UPDATE), is(false));
 
-
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 widgetComment, Permission.CREATE_OR_UPDATE), is(false));
         verify(mockAuthentication);
         verify(mockWidgetCommentRepository);
@@ -155,9 +153,7 @@ public class DefaultWidgetCommentPermiss
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.READ), is(true));
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.DELETE), is(true));
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.UPDATE), is(true));
-
-
-        
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE_OR_UPDATE), 
is(false));
+        
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE_OR_UPDATE), 
is(true));
         verify(mockAuthentication);
         verify(mockWidgetCommentRepository);
     }
@@ -176,7 +172,6 @@ public class DefaultWidgetCommentPermiss
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.DELETE), 
is(false));
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.UPDATE), 
is(false));
 
-
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE_OR_UPDATE), 
is(false));
         verify(mockAuthentication);
         verify(mockWidgetCommentRepository);
@@ -194,8 +189,7 @@ public class DefaultWidgetCommentPermiss
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 raveSecurityContext, WidgetComment.class.getName(), Permission.READ), 
is(true));
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 raveSecurityContext, WidgetComment.class.getName(), Permission.DELETE), 
is(true));
         
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 raveSecurityContext, WidgetComment.class.getName(), Permission.UPDATE), 
is(true));
-
-        
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 raveSecurityContext, WidgetComment.class.getName(), 
Permission.CREATE_OR_UPDATE), is(false));
+        
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication,
 raveSecurityContext, WidgetComment.class.getName(), 
Permission.CREATE_OR_UPDATE), is(true));
         verify(mockAuthentication);
     }

Reply via email to