cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1185706 - in /cxf/trunk/services/sts/systests/basic/src/test: java/org/apache/cxf/systest/sts/issueunit/ resources/org/apache/cxf/systest/sts/asymmetric/ resources/org/apache/cxf/systest/sts/deployment/ resources/org/apache/cxf/systest/sts...
Date Tue, 18 Oct 2011 15:00:53 GMT
Author: coheigea
Date: Tue Oct 18 15:00:52 2011
New Revision: 1185706

URL: http://svn.apache.org/viewvc?rev=1185706&view=rev
Log:
Making the STS system tests work with restricted security policies

Modified:
    cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl

Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java?rev=1185706&r1=1185705&r2=1185706&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java
Tue Oct 18 15:00:52 2011
@@ -244,29 +244,6 @@ public class IssueUnitTest extends Abstr
     }
     
     /**
-     * Test the endpoint address sent to the STS as part of AppliesTo. If the STS does not
-     * recognise the endpoint address it does not issue a token.
-     */
-    @org.junit.Test
-    public void testEndpointAddress() throws Exception {
-        SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = IssueUnitTest.class.getResource("cxf-client.xml");
-
-        Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
-
-        try {
-            String badAddress = 
-                "https://localhost:8081/doubleit/services/doubleitbadtransportsaml1";
-            requestSecurityToken(SAML1_TOKEN_TYPE, BEARER_KEYTYPE, bus, badAddress);
-            fail("Failure expected on a bad endpoint address");
-        } catch (Exception ex) {
-            // expected
-        }
-    }
-    
-    /**
      * Test that a request with no AppliesTo can be created by the CXF STS client.
      */
     @org.junit.Test

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl?rev=1185706&r1=1185705&r2=1185706&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/asymmetric/DoubleIt.wsdl
Tue Oct 18 15:00:52 2011
@@ -133,7 +133,7 @@
 						<sp:OnlySignEntireHeadersAndBody />
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256 />
+								<sp:Basic128 />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 					</wsp:Policy>
@@ -211,7 +211,7 @@
 						<sp:OnlySignEntireHeadersAndBody />
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256 />
+								<sp:Basic128 />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 					</wsp:Policy>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl?rev=1185706&r1=1185705&r2=1185706&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl
Tue Oct 18 15:00:52 2011
@@ -438,7 +438,7 @@
                   </sp:ProtectionToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:Basic256 />
+                        <sp:Basic128 />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>
@@ -504,7 +504,7 @@
                   </sp:ProtectionToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:Basic256 />
+                        <sp:Basic128 />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>
@@ -579,7 +579,7 @@
                   </sp:RecipientToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:Basic128 />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>
@@ -627,7 +627,7 @@
                   </sp:TransportToken>
                   <sp:AlgorithmSuite>
                      <wsp:Policy>
-                        <sp:TripleDesRsa15 />
+                        <sp:Basic128 />
                      </wsp:Policy>
                   </sp:AlgorithmSuite>
                   <sp:Layout>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl?rev=1185706&r1=1185705&r2=1185706&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl
Tue Oct 18 15:00:52 2011
@@ -87,7 +87,7 @@
 									<sp:RequestSecurityTokenTemplate>
 										<t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</t:TokenType>
 										<t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</t:KeyType>
-										<t:KeySize>256</t:KeySize>
+										<t:KeySize>128</t:KeySize>
 									</sp:RequestSecurityTokenTemplate>
 									<wsp:Policy>
 										<sp:RequireInternalReference />
@@ -118,7 +118,7 @@
 						<sp:OnlySignEntireHeadersAndBody />
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256 />
+								<sp:Basic128 />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 					</wsp:Policy>
@@ -155,7 +155,7 @@
 									<sp:RequestSecurityTokenTemplate>
 										<t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</t:TokenType>
 										<t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</t:KeyType>
-										<t:KeySize>256</t:KeySize>
+										<t:KeySize>128</t:KeySize>
 									</sp:RequestSecurityTokenTemplate>
 									<wsp:Policy>
 										<sp:RequireInternalReference />
@@ -186,7 +186,7 @@
 						<sp:OnlySignEntireHeadersAndBody />
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256 />
+								<sp:Basic128 />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 					</wsp:Policy>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl?rev=1185706&r1=1185705&r2=1185706&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_actas/DoubleIt.wsdl
Tue Oct 18 15:00:52 2011
@@ -91,7 +91,7 @@
 						<sp:OnlySignEntireHeadersAndBody />
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256 />
+								<sp:Basic128 />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 					</wsp:Policy>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl?rev=1185706&r1=1185705&r2=1185706&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/username_onbehalfof/DoubleIt.wsdl
Tue Oct 18 15:00:52 2011
@@ -91,7 +91,7 @@
 						<sp:OnlySignEntireHeadersAndBody />
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256 />
+								<sp:Basic128 />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 					</wsp:Policy>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl?rev=1185706&r1=1185705&r2=1185706&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl
Tue Oct 18 15:00:52 2011
@@ -87,7 +87,7 @@
 									<sp:RequestSecurityTokenTemplate>
 										<t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</t:TokenType>
 										<t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</t:KeyType>
-										<t:KeySize>256</t:KeySize>
+										<t:KeySize>128</t:KeySize>
 									</sp:RequestSecurityTokenTemplate>
 									<wsp:Policy>
 										<sp:RequireInternalReference />
@@ -118,7 +118,7 @@
 						<sp:OnlySignEntireHeadersAndBody />
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256 />
+								<sp:Basic128 />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 					</wsp:Policy>
@@ -155,7 +155,7 @@
 									<sp:RequestSecurityTokenTemplate>
 										<t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</t:TokenType>
 										<t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</t:KeyType>
-										<t:KeySize>256</t:KeySize>
+										<t:KeySize>128</t:KeySize>
 									</sp:RequestSecurityTokenTemplate>
 									<wsp:Policy>
 										<sp:RequireInternalReference />
@@ -186,7 +186,7 @@
 						<sp:OnlySignEntireHeadersAndBody />
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256 />
+								<sp:Basic128 />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 					</wsp:Policy>



Mime
View raw message