You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2014/08/12 23:39:42 UTC
[1/3] git commit: RAVE-1273 | Cloning should only require read access
to a page
Repository: rave
Updated Branches:
refs/heads/master acf2cf696 -> 096dcf196
RAVE-1273 | Cloning should only require read access to a page
Project: http://git-wip-us.apache.org/repos/asf/rave/repo
Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/126f1fe4
Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/126f1fe4
Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/126f1fe4
Branch: refs/heads/master
Commit: 126f1fe4154e06ad29024346114478363674e697
Parents: aab1719
Author: Stanton Sievers <ss...@w2odigital.com>
Authored: Mon Aug 11 11:33:37 2014 -0400
Committer: Stanton Sievers <ss...@w2odigital.com>
Committed: Mon Aug 11 11:33:37 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/rave/portal/service/PageService.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/rave/blob/126f1fe4/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
----------------------------------------------------------------------
diff --git a/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java b/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
index fadb17b..1f47c72 100644
--- a/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
+++ b/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
@@ -299,7 +299,7 @@ public interface PageService {
* @param pageName = name of the page
* @return true or false whether the user was added
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'update')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'read')")
Boolean clonePageForUser(String pageId, String userId, String pageName);
/**
@@ -356,4 +356,4 @@ public interface PageService {
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'update')")
Boolean updatePageEditingStatus(String pageId, String userId, boolean isEditor);
-}
\ No newline at end of file
+}
[2/3] git commit: RAVE-1273 | Orphaned page members shouldn't cause
an NPE
Posted by mf...@apache.org.
RAVE-1273 | Orphaned page members shouldn't cause an NPE
Project: http://git-wip-us.apache.org/repos/asf/rave/repo
Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/a79d859b
Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/a79d859b
Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/a79d859b
Branch: refs/heads/master
Commit: a79d859bd559f956fa638d8045d9af85ed6285e3
Parents: 126f1fe
Author: Stanton Sievers <ss...@w2odigital.com>
Authored: Mon Aug 11 11:34:15 2014 -0400
Committer: Stanton Sievers <ss...@w2odigital.com>
Committed: Mon Aug 11 11:34:15 2014 -0400
----------------------------------------------------------------------
.../portal/security/impl/DefaultPagePermissionEvaluator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/rave/blob/a79d859b/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
----------------------------------------------------------------------
diff --git a/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java b/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
index e5c75db..81cf436 100644
--- a/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
+++ b/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
@@ -224,7 +224,8 @@ public class DefaultPagePermissionEvaluator extends AbstractModelPermissionEvalu
List<PageUser> members = trustedPage.getMembers();
if (members != null) {
for (PageUser pageUser : members){
- if (userRepository.get(pageUser.getUserId()).getUsername().equals(viewer)){
+ User user = userRepository.get(pageUser.getUserId());
+ if (user != null && user.getUsername().equals(viewer)){
log.info("User "+viewer+" is a member of page "+trustedPage.getId());
if(checkEditorStatus){
log.info("checking editor:"+trustedPage.getId()+"@"+viewer+"@"+pageUser.isEditor());
@@ -238,4 +239,4 @@ public class DefaultPagePermissionEvaluator extends AbstractModelPermissionEvalu
return false;
}
-}
\ No newline at end of file
+}
[3/3] git commit: Merge branch 'master' into RAVE-1273
Posted by mf...@apache.org.
Merge branch 'master' into RAVE-1273
Conflicts:
rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
Project: http://git-wip-us.apache.org/repos/asf/rave/repo
Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/096dcf19
Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/096dcf19
Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/096dcf19
Branch: refs/heads/master
Commit: 096dcf1960f2ec70f2b4a7aff293cb41c4035081
Parents: a79d859 acf2cf6
Author: Stanton Sievers <ss...@w2odigital.com>
Authored: Tue Aug 12 17:26:43 2014 -0400
Committer: Stanton Sievers <ss...@w2odigital.com>
Committed: Tue Aug 12 17:26:43 2014 -0400
----------------------------------------------------------------------
.../apache/rave/portal/model/impl/PageImpl.java | 6 ++-
.../apache/rave/portal/service/PageService.java | 4 +-
.../portal/service/impl/DefaultPageService.java | 18 ++++++---
.../portal/service/impl/DefaultUserService.java | 5 ++-
.../service/impl/DefaultPageServiceTest.java | 41 ++++++++++++++++++++
.../apache/rave/portal/web/api/rpc/PageApi.java | 6 +--
.../static/script/core/rave_opensocial.js | 6 +++
.../main/webapp/static/script/portal/rave_ui.js | 8 ++--
8 files changed, 76 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/rave/blob/096dcf19/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
----------------------------------------------------------------------
diff --cc rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
index 1f47c72,3ae4fe6..b5fc108
--- a/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
+++ b/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
@@@ -297,10 -297,10 +297,10 @@@ public interface PageService
* @param pageId - the id of the page in question
* @param userId - the userid to add
* @param pageName = name of the page
- * @return true or false whether the user was added
+ * @return the newly cloned page
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'update')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'read')")
- Boolean clonePageForUser(String pageId, String userId, String pageName);
+ Page clonePageForUser(String pageId, String userId, String pageName);
/**
* Add another user to share this page with