Merge branch 'saml2' Implements CLOUDSTACK-7083
Branch: saml2 Proposal: http://markmail.org/message/4ba4ztmqpud3l4uo JIRA ticket: https://issues.apache.org/jira/browse/CLOUDSTACK-7083 FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SAML+2.0+Plugin Unit tests: Tests for each auth cmd class, SAMLUtils and SAMLAuthenticator, fixes unit test for ApiServlet Build status: clean build works with unit tests, testing using mvn3.0.5 and jdk 1.7 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/97ed5ff6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97ed5ff6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97ed5ff6 Branch: refs/heads/master Commit: 97ed5ff636d922212e6ced91f6b1c41a9c9824d5 Parents: d9531fb 6eae9b8 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Thu Aug 28 19:57:25 2014 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Thu Aug 28 19:57:25 2014 +0200 ---------------------------------------------------------------------- api/pom.xml | 5 + .../org/apache/cloudstack/api/ApiConstants.java | 1 + .../apache/cloudstack/api/ApiServerService.java | 42 +++ .../api/auth/APIAuthenticationManager.java | 24 ++ .../api/auth/APIAuthenticationType.java | 21 ++ .../cloudstack/api/auth/APIAuthenticator.java | 44 +++ .../api/auth/PluggableAPIAuthenticator.java | 25 ++ client/tomcatconf/commands.properties.in | 3 + ...g-core-lifecycle-api-context-inheritable.xml | 6 + .../core/spring-core-registry-core-context.xml | 9 +- plugins/user-authenticators/saml2/pom.xml | 12 +- .../cloudstack/saml2/spring-saml2-context.xml | 6 +- .../cloudstack/SAML2UserAuthenticator.java | 65 ---- .../command/GetServiceProviderMetaDataCmd.java | 202 +++++++++++++ .../command/SAML2LoginAPIAuthenticatorCmd.java | 303 +++++++++++++++++++ .../command/SAML2LogoutAPIAuthenticatorCmd.java | 169 +++++++++++ .../api/response/SAMLMetaDataResponse.java | 40 +++ .../cloudstack/saml/SAML2AuthManager.java | 36 +++ .../cloudstack/saml/SAML2AuthManagerImpl.java | 195 ++++++++++++ .../cloudstack/saml/SAML2UserAuthenticator.java | 64 ++++ .../cloudstack/SAML2UserAuthenticatorTest.java | 51 +++- .../GetServiceProviderMetaDataCmdTest.java | 94 ++++++ .../SAML2LoginAPIAuthenticatorCmdTest.java | 175 +++++++++++ .../SAML2LogoutAPIAuthenticatorCmdTest.java | 93 ++++++ pom.xml | 1 + server/pom.xml | 5 + .../spring-server-core-managers-context.xml | 5 +- server/src/com/cloud/api/ApiServer.java | 263 +++++++++------- server/src/com/cloud/api/ApiServerService.java | 46 --- server/src/com/cloud/api/ApiServlet.java | 7 +- .../api/auth/APIAuthenticationManager.java | 24 -- .../api/auth/APIAuthenticationManagerImpl.java | 26 +- .../cloud/api/auth/APIAuthenticationType.java | 21 -- .../com/cloud/api/auth/APIAuthenticator.java | 41 --- .../auth/DefaultLoginAPIAuthenticatorCmd.java | 66 +--- .../auth/DefaultLogoutAPIAuthenticatorCmd.java | 8 + server/src/com/cloud/configuration/Config.java | 80 +++++ server/test/com/cloud/api/ApiServletTest.java | 6 +- tools/apidoc/gen_toc.py | 1 + ui/scripts/cloudStack.js | 26 +- utils/pom.xml | 5 + .../apache/cloudstack/utils/auth/SAMLUtils.java | 232 ++++++++++++++ .../cloudstack/utils/auth/SAMLUtilsTest.java | 67 ++++ 43 files changed, 2228 insertions(+), 387 deletions(-) ----------------------------------------------------------------------
