cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1349723 - in /cxf/trunk/services/sts: sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
Date Wed, 13 Jun 2012 10:16:38 GMT
Author: coheigea
Date: Wed Jun 13 10:16:37 2012
New Revision: 1349723

URL: http://svn.apache.org/viewvc?rev=1349723&view=rev
Log:
Changing the "Encrypted-UT" STS test-case to actually encrypt the issued token

Modified:
    cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
    cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml

Modified: cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml?rev=1349723&r1=1349722&r2=1349723&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml (original)
+++ cxf/trunk/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml Wed Jun 13
10:16:37 2012
@@ -43,6 +43,7 @@
 	    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">
@@ -53,6 +54,11 @@
 		<value>http://localhost:(\d)*/doubleit/services/doubleitasymmetricsaml1encrypted
 		</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" />
@@ -60,6 +66,7 @@
 		<property name="callbackHandlerClass"
 			value="org.apache.cxf.sts.war.PasswordCallbackHandler" />
 		<property name="encryptionPropertiesFile" value="stsKeystore.properties" />
+		<property name="encryptionProperties" ref="encProperties" />
 		<property name="issuer" value="DoubleItSTSIssuer" />
 		<property name="encryptionUsername" value="myservicekey" />
 	</bean>

Modified: cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml?rev=1349723&r1=1349722&r2=1349723&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
Wed Jun 13 10:16:37 2012
@@ -45,6 +45,7 @@
 	    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">
@@ -55,6 +56,11 @@
 		<value>http://localhost:(\d)*/doubleit/services/doubleitasymmetricsaml1encrypted
 		</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" />
@@ -62,6 +68,7 @@
 		<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>



Mime
View raw message