Merge commit 'refs/pull/547/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f299c90c Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f299c90c Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f299c90c Branch: refs/heads/master Commit: f299c90c381917cfdcb019af7e2f78f38b8b553c Parents: a35cd38 98f95f9 Author: Michael Russo <mru...@apigee.com> Authored: Mon Aug 1 09:52:22 2016 -0700 Committer: Michael Russo <mru...@apigee.com> Committed: Mon Aug 1 09:52:22 2016 -0700 ---------------------------------------------------------------------- stack/README.md | 2 +- .../main/resources/usergrid-default.properties | 35 ++- stack/rest/pom.xml | 8 + .../usergrid/rest/AbstractContextResource.java | 16 + .../usergrid/rest/exceptions/AuthErrorInfo.java | 1 + .../rest/management/ManagementResource.java | 164 +++++++++-- .../organizations/OrganizationsResource.java | 18 +- .../organizations/users/UsersResource.java | 14 +- .../rest/management/users/UserResource.java | 68 +++-- .../rest/management/users/UsersResource.java | 19 +- .../shiro/filters/BasicAuthSecurityFilter.java | 3 + .../ClientCredentialsSecurityFilter.java | 4 + .../OAuth2AccessTokenSecurityFilter.java | 10 +- .../security/shiro/filters/SecurityFilter.java | 12 + .../rest/management/ExternalSSOEnabledIT.java | 175 +++++++++++ .../rest/management/ManagementResourceIT.java | 34 ++- stack/services/pom.xml | 7 + .../cassandra/ManagementServiceImpl.java | 36 ++- ...alSSOProviderAdminUserNotFoundException.java | 28 ++ .../security/shiro/utils/SubjectUtils.java | 32 +- .../security/sso/ApigeeSSO2Provider.java | 215 ++++++++++++++ .../security/sso/ExternalSSOProvider.java | 42 +++ .../security/sso/SSOProviderFactory.java | 85 ++++++ .../security/sso/UsergridExternalProvider.java | 291 +++++++++++++++++++ .../usergrid/security/tokens/TokenService.java | 10 +- .../tokens/cassandra/TokenServiceImpl.java | 281 +++++------------- .../resources/usergrid-services-context.xml | 14 + 27 files changed, 1297 insertions(+), 327 deletions(-) ----------------------------------------------------------------------