Repository: cxf Updated Branches: refs/heads/master e5f565792 -> d9a1164c3
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/36b26236 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/36b26236 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/36b26236 Branch: refs/heads/master Commit: 36b262360f5fdcba95517bd3531e2b0d4c951586 Parents: 72287e2 a6d41f6 Author: reta <[email protected]> Authored: Mon Mar 10 13:22:01 2014 -0400 Committer: Andriy Redko <[email protected]> Committed: Mon Mar 10 14:37:06 2014 -0400 ---------------------------------------------------------------------- .../security/SAMLSecurityContext.java | 90 -- .../provider/RequestDispatcherProvider.java | 38 +- rt/pom.xml | 1 + .../grants/saml/Saml2BearerGrantHandler.java | 6 +- .../oauth2/grants/saml/SamlUserSubject.java | 8 +- .../apache/cxf/rs/security/saml/SAMLUtils.java | 29 - .../cxf/rs/security/saml/assertion/Claim.java | 90 -- .../cxf/rs/security/saml/assertion/Claims.java | 71 -- .../security/saml/authorization/ClaimBean.java | 9 +- .../ClaimsAuthorizingInterceptor.java | 36 +- .../authorization/JAXRSSAMLSecurityContext.java | 77 -- .../SecurityContextProviderImpl.java | 42 +- .../ClaimsAuthorizingInterceptorTest.java | 50 +- .../apache/cxf/rt/security/claims/Claim.java | 99 ++ .../cxf/rt/security/claims/ClaimCollection.java | 65 + .../security/claims/ClaimsSecurityContext.java | 27 + .../cxf/rt/security/claims/SAMLClaim.java | 66 ++ .../rt/security/saml/SAMLSecurityContext.java | 104 ++ .../apache/cxf/rt/security/saml/SAMLUtils.java | 142 +++ .../cxf/rt/security/xacml/CXFMessageParser.java | 2 +- rt/transports/http-jetty/pom.xml | 7 - .../http_jetty/JettyHTTPDestination.java | 31 +- .../http_jetty/JettyHTTPExtendedHandler.java | 60 - .../transport/http_jetty/JettyWebSocket.java | 1085 ----------------- .../transport/servlet/CXFNonSpringServlet.java | 4 +- rt/transports/websocket/pom.xml | 168 +++ .../websocket/WebSocketDestinationFactory.java | 49 + .../websocket/WebSocketTransportFactory.java | 135 +++ .../jetty/CXFJettyWebSocketServlet.java | 110 ++ .../jetty/CXFJettyWebSocketServletService.java | 33 + .../CXFNonSpringJettyWebSocketServlet.java | 116 ++ .../websocket/jetty/JettyWebSocket.java | 1111 ++++++++++++++++++ .../jetty/JettyWebSocketDestination.java | 66 ++ .../websocket/jetty/JettyWebSocketHandler.java | 63 + .../websocket/jetty/JettyWebSocketManager.java | 114 ++ .../resources/META-INF/cxf/bus-extensions.txt | 4 + .../WebSocketTransportFactoryTest.java | 43 + .../jetty/JettyWebSocketManagerTest.java | 84 ++ .../apache/cxf/ws/rm/RMDeliveryInterceptor.java | 2 + rt/ws/security/pom.xml | 5 + .../ws/security/trust/AbstractSTSClient.java | 31 +- .../security/trust/claims/ClaimsCallback.java | 14 +- .../apache/cxf/ws/security/wss4j/SAMLUtils.java | 132 --- .../wss4j/StaxSecurityContextInInterceptor.java | 34 +- .../ws/security/wss4j/WSS4JInInterceptor.java | 31 +- .../ws/security/wss4j/saml/SamlTokenTest.java | 1 - .../java/org/apache/cxf/sts/claims/Claim.java | 88 -- .../apache/cxf/sts/claims/ClaimCollection.java | 32 - .../ClaimsAttributeStatementProvider.java | 6 +- .../apache/cxf/sts/claims/ClaimsHandler.java | 4 +- .../apache/cxf/sts/claims/ClaimsManager.java | 83 +- .../org/apache/cxf/sts/claims/ClaimsMapper.java | 4 +- .../org/apache/cxf/sts/claims/ClaimsParser.java | 6 +- .../cxf/sts/claims/IdentityClaimsParser.java | 48 +- .../cxf/sts/claims/LdapClaimsHandler.java | 22 +- .../cxf/sts/claims/LdapGroupClaimsHandler.java | 22 +- .../apache/cxf/sts/claims/ProcessedClaim.java | 63 + .../sts/claims/ProcessedClaimCollection.java | 32 + .../org/apache/cxf/sts/claims/RequestClaim.java | 56 - .../cxf/sts/claims/RequestClaimCollection.java | 43 - .../cxf/sts/claims/StaticClaimsHandler.java | 12 +- .../sts/claims/StaticEndpointClaimsHandler.java | 12 +- .../apache/cxf/sts/event/map/EventMapper.java | 6 +- .../cxf/sts/operation/AbstractOperation.java | 10 +- .../cxf/sts/operation/TokenIssueOperation.java | 4 +- .../sts/operation/TokenValidateOperation.java | 4 +- .../apache/cxf/sts/request/RequestParser.java | 29 +- .../cxf/sts/request/TokenRequirements.java | 22 +- .../token/provider/TokenProviderParameters.java | 14 +- .../token/validator/DefaultSAMLRoleParser.java | 34 +- .../cxf/sts/common/CustomAttributeProvider.java | 12 +- .../cxf/sts/common/CustomClaimParser.java | 13 +- .../cxf/sts/common/CustomClaimsHandler.java | 23 +- .../cxf/sts/common/CustomUserClaimsHandler.java | 18 +- .../sts/common/RealmSupportClaimsHandler.java | 18 +- .../org/apache/cxf/sts/ldap/LDAPClaimsTest.java | 36 +- .../cxf/sts/operation/CustomClaimsMapper.java | 14 +- .../sts/operation/IssueSamlClaimsUnitTest.java | 8 +- .../ValidateTokenTransformationUnitTest.java | 9 +- .../cxf/sts/token/provider/SAMLClaimsTest.java | 45 +- .../cxf/sts/token/realm/RealmSupportTest.java | 32 +- .../token/validator/SAMLTokenValidatorTest.java | 11 +- .../CustomAttributeStatementProvider.java | 10 +- .../sts/deployment/CustomClaimsHandler.java | 18 +- .../sts/deployment/CustomClaimsParser.java | 14 +- systests/jaxrs/pom.xml | 5 + .../cxf/systest/jaxrs/BookStoreSpring.java | 2 +- .../jaxrs/JAXRSSimpleRequestDispatcherTest.java | 12 +- .../jaxrs/websocket/BookServerWebSocket.java | 18 +- .../JAXRSClientServerWebSocketSpringTest.java | 43 + ...RSClientServerWebSocketSpringWebAppTest.java | 65 + .../JAXRSClientServerWebSocketTest.java | 9 +- .../jaxrs_dispatch_simple/WEB-INF/beans.xml | 19 + .../jaxrs_dispatch_simple/WEB-INF/web.xml | 14 +- .../resources/jaxrs_websocket/WEB-INF/beans.xml | 45 + .../resources/jaxrs_websocket/WEB-INF/web.xml | 41 + .../jaxrs_websocket/beans-embedded.xml | 45 + .../security/oauth2/SamlCallbackHandler.java | 6 +- .../security/oauth2/SamlCallbackHandler2.java | 6 +- .../saml/CustomSecurityContextProvider.java | 4 +- .../security/saml/SamlCallbackHandler.java | 6 +- 101 files changed, 3480 insertions(+), 2382 deletions(-) ----------------------------------------------------------------------
