cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1349728 - in /cxf/branches/2.6.x-fixes/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:22:54 GMT
Author: coheigea
Date: Wed Jun 13 10:22:53 2012
New Revision: 1349728

URL: http://svn.apache.org/viewvc?rev=1349728&view=rev
Log:
Merged revisions 1349723 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1349723 | coheigea | 2012-06-13 11:16:37 +0100 (Wed, 13 Jun 2012) | 2 lines

  Changing the "Encrypted-UT" STS test-case to actually encrypt the issued token

........

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

Modified: cxf/branches/2.6.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml?rev=1349728&r1=1349727&r2=1349728&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
(original)
+++ cxf/branches/2.6.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
Wed Jun 13 10:22:53 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/branches/2.6.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml?rev=1349728&r1=1349727&r2=1349728&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
(original)
+++ cxf/branches/2.6.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
Wed Jun 13 10:22:53 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