Repository: usergrid Updated Branches: refs/heads/hotfix-20160819 b12e236eb -> f890e05ef
Ensure sysadmin can access everything. Set some tests as not thread safe. The more thorough permissions validation seems to expose so threading issues in the tests. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f890e05e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f890e05e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f890e05e Branch: refs/heads/hotfix-20160819 Commit: f890e05ef175e5d92eb7a59b3c8c69b216aeac87 Parents: b12e236 Author: Michael Russo <[email protected]> Authored: Sat Sep 10 09:28:19 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Sat Sep 10 09:28:19 2016 -0700 ---------------------------------------------------------------------- .../usergrid/rest/security/SecuredResourceFilterFactory.java | 4 ++-- .../apache/usergrid/rest/applications/ApplicationDeleteIT.java | 3 ++- .../applications/collection/activities/ActivityResourceIT.java | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/f890e05e/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java index 80d9074..0d94677 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/security/SecuredResourceFilterFactory.java @@ -303,7 +303,7 @@ public class SecuredResourceFilterFactory implements DynamicFeature { logger.trace("OrganizationFilter.authorize"); } - if ( !isPermittedAccessToOrganization( getOrganizationIdentifier() ) ) { + if ( !isPermittedAccessToOrganization( getOrganizationIdentifier() ) && !isServiceAdmin() ) { if (logger.isTraceEnabled()) { logger.trace("No organization access authorized"); } @@ -375,7 +375,7 @@ public class SecuredResourceFilterFactory implements DynamicFeature { throw mappableSecurityException( "unauthorized", "No application guest access authorized" ); } } - if ( !isPermittedAccessToApplication( getApplicationIdentifier() ) ) { + if ( !isPermittedAccessToApplication( getApplicationIdentifier() ) && !isServiceAdmin() ) { throw mappableSecurityException( "unauthorized", "No application access authorized" ); } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/f890e05e/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java index c1301bb..b85637d 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationDeleteIT.java @@ -19,6 +19,7 @@ package org.apache.usergrid.rest.applications; import com.fasterxml.jackson.databind.JsonNode; +import net.jcip.annotations.NotThreadSafe; import org.apache.usergrid.rest.test.resource.AbstractRestIT; import org.apache.usergrid.rest.test.resource.endpoints.mgmt.ManagementResponse; import org.apache.usergrid.rest.test.resource.model.ApiResponse; @@ -43,7 +44,7 @@ import static org.junit.Assert.fail; import static org.apache.usergrid.rest.management.organizations.applications .ApplicationResource.CONFIRM_APPLICATION_IDENTIFIER; - +@NotThreadSafe public class ApplicationDeleteIT extends AbstractRestIT { private static final Logger logger = LoggerFactory.getLogger(ApplicationDeleteIT.class); http://git-wip-us.apache.org/repos/asf/usergrid/blob/f890e05e/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java index 6e12053..88b593c 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/activities/ActivityResourceIT.java @@ -17,6 +17,7 @@ package org.apache.usergrid.rest.applications.collection.activities; +import net.jcip.annotations.NotThreadSafe; import org.apache.usergrid.persistence.index.utils.MapUtils; import org.apache.usergrid.rest.test.resource.AbstractRestIT; import org.apache.usergrid.rest.test.resource.endpoints.CollectionEndpoint; @@ -35,7 +36,7 @@ import static org.junit.Assert.assertTrue; /** @author tnine */ - +@NotThreadSafe public class ActivityResourceIT extends AbstractRestIT { private static final Logger log = LoggerFactory.getLogger( ActivityResourceIT.class );
