You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2012/11/23 17:08:54 UTC
svn commit: r1412935 - in /cxf/branches/2.5.x-fixes:
rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/
services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/
Author: coheigea
Date: Fri Nov 23 16:08:53 2012
New Revision: 1412935
URL: http://svn.apache.org/viewvc?rev=1412935&view=rev
Log:
Merged revisions 1412925 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1412925 | coheigea | 2012-11-23 15:56:59 +0000 (Fri, 23 Nov 2012) | 10 lines
Merged revisions 1412902 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1412902 | coheigea | 2012-11-23 14:43:55 +0000 (Fri, 23 Nov 2012) | 2 lines
Default to requiring RSA OAEP for the REST Encryption case
........
........
Modified:
cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java
cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java?rev=1412935&r1=1412934&r2=1412935&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/AbstractXmlEncInHandler.java Fri Nov 23 16:08:53 2012
@@ -135,12 +135,15 @@ public abstract class AbstractXmlEncInHa
if (encProps != null) {
if (encProps.getEncryptionKeyTransportAlgo() != null
&& !encProps.getEncryptionKeyTransportAlgo().equals(keyEncAlgo)) {
- throwFault("Symmetric Key Algorithm is not supported", null);
+ throwFault("Key Transport Algorithm is not supported", null);
}
if (encProps.getEncryptionDigestAlgo() != null
&& (digestAlgo == null || !encProps.getEncryptionDigestAlgo().equals(digestAlgo))) {
throwFault("Digest Algorithm is not supported", null);
}
+ } else if (!XMLCipher.RSA_OAEP.equals(keyEncAlgo)) {
+ // RSA OAEP is the required default Key Transport Algorithm
+ throwFault("Key Transport Algorithm is not supported", null);
}
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java?rev=1412935&r1=1412934&r2=1412935&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionProperties.java Fri Nov 23 16:08:53 2012
@@ -18,8 +18,10 @@
*/
package org.apache.cxf.rs.security.xml;
+import org.apache.xml.security.encryption.XMLCipher;
+
public class EncryptionProperties {
- private String encryptionKeyTransportAlgo;
+ private String encryptionKeyTransportAlgo = XMLCipher.RSA_OAEP;
private String encryptionSymmetricKeyAlgo;
private String encryptionDigestAlgo;
private String encryptionKeyIdType;
Modified: cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java?rev=1412935&r1=1412934&r2=1412935&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java (original)
+++ cxf/branches/2.5.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/basic_auth/JaxrsBasicAuthTest.java Fri Nov 23 16:08:53 2012
@@ -83,7 +83,6 @@ public class JaxrsBasicAuthTest extends
if (authFailureExpected) {
throw new RuntimeException("Exception expected");
}
- System.out.println("The number " + numToDouble + " doubled is " + resp);
org.junit.Assert.assertEquals(2 * numToDouble, resp);
} catch (ServerWebApplicationException ex) {
if (!authFailureExpected) {