cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Fri, 14 Aug 2015 13:13:23 GMT
Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: 400c6839e52b8787e770c5375b146e9ef5e45b37
Parents: 6adfad9
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Aug 14 14:13:14 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Aug 14 14:13:14 2015 +0100

----------------------------------------------------------------------
 .../systest/jaxrs/security/saml/JAXRSSamlTest.java    | 14 ++------------
 .../jaxrs/security/saml/SamlCallbackHandler.java      |  7 +------
 2 files changed, 3 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/400c6839/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
index e00ccb8..8554733 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java
@@ -42,7 +42,6 @@ import org.apache.cxf.rs.security.saml.SamlEnvelopedOutInterceptor;
 import org.apache.cxf.rs.security.saml.SamlFormOutInterceptor;
 import org.apache.cxf.rs.security.saml.SamlHeaderOutInterceptor;
 import org.apache.cxf.rs.security.xml.XmlSigOutInterceptor;
-import org.apache.cxf.rt.security.SecurityConstants;
 import org.apache.cxf.systest.jaxrs.security.Book;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 import org.apache.wss4j.common.saml.builder.SAML2Constants;
@@ -237,20 +236,11 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase {
         bean.setBus(springBus);
 
         Map<String, Object> properties = new HashMap<String, Object>();
-<<<<<<< HEAD
         properties.put("ws-security.callback-handler", 
                        "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put("ws-security.saml-callback-handler", 
-                       "org.apache.cxf.systest.jaxrs.security.saml.SamlCallbackHandler");
+        properties.put("ws-security.saml-callback-handler", samlCallbackHandler);
         properties.put("ws-security.signature.username", "alice");
-        properties.put("ws-security.signature.properties", 
-=======
-        properties.put(SecurityConstants.CALLBACK_HANDLER, 
-                       "org.apache.cxf.systest.jaxrs.security.saml.KeystorePasswordCallback");
-        properties.put(SecurityConstants.SAML_CALLBACK_HANDLER, samlCallbackHandler);
-        properties.put(SecurityConstants.SIGNATURE_USERNAME, "alice");
-        properties.put(SecurityConstants.SIGNATURE_PROPERTIES, 
->>>>>>> 953d23f... [CXF-6543] - It's not possible to specify the signature
+ digest algorithms for self-signed SAML Assertions with JAX-RS
+        properties.put("ws-security.signature.properties",
                        "org/apache/cxf/systest/jaxrs/security/alice.properties");
         bean.setProperties(properties);
         

http://git-wip-us.apache.org/repos/asf/cxf/blob/400c6839/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
index 1bc5ea8..fd36582 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/SamlCallbackHandler.java
@@ -108,13 +108,8 @@ public class SamlCallbackHandler implements CallbackHandler {
                                                          SecurityConstants.SIGNATURE_CRYPTO,
                                                          SecurityConstants.SIGNATURE_PROPERTIES);
                         X509Certificate cert = 
-<<<<<<< HEAD
                             SecurityUtils.getCertificates(crypto, 
-                                SecurityUtils.getUserName(m, crypto, "ws-security.signature.username"))[0];
-=======
-                            RSSecurityUtils.getCertificates(crypto, 
-                                RSSecurityUtils.getUserName(m, crypto, SecurityConstants.SIGNATURE_USERNAME))[0];
->>>>>>> 953d23f... [CXF-6543] - It's not possible to specify the signature
+ digest algorithms for self-signed SAML Assertions with JAX-RS
+                                SecurityUtils.getUserName(m, crypto, SecurityConstants.SIGNATURE_USERNAME))[0];
                         
                         KeyInfoBean keyInfo = new KeyInfoBean();
                         keyInfo.setCertificate(cert);


Mime
View raw message