cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [11/27] cxf git commit: Refactoring UT Encrypted STS tests
Date Mon, 08 Aug 2016 01:50:31 GMT
Refactoring UT Encrypted STS tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/686dfd64
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/686dfd64
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/686dfd64

Branch: refs/heads/master-jaxrs-2.1
Commit: 686dfd647c2dca0e181163eb486c32d8ea84856b
Parents: fdea67f
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Aug 4 13:56:47 2016 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Aug 4 18:03:54 2016 +0100

----------------------------------------------------------------------
 .../sts/asymmetric/AsymmetricBindingTest.java   |  8 ++++
 .../sts/symmetric/SymmetricBindingTest.java     |  8 ++++
 .../cxf/systest/sts/deployment/cxf-sts.xml      |  7 +++
 .../systest/sts/deployment/cxf-ut-encrypted.xml | 48 +++++++++++++++++++
 .../cxf/systest/sts/deployment/cxf-ut.xml       | 32 -------------
 .../sts/deployment/stax-cxf-ut-encrypted.xml    | 49 ++++++++++++++++++++
 .../cxf/systest/sts/deployment/stax-cxf-ut.xml  | 33 -------------
 7 files changed, 120 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/686dfd64/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
index f3082f1..47a68cc 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java
@@ -88,9 +88,17 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase
{
         stsServer.setContext("cxf-ut.xml");
         assertTrue(launchServer(stsServer));
         
+        stsServer = new STSServer();
+        stsServer.setContext("cxf-ut-encrypted.xml");
+        assertTrue(launchServer(stsServer));
+        
         StaxSTSServer staxStsServer = new StaxSTSServer();
         staxStsServer.setContext("stax-cxf-ut.xml");
         assertTrue(launchServer(staxStsServer));
+        
+        staxStsServer = new StaxSTSServer();
+        staxStsServer.setContext("stax-cxf-ut-encrypted.xml");
+        assertTrue(launchServer(staxStsServer));
     }
     
     @Parameters(name = "{0}")

http://git-wip-us.apache.org/repos/asf/cxf/blob/686dfd64/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
index bbeb002..05681fc 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
@@ -99,9 +99,17 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase
{
         stsServer.setContext("cxf-ut.xml");
         assertTrue(launchServer(stsServer));
         
+        stsServer = new STSServer();
+        stsServer.setContext("cxf-ut-encrypted.xml");
+        assertTrue(launchServer(stsServer));
+        
         StaxSTSServer staxStsServer = new StaxSTSServer();
         staxStsServer.setContext("stax-cxf-ut.xml");
         assertTrue(launchServer(staxStsServer));
+        
+        staxStsServer = new StaxSTSServer();
+        staxStsServer.setContext("stax-cxf-ut-encrypted.xml");
+        assertTrue(launchServer(staxStsServer));
     }
     
     @Parameters(name = "{0}")

http://git-wip-us.apache.org/repos/asf/cxf/blob/686dfd64/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
index 926dc01..7c54d26 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml
@@ -83,6 +83,12 @@
             <property name="type" value="FederatedIdentity"/>
         </bean>
     </util:list>
+    
+    <bean id="encProperties" class="org.apache.cxf.sts.service.EncryptionProperties">
+        <property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+        <property name="keyWrapAlgorithm" value="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </bean>
+    
     <bean id="stsProperties" class="org.apache.cxf.sts.StaticSTSProperties">
         <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
         <property name="signatureUsername" value="mystskey"/>
@@ -90,6 +96,7 @@
         <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
         <property name="issuer" value="DoubleItSTSIssuer"/>
         <property name="encryptionUsername" value="myservicekey"/>
+        <property name="encryptionProperties" ref="encProperties"/>
         <property name="realmParser" ref="customRealmParser"/>
         <property name="relationships" ref="relationships"/>
         <property name="samlRealmCodec" ref="samlRealmCodec"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/686dfd64/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
new file mode 100644
index 0000000..d93a22b
--- /dev/null
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut-encrypted.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core"
xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="         http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd
        http://www.springframework.org/schema/beans         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://cxf.apache.org/jaxws                                              http://cxf.apache.org/schemas/jaxws.xsd
        http://www.springframework.org/schema/util         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+    <cxf:bus>
+        <cxf:features>
+            <cxf:logging/>
+        </cxf:features>
+    </cxf:bus>
+    
+    <import resource="cxf-sts.xml" />
+    
+    <!-- Override org.apache.cxf.sts.operation.TokenIssueOperation -->
+    <bean id="issueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+        <property name="tokenProviders" ref="tokenProviders"/>
+        <property name="tokenValidators" ref="tokenValidators"/>
+        <property name="services" ref="service"/>
+        <property name="stsProperties" ref="stsProperties"/>
+        <property name="delegationHandlers" ref="delegationHandlers"/>
+        <property name="claimsManager" ref="claimsManager"/>
+        <property name="encryptIssuedToken" value="true"/>
+    </bean>
+
+    <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="EncryptedUTSTS"
implementor="#stsProviderBean" address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/UTEncrypted"
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port">
+        <jaxws:properties>
+            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.username" value="mystskey"/>
+        </jaxws:properties>
+    </jaxws:endpoint>
+</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/686dfd64/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
index 659b9a2..8237ad9 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml
@@ -34,36 +34,4 @@
         </jaxws:properties>
     </jaxws:endpoint>
     
