cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1349740 - in /cxf/branches/2.5.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:42:41 GMT
Author: coheigea
Date: Wed Jun 13 10:42:40 2012
New Revision: 1349740

URL: http://svn.apache.org/viewvc?rev=1349740&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

........


Conflicts:

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

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

Modified: cxf/branches/2.5.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml?rev=1349740&r1=1349739&r2=1349740&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/sts-war/src/main/webapp/WEB-INF/cxf-encrypted-ut.xml
Wed Jun 13 10:42:40 2012
@@ -49,6 +49,7 @@
 		<property name="tokenProviders" ref="encryptedUtSamlTokenProvider" />
 		<property name="services" ref="encryptedUtService" />
 		<property name="stsProperties" ref="encryptedUtSTSProperties" />
+		<property name="encryptIssuedToken" value="true" />
 	</bean>
 
 	<bean id="encryptedUtValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
@@ -65,6 +66,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" />
@@ -72,6 +78,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.5.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.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml?rev=1349740&r1=1349739&r2=1349740&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml
Wed Jun 13 10:42:40 2012
@@ -51,6 +51,7 @@
 		<property name="tokenProviders" ref="encryptedUtSamlTokenProvider" />
 		<property name="services" ref="encryptedUtService" />
 		<property name="stsProperties" ref="encryptedUtSTSProperties" />
+                <property name="encryptIssuedToken" value="true" />
 	</bean>
 
 	<bean id="encryptedUtValidateDelegate" class="org.apache.cxf.sts.operation.TokenValidateOperation">
@@ -59,7 +60,7 @@
 	<bean id="encryptedUtSamlTokenProvider" class="org.apache.cxf.sts.token.provider.SAMLTokenProvider">
 	</bean>
 
-	<bean id="encryptedUtService" class="org.apache.cxf.sts.service.StaticService">
+        <bean id="encryptedUtService" class="org.apache.cxf.sts.service.StaticService">
 		<property name="endpoints" ref="encryptedUtEndpoints" />
 	</bean>
 
@@ -67,6 +68,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" />
@@ -74,6 +80,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