-    <bean id="encryptedUtSTSProviderBean" class="org.apache.cxf.sts.provider.DefaultSecurityTokenServiceProvider">
-        <property name="services" ref="encryptedUtService"/>
-        <property name="stsProperties" ref="encryptedUtSTSProperties"/>
-        <property name="encryptIssuedToken" value="true"/>
-    </bean>
-    <bean id="encryptedUtService" class="org.apache.cxf.sts.service.StaticService">
-        <property name="endpoints" ref="encryptedUtEndpoints"/>
-    </bean>
-    <util:list id="encryptedUtEndpoints">
-        <value>http://localhost:(\d)*/doubleit/services/doubleit(a)?symmetricsaml1encrypted
-                </value>
-    </util:list>
-    <bean id="encProperties" class="org.apache.cxf.sts.service.EncryptionProperties">
-        <property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <property name="keyWrapAlgorithm" value="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </bean>
-    <bean id="encryptedUtSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
-        <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
-        <property name="signatureUsername" value="mystskey"/>
-        <property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-        <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-        <property name="encryptionProperties" ref="encProperties"/>
-        <property name="issuer" value="DoubleItSTSIssuer"/>
-        <property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="EncryptedUTSTS"
implementor="#encryptedUtSTSProviderBean" address="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/UTEncrypted"
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="stsKeystore.properties"/>
-            <entry key="security.signature.username" value="mystskey"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
 </beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/686dfd64/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
new file mode 100644
index 0000000..4b6ba50
--- /dev/null
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut-encrypted.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core"
xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:test="http://apache.org/hello_world_soap_http"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="         http://cxf.apache.org/core         http://cxf.apache.org/schemas/core.xsd
        http://www.springframework.org/schema/beans         http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
        http://cxf.apache.org/jaxws                                              http://cxf.apache.org/schemas/jaxws.xsd
        http://www.springframework.org/schema/util         http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+    <cxf:bus>
+        <cxf:features>
+            <cxf:logging/>
+        </cxf:features>
+    </cxf:bus>
+    
+    <import resource="cxf-sts.xml" />
+    
+   <!-- Override org.apache.cxf.sts.operation.TokenIssueOperation -->
+    <bean id="issueDelegate" class="org.apache.cxf.sts.operation.TokenIssueOperation">
+        <property name="tokenProviders" ref="tokenProviders"/>
+        <property name="tokenValidators" ref="tokenValidators"/>
+        <property name="services" ref="service"/>
+        <property name="stsProperties" ref="stsProperties"/>
+        <property name="delegationHandlers" ref="delegationHandlers"/>
+        <property name="claimsManager" ref="claimsManager"/>
+        <property name="encryptIssuedToken" value="true"/>
+    </bean>
+    
+    <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="EncryptedUTSTS"
implementor="#stsProviderBean" address="http://localhost:${testutil.ports.StaxSTSServer.2}/SecurityTokenService/UTEncrypted"
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port">
+        <jaxws:properties>
+            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <entry key="security.signature.properties" value="stsKeystore.properties"/>
+            <entry key="security.signature.username" value="mystskey"/>
+            <entry key="ws-security.enable.streaming" value="true"/>
+        </jaxws:properties>
+    </jaxws:endpoint>
+</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/686dfd64/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
index 20420ef..f70d2bd 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml
@@ -35,37 +35,4 @@
         </jaxws:properties>
     </jaxws:endpoint>
     
-    <bean id="encryptedUtSTSProviderBean" class="org.apache.cxf.sts.provider.DefaultSecurityTokenServiceProvider">
-        <property name="services" ref="encryptedUtService"/>
-        <property name="stsProperties" ref="encryptedUtSTSProperties"/>
-        <property name="encryptIssuedToken" value="true"/>
-    </bean>
-    <bean id="encryptedUtService" class="org.apache.cxf.sts.service.StaticService">
-        <property name="endpoints" ref="encryptedUtEndpoints"/>
-    </bean>
-    <util:list id="encryptedUtEndpoints">
-        <value>http://localhost:(\d)*/doubleit/services/doubleit(a)?symmetricsaml1encrypted
-                </value>
-    </util:list>
-    <bean id="encProperties" class="org.apache.cxf.sts.service.EncryptionProperties">
-        <property name="encryptionAlgorithm" value="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-        <property name="keyWrapAlgorithm" value="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </bean>
-    <bean id="encryptedUtSTSProperties" class="org.apache.cxf.sts.StaticSTSProperties">
-        <property name="signaturePropertiesFile" value="stsKeystore.properties"/>
-        <property name="signatureUsername" value="mystskey"/>
-        <property name="callbackHandlerClass" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-        <property name="encryptionPropertiesFile" value="stsKeystore.properties"/>
-        <property name="encryptionProperties" ref="encProperties"/>
-        <property name="issuer" value="DoubleItSTSIssuer"/>
-        <property name="encryptionUsername" value="myservicekey"/>
-    </bean>
-    <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="EncryptedUTSTS"
implementor="#encryptedUtSTSProviderBean" address="http://localhost:${testutil.ports.StaxSTSServer.2}/SecurityTokenService/UTEncrypted"
wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
serviceName="ns1:SecurityTokenService" endpointName="ns1:UTEncrypted_Port">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="stsKeystore.properties"/>
-            <entry key="security.signature.username" value="mystskey"/>
-            <entry key="ws-security.enable.streaming" value="true"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
 </beans>


Mime
View raw message