[2/2] cxf git commit: Upgrading BouncyCastle
Upgrading BouncyCastle Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2c642fe7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2c642fe7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2c642fe7 Branch: refs/heads/3.0.x-fixes Commit: 2c642fe79342b79e4ca222c1468c5c27f479d146 Parents: 38eb75a Author: Colm O hEigeartaigh cohei...@apache.org Authored: Tue Mar 10 14:25:01 2015 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Tue Mar 10 14:25:27 2015 + -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/2c642fe7/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 826a10b..e899d43 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -79,7 +79,7 @@ cxf.atmosphere.version2.2.4/cxf.atmosphere.version cxf.atmosphere.version.range[2.0,3.0)/cxf.atmosphere.version.range cxf.axiom.version1.2.14/cxf.axiom.version -cxf.bcprov.version1.51/cxf.bcprov.version +cxf.bcprov.version1.52/cxf.bcprov.version cxf.cglib.bundle.version2.2_2/cxf.cglib.bundle.version cxf.cglib.osgi.version[2.1.3,3.0.0)/cxf.cglib.osgi.version cxf.commons-codec.version1.10/cxf.commons-codec.version
[2/2] cxf git commit: Upgrading BouncyCastle
Upgrading BouncyCastle Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bb768d97 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bb768d97 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bb768d97 Branch: refs/heads/2.7.x-fixes Commit: bb768d976c5ab412eef2bd8760aa787be798ac78 Parents: 13ddfdd Author: Colm O hEigeartaigh cohei...@apache.org Authored: Tue Mar 10 14:25:01 2015 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Tue Mar 10 14:26:04 2015 + -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/bb768d97/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 87e83ee..26bb0d2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -84,7 +84,7 @@ cxf.abdera.version1.1.3/cxf.abdera.version cxf.activemq.version5.8.0/cxf.activemq.version cxf.axiom.version1.2.14/cxf.axiom.version -cxf.bcprov.version1.51/cxf.bcprov.version +cxf.bcprov.version1.52/cxf.bcprov.version cxf.cglib.bundle.version2.2_2/cxf.cglib.bundle.version cxf.cglib.osgi.version[2.1.3,3.0.0)/cxf.cglib.osgi.version cxf.commons-codec.version1.10/cxf.commons-codec.version
cxf-fediz git commit: Upgrading BouncyCastle
Repository: cxf-fediz Updated Branches: refs/heads/master 9d387b965 - 3fa6aaef1 Upgrading BouncyCastle Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/3fa6aaef Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/3fa6aaef Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/3fa6aaef Branch: refs/heads/master Commit: 3fa6aaef1709b098e8bb3250fefe0f57bca94996 Parents: 9d387b9 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Tue Mar 10 13:54:36 2015 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Tue Mar 10 13:54:36 2015 + -- systests/kerberos/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/3fa6aaef/systests/kerberos/pom.xml -- diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml index ed4c4f1..606a2dc 100644 --- a/systests/kerberos/pom.xml +++ b/systests/kerberos/pom.xml @@ -181,7 +181,7 @@ groupIdorg.bouncycastle/groupId artifactIdbcprov-jdk15on/artifactId scopetest/scope -version1.51/version +version1.52/version /dependency /dependencies
cxf git commit: [CXF-6284] Fixing a text on 2.7.x
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 85f9d3662 - 13ddfdd19
[CXF-6284] Fixing a text on 2.7.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/13ddfdd1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/13ddfdd1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/13ddfdd1
Branch: refs/heads/2.7.x-fixes
Commit: 13ddfdd1949757402a1c8bed3829701e2ee59ce1
Parents: 85f9d36
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Mar 10 14:16:49 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Mar 10 14:16:49 2015 +
--
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 78 ++--
1 file changed, 40 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/13ddfdd1/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
--
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
index ca6d682..200ef85 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/ProviderFactoryTest.java
@@ -53,6 +53,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.validation.Schema;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.jaxrs.Customer;
@@ -87,20 +88,21 @@ public class ProviderFactoryTest extends Assert {
@Before
public void setUp() {
-ProviderFactory.getInstance().clearProviders();
AbstractResourceInfo.clearAllMaps();
}
@Test
public void testMultipleFactories() {
-assertNotSame(ProviderFactory.getInstance(),
ProviderFactory.getSharedInstance());
+
assertNotSame(ProviderFactory.createInstance(BusFactory.newInstance().createBus()),
+ ProviderFactory.getSharedInstance());
assertSame(ProviderFactory.getSharedInstance(),
ProviderFactory.getSharedInstance());
-assertNotSame(ProviderFactory.getInstance(),
ProviderFactory.getInstance());
+
assertNotSame(ProviderFactory.createInstance(BusFactory.newInstance().createBus()),
+
ProviderFactory.createInstance(BusFactory.newInstance().createBus()));
}
@Test
public void testCustomWadlHandler() {
-ProviderFactory pf = ProviderFactory.getInstance();
+ProviderFactory pf =
ProviderFactory.createInstance(BusFactory.newInstance().createBus());
assertEquals(1, pf.getRequestHandlers().size());
assertTrue(pf.getRequestHandlers().get(0).getProvider() instanceof
WadlGenerator);
@@ -113,7 +115,7 @@ public class ProviderFactoryTest extends Assert {
@Test
public void testCustomTestHandler() {
-ProviderFactory pf = ProviderFactory.getInstance();
+ProviderFactory pf =
ProviderFactory.createInstance(BusFactory.newInstance().createBus());
assertEquals(1, pf.getRequestHandlers().size());
assertTrue(pf.getRequestHandlers().get(0).getProvider() instanceof
WadlGenerator);
@@ -126,7 +128,7 @@ public class ProviderFactoryTest extends Assert {
@Test
public void testCustomTestAndWadlHandler() {
-ProviderFactory pf = ProviderFactory.getInstance();
+ProviderFactory pf =
ProviderFactory.createInstance(BusFactory.newInstance().createBus());
assertEquals(1, pf.getRequestHandlers().size());
assertTrue(pf.getRequestHandlers().get(0).getProvider() instanceof
WadlGenerator);
@@ -143,7 +145,7 @@ public class ProviderFactoryTest extends Assert {
@Test
public void testDefaultJaxbProvider() throws Exception {
-ProviderFactory pf = ProviderFactory.getInstance();
+ProviderFactory pf =
ProviderFactory.createInstance(BusFactory.newInstance().createBus());
doTestDefaultJaxbProviderCloned(pf, http://localhost:8080/base/;);
checkJaxbProvider(pf);
}
@@ -157,7 +159,7 @@ public class ProviderFactoryTest extends Assert {
public void doTestDefaultJaxbProviderClonedMultipleThreads() throws
Exception {
-ProviderFactory pf = ProviderFactory.getInstance();
+ProviderFactory pf =
ProviderFactory.createInstance(BusFactory.newInstance().createBus());
ThreadPoolExecutor executor = new ThreadPoolExecutor(50, 50, 0,
TimeUnit.SECONDS,
new
cxf git commit: More refactoring
Repository: cxf
Updated Branches:
refs/heads/opensaml-3.0-port d68f140c7 - 24e330c8b
More refactoring
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/24e330c8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/24e330c8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/24e330c8
Branch: refs/heads/opensaml-3.0-port
Commit: 24e330c8b6be65c98cd3914f6fe7498e980f4568
Parents: d68f140
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Mar 10 13:24:13 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Mar 10 13:24:13 2015 +
--
.../wss4j/policyhandlers/AbstractBindingBuilder.java | 15 +++
.../policyhandlers/AsymmetricBindingHandler.java | 4 ++--
.../policyhandlers/SymmetricBindingHandler.java | 5 +++--
.../policyhandlers/TransportBindingHandler.java | 6 --
.../ws/security/wss4j/SignatureConfirmationTest.java | 6 +++---
5 files changed, 19 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/24e330c8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 69a6e88..7dd95af 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -22,6 +22,7 @@ package org.apache.cxf.ws.security.wss4j.policyhandlers;
import java.net.URL;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
@@ -164,7 +165,7 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
protected SetWSEncryptionPart encryptedTokensList = new
HashSetWSEncryptionPart();
-protected Listbyte[] signatures = new ArrayListbyte[]();
+protected SetInteger signatures = new HashSet();
protected Element bottomUpElement;
protected Element topDownElement;
@@ -1829,7 +1830,7 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
ListReference referenceList =
sig.addReferencesToSign(sigParts, secHeader);
sig.computeSignature(referenceList, false, null);
-signatures.add(sig.getSignatureValue());
+addSig(sig.getSignatureValue());
if (isSigProtect) {
WSEncryptionPart part = new
WSEncryptionPart(sig.getId(), Element);
encryptedTokensList.add(part);
@@ -1966,7 +1967,7 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
//Do signature
dkSign.computeSignature(referenceList, false, null);
-signatures.add(dkSign.getSignatureValue());
+addSig(dkSign.getSignatureValue());
}
private void doSymmSignature(AbstractToken policyToken, SecurityToken tok,
@@ -2032,7 +2033,7 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
//Do signature
sig.computeSignature(referenceList, false, null);
-signatures.add(sig.getSignatureValue());
+addSig(sig.getSignatureValue());
}
protected void addSupportingTokens(ListWSEncryptionPart sigs) throws
WSSecurityException {
@@ -2241,4 +2242,10 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
}
}
+
+protected void addSig(byte[] val) {
+if (val != null val.length 0) {
+signatures.add(Arrays.hashCode(val));
+}
+}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/24e330c8/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index fc3aa8b..67d7afe 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -665,7 +665,7 @@ public class
cxf git commit: Upgrading BouncyCastle
Repository: cxf Updated Branches: refs/heads/master 16ab6e950 - 9d25f9a06 Upgrading BouncyCastle Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9d25f9a0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9d25f9a0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9d25f9a0 Branch: refs/heads/master Commit: 9d25f9a0617bcb30e19d23fa4d5b4bd7948b8434 Parents: 16ab6e9 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Tue Mar 10 14:25:01 2015 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Tue Mar 10 14:25:01 2015 + -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/9d25f9a0/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 23e4117..d2072dd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -72,7 +72,7 @@ cxf.atmosphere.version2.2.5/cxf.atmosphere.version cxf.atmosphere.version.range[2.0,3.0)/cxf.atmosphere.version.range cxf.axiom.version1.2.14/cxf.axiom.version -cxf.bcprov.version1.51/cxf.bcprov.version +cxf.bcprov.version1.52/cxf.bcprov.version cxf.cglib.bundle.version2.2_2/cxf.cglib.bundle.version cxf.cglib.osgi.version[2.1.3,3.0.0)/cxf.cglib.osgi.version cxf.commons-codec.version1.10/cxf.commons-codec.version
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 38eb75ae4 - 24d88dc5e Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/24d88dc5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/24d88dc5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/24d88dc5 Branch: refs/heads/3.0.x-fixes Commit: 24d88dc5ecea8053c86c56caa1e3879b917885f5 Parents: 2c642fe Author: Colm O hEigeartaigh cohei...@apache.org Authored: Tue Mar 10 14:25:27 2015 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Tue Mar 10 14:25:27 2015 + -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/24d88dc5/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index aee4b4e..9a7f1e8 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -250,6 +250,7 @@ M 94585ae070e62d08f0e064df8176fbdbdf1bb37b M 98a578dbf4b7e19c4555bd2011f24c650d0f54c0 M 98f65f2911e063e70e864e7614b062cc124a0f9d M 990f4b1d594c8f1446d42a516eaef82020df2747 +M 9d25f9a0617bcb30e19d23fa4d5b4bd7948b8434 M a3bf2a80bafa95ec2ccdd2b28ead26c13866acd7 M a64ded455c40169665e438ae7a25f17bd4f8047a M a9555675b829acdfb1672bc2157d6f3c08fdd652
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 13ddfdd19 - 27ddeb8b1 Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/27ddeb8b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/27ddeb8b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/27ddeb8b Branch: refs/heads/2.7.x-fixes Commit: 27ddeb8b1f492b78e2df1c83f1a7a68c0654c34f Parents: bb768d9 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Tue Mar 10 14:26:04 2015 + Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Tue Mar 10 14:26:04 2015 + -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/27ddeb8b/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 101804b..f9ff014 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -288,6 +288,7 @@ B 242ffb176a1b2bea2be1762750f66af8d227ca2f B 249c25bddbe08ba346f67dcc34d65dd2598d5c72 B 24aa7e5814f6e6a4c51522ae27a33ac1ed8cc809 B 24cbca795a21070f5bf11587277900b3a2cf226b +B 24d88dc5ecea8053c86c56caa1e3879b917885f5 B 252626fff32596dccce59c8044bd32136dedda12 B 253f87685ae7d048b815937c158be9f4229baf7a B 2545331efbcb82087891ffe4941d1efa01a1b4ac @@ -2031,6 +2032,7 @@ M 2b0565d07974a9880c62900dc41b489bb118defa M 2b33266fd9dc0e0b323fff13ae7bfe2ef3e74135 M 2c0d2a841135f4ae2bcf50920122a8045824d063 M 2c2c744608675c802039e79afacdae34efd5d433 +M 2c642fe79342b79e4ca222c1468c5c27f479d146 M 2ca388d991f59df5282d8e960f7acfc7480b1ad4 M 2cf133d0cb05680ee3b21e3d6905faca8e2189a5 M 2d246e708ce9d586477bed79db384e8876f7170f
cxf git commit: [CXF-6278] Adding a utility DigestInputStream extension
Repository: cxf
Updated Branches:
refs/heads/master eadcd2ce0 - e805911d4
[CXF-6278] Adding a utility DigestInputStream extension
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e805911d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e805911d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e805911d
Branch: refs/heads/master
Commit: e805911d436ed242d2e3e7489c1b1f6dfc36a189
Parents: eadcd2c
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Mar 10 16:40:30 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Mar 10 16:40:30 2015 +
--
.../common/util/MessageDigestInputStream.java | 48
1 file changed, 48 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e805911d/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
--
diff --git
a/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
b/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
new file mode 100644
index 000..0237b8d
--- /dev/null
+++
b/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.common.util;
+
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.cxf.common.util.crypto.MessageDigestUtils;
+
+public class MessageDigestInputStream extends java.security.DigestInputStream {
+public MessageDigestInputStream(InputStream is) {
+super(is, getDigestInstance(MessageDigestUtils.ALGO_SHA_256));
+}
+
+private static MessageDigest getDigestInstance(String algo) {
+try {
+return MessageDigest.getInstance(algo);
+} catch (NoSuchAlgorithmException ex) {
+throw new SecurityException(ex);
+}
+}
+public byte[] getDigestBytes() {
+return super.getMessageDigest().digest();
+}
+public String getBase64Digest() {
+return Base64Utility.encode(getDigestBytes());
+}
+public String getBase64UrlDigest() {
+return Base64UrlUtility.encode(getDigestBytes());
+}
+}
cxf git commit: [CXF-6278] Adding a utility DigestInputStream extension
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 280ac138a - 2e15fa9c4
[CXF-6278] Adding a utility DigestInputStream extension
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2e15fa9c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2e15fa9c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2e15fa9c
Branch: refs/heads/3.0.x-fixes
Commit: 2e15fa9c40f80124b302ca03ddc1ca130cb6baa5
Parents: 280ac13
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Mar 10 16:40:30 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Mar 10 16:41:19 2015 +
--
.../common/util/MessageDigestInputStream.java | 48
1 file changed, 48 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/2e15fa9c/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
--
diff --git
a/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
b/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
new file mode 100644
index 000..0237b8d
--- /dev/null
+++
b/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.common.util;
+
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import org.apache.cxf.common.util.crypto.MessageDigestUtils;
+
+public class MessageDigestInputStream extends java.security.DigestInputStream {
+public MessageDigestInputStream(InputStream is) {
+super(is, getDigestInstance(MessageDigestUtils.ALGO_SHA_256));
+}
+
+private static MessageDigest getDigestInstance(String algo) {
+try {
+return MessageDigest.getInstance(algo);
+} catch (NoSuchAlgorithmException ex) {
+throw new SecurityException(ex);
+}
+}
+public byte[] getDigestBytes() {
+return super.getMessageDigest().digest();
+}
+public String getBase64Digest() {
+return Base64Utility.encode(getDigestBytes());
+}
+public String getBase64UrlDigest() {
+return Base64UrlUtility.encode(getDigestBytes());
+}
+}
cxf git commit: Fixing casting error in test
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes b8f198bea - 280ac138a
Fixing casting error in test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/280ac138
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/280ac138
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/280ac138
Branch: refs/heads/3.0.x-fixes
Commit: 280ac138a35633515e43de19ad5d8b71a66ab6e1
Parents: b8f198b
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Mar 10 15:34:30 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Mar 10 15:35:33 2015 +
--
.../apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/280ac138/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
--
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
index 6ea49f1..02418a5 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
@@ -98,7 +98,7 @@ public class SignatureConfirmationTest extends
AbstractSecurityTest {
//
// Save the signature for future confirmation
//
-ListWSHandlerResult sigv =
CastUtils.cast((List?)msg.get(WSHandlerConstants.SEND_SIGV));
+Listbyte[] sigv =
CastUtils.cast((List?)msg.get(WSHandlerConstants.SEND_SIGV));
assertNotNull(sigv);
assertTrue(sigv.size() != 0);
@@ -144,7 +144,7 @@ public class SignatureConfirmationTest extends
AbstractSecurityTest {
private void testSignatureConfirmationResponse(
-ListWSHandlerResult sigSaved,
+Listbyte[] sigSaved,
ListWSHandlerResult sigReceived
) throws Exception {
Document doc = readDocument(wsse-request-clean.xml);
cxf git commit: [CXF-6285] Fixing NPE
Repository: cxf
Updated Branches:
refs/heads/master 9d25f9a06 - 8bf53f976
[CXF-6285] Fixing NPE
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8bf53f97
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8bf53f97
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8bf53f97
Branch: refs/heads/master
Commit: 8bf53f9766b13c4e5ff2ed719f7250d34f77f219
Parents: 9d25f9a
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Mar 10 14:45:21 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Mar 10 14:45:21 2015 +
--
.../src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8bf53f97/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
index 8900ba1..85ef7a8 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
@@ -96,7 +96,7 @@ public class SwaggerFeature extends AbstractFeature {
if ((resourceInfo != null)
(getResourcePackage() == null || getResourcePackage().length()
== 0)) {
-
setResourcePackage(resourceInfo.getResourceClass().getPackage().getName());
+
setResourcePackage(resourceInfo.getServiceClass().getPackage().getName());
}
}
cxf git commit: [CXF-6285] Fixing NPE
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 24d88dc5e - b8f198bea
[CXF-6285] Fixing NPE
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b8f198be
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b8f198be
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b8f198be
Branch: refs/heads/3.0.x-fixes
Commit: b8f198beaaa0f4bf37e364ef0556ba1b3405816f
Parents: 24d88dc
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Tue Mar 10 14:45:21 2015 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Tue Mar 10 14:46:20 2015 +
--
.../src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b8f198be/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
--
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
index 8900ba1..85ef7a8 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
@@ -96,7 +96,7 @@ public class SwaggerFeature extends AbstractFeature {
if ((resourceInfo != null)
(getResourcePackage() == null || getResourcePackage().length()
== 0)) {
-
setResourcePackage(resourceInfo.getResourceClass().getPackage().getName());
+
setResourcePackage(resourceInfo.getServiceClass().getPackage().getName());
}
}
[2/2] cxf-fediz git commit: Adding modified signature replay test
Adding modified signature replay test
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/dd161ea2
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/dd161ea2
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/dd161ea2
Branch: refs/heads/master
Commit: dd161ea296dedd3028a0308d60ecdd50d44c6598
Parents: 2626770
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Mar 10 15:25:33 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Mar 10 15:25:33 2015 +
--
.../fediz/integrationtests/AbstractTests.java | 55
1 file changed, 55 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/dd161ea2/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
--
diff --git
a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
index 53e2e79..210afa3 100644
---
a/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
+++
b/systests/tests/src/test/java/org/apache/cxf/fediz/integrationtests/AbstractTests.java
@@ -26,12 +26,18 @@ import org.w3c.dom.Node;
import com.gargoylesoftware.htmlunit.CookieManager;
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.DomElement;
+import com.gargoylesoftware.htmlunit.html.DomNodeList;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
import com.gargoylesoftware.htmlunit.xml.XmlPage;
import org.apache.cxf.fediz.core.ClaimTypes;
import org.apache.cxf.fediz.core.FederationConstants;
import org.apache.cxf.fediz.core.util.DOMUtils;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.wss4j.dom.WSSConfig;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.signature.XMLSignature;
@@ -439,4 +445,53 @@ public abstract class AbstractTests {
Assert.assertEquals(401, idpPage.getWebResponse().getStatusCode());
}
+
+@org.junit.Test
+public void testAliceModifiedSignature() throws Exception {
+String url = https://localhost:; + getRpHttpsPort() +
/fedizhelloworld/secure/fedservlet;
+String user = alice;
+String password = ecila;
+
+// Get the initial token
+CookieManager cookieManager = new CookieManager();
+final WebClient webClient = new WebClient();
+webClient.setCookieManager(cookieManager);
+webClient.getOptions().setUseInsecureSSL(true);
+webClient.getCredentialsProvider().setCredentials(
+new AuthScope(localhost, Integer.parseInt(getIdpHttpsPort())),
+new UsernamePasswordCredentials(user, password));
+
+webClient.getOptions().setJavaScriptEnabled(false);
+final HtmlPage idpPage = webClient.getPage(url);
+webClient.getOptions().setJavaScriptEnabled(true);
+Assert.assertEquals(IDP SignIn Response Form,
idpPage.getTitleText());
+
+// Parse the form to get the token (wresult)
+DomNodeListDomElement results =
idpPage.getElementsByTagName(input);
+
+for (DomElement result : results) {
+if (wresult.equals(result.getAttributeNS(null, name))) {
+// Now modify the Signature
+String value = result.getAttributeNS(null, value);
+value = value.replace(alice, bob);
+result.setAttributeNS(null, value, value);
+}
+}
+
+// Invoke back on the RP
+
+final HtmlForm form = idpPage.getFormByName(signinresponseform);
+final HtmlSubmitInput button = form.getInputByName(_eventId_submit);
+
+try {
+button.click();
+Assert.fail(Failure expected on a modified signature);
+} catch (FailingHttpStatusCodeException ex) {
+// expected
+Assert.assertTrue(ex.getMessage().contains(401 Unauthorized)
+ || ex.getMessage().contains(401 Authentication
Failed)
+ || ex.getMessage().contains(403 Forbidden));
+}
+
+}
}
cxf git commit: Fixing casting error in test
Repository: cxf
Updated Branches:
refs/heads/master 8bf53f976 - eadcd2ce0
Fixing casting error in test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eadcd2ce
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eadcd2ce
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eadcd2ce
Branch: refs/heads/master
Commit: eadcd2ce004d9bfefdbe0f4309570c1b104364db
Parents: 8bf53f9
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Mar 10 15:34:30 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Mar 10 15:34:57 2015 +
--
.../apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/eadcd2ce/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
--
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
index 6ea49f1..02418a5 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
@@ -98,7 +98,7 @@ public class SignatureConfirmationTest extends
AbstractSecurityTest {
//
// Save the signature for future confirmation
//
-ListWSHandlerResult sigv =
CastUtils.cast((List?)msg.get(WSHandlerConstants.SEND_SIGV));
+Listbyte[] sigv =
CastUtils.cast((List?)msg.get(WSHandlerConstants.SEND_SIGV));
assertNotNull(sigv);
assertTrue(sigv.size() != 0);
@@ -144,7 +144,7 @@ public class SignatureConfirmationTest extends
AbstractSecurityTest {
private void testSignatureConfirmationResponse(
-ListWSHandlerResult sigSaved,
+Listbyte[] sigSaved,
ListWSHandlerResult sigReceived
) throws Exception {
Document doc = readDocument(wsse-request-clean.xml);
cxf git commit: Fixing casting error in test
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 27ddeb8b1 - 4efcd8bd4
Fixing casting error in test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4efcd8bd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4efcd8bd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4efcd8bd
Branch: refs/heads/2.7.x-fixes
Commit: 4efcd8bd42955fc30732c83180c0663d96389a55
Parents: 27ddeb8
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Mar 10 15:34:30 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Mar 10 15:37:04 2015 +
--
.../apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4efcd8bd/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
--
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
index 3f7b181..d69334f 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SignatureConfirmationTest.java
@@ -98,7 +98,7 @@ public class SignatureConfirmationTest extends
AbstractSecurityTest {
//
// Save the signature for future confirmation
//
-ListWSHandlerResult sigv =
CastUtils.cast((List?)msg.get(WSHandlerConstants.SEND_SIGV));
+Listbyte[] sigv =
CastUtils.cast((List?)msg.get(WSHandlerConstants.SEND_SIGV));
assertNotNull(sigv);
assertTrue(sigv.size() != 0);
@@ -144,7 +144,7 @@ public class SignatureConfirmationTest extends
AbstractSecurityTest {
private void testSignatureConfirmationResponse(
-ListWSHandlerResult sigSaved,
+Listbyte[] sigSaved,
ListWSHandlerResult sigReceived
) throws Exception {
Document doc = readDocument(wsse-request-clean.xml);
[1/2] cxf-fediz git commit: Fixing CXF plugin's exception mapping
Repository: cxf-fediz
Updated Branches:
refs/heads/master 3fa6aaef1 - dd161ea29
Fixing CXF plugin's exception mapping
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/26267701
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/26267701
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/26267701
Branch: refs/heads/master
Commit: 26267701b1952c3d984af0c92106b9afc910bdfb
Parents: 3fa6aae
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Mar 10 15:25:20 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Mar 10 15:25:20 2015 +
--
.../cxf/plugin/FedizRedirectBindingFilter.java | 182 +--
1 file changed, 89 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/26267701/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java
--
diff --git
a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java
b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java
index 7bc417e..e8ad7ea 100644
---
a/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java
+++
b/plugins/cxf/src/main/java/org/apache/cxf/fediz/cxf/plugin/FedizRedirectBindingFilter.java
@@ -18,9 +18,7 @@
*/
package org.apache.cxf.fediz.cxf.plugin;
-import java.io.IOException;
import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.security.cert.X509Certificate;
import java.util.Collections;
@@ -49,7 +47,6 @@ import org.apache.cxf.fediz.core.config.FederationProtocol;
import org.apache.cxf.fediz.core.config.FedizContext;
import org.apache.cxf.fediz.core.config.SAMLProtocol;
import org.apache.cxf.fediz.core.exception.ProcessingException;
-import org.apache.cxf.fediz.core.exception.ProcessingException.TYPE;
import org.apache.cxf.fediz.core.processor.FedizProcessor;
import org.apache.cxf.fediz.core.processor.FedizProcessorFactory;
import org.apache.cxf.fediz.core.processor.FedizRequest;
@@ -109,13 +106,13 @@ public class FedizRedirectBindingFilter extends
AbstractServiceProviderFilter {
} else if (checkSecurityContext(m)) {
return;
} else {
-try {
-if (isSignInRequired(fedConfig, params)) {
-// Unauthenticated - redirect
-FedizProcessor processor =
-
FedizProcessorFactory.newFedizProcessor(fedConfig.getProtocol());
+if (isSignInRequired(fedConfig, params)) {
+// Unauthenticated - redirect
+FedizProcessor processor =
+
FedizProcessorFactory.newFedizProcessor(fedConfig.getProtocol());
-HttpServletRequest request =
messageContext.getHttpServletRequest();
+HttpServletRequest request =
messageContext.getHttpServletRequest();
+try {
RedirectionResponse redirectionResponse =
processor.createSignInRequest(request, fedConfig);
String redirectURL =
redirectionResponse.getRedirectionURL();
@@ -127,12 +124,12 @@ public class FedizRedirectBindingFilter extends
AbstractServiceProviderFilter {
response.header(headerName,
headers.get(headerName));
}
}
-
+
// Save the RequestState
RequestState requestState =
redirectionResponse.getRequestState();
if (requestState != null requestState.getState() !=
null) {
getStateManager().setRequestState(requestState.getState(), requestState);
-
+
String contextCookie =
CookieUtils.createCookie(SECURITY_CONTEXT_STATE,
requestState.getState(),
@@ -141,92 +138,92 @@ public class FedizRedirectBindingFilter extends
AbstractServiceProviderFilter {
getStateTimeToLive());
response.header(Set-Cookie, contextCookie);
}
-
+
context.abortWith(response.build());
} else {
LOG.warn(Failed to create SignInRequest.);
throw
ExceptionUtils.toInternalServerErrorException(null, null);
}
-} else if (isSignInRequest(fedConfig, params)) {
-
cxf-fediz git commit: NPE fix
Repository: cxf-fediz
Updated Branches:
refs/heads/master dd161ea29 - b409d4755
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b409d475
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b409d475
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b409d475
Branch: refs/heads/master
Commit: b409d475590b165537aea8cd3762e0442c9483ba
Parents: dd161ea
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Mar 10 16:16:45 2015 +
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Tue Mar 10 16:16:45 2015 +
--
.../idp/beans/SigninParametersCacheAction.java | 35 +++-
1 file changed, 20 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b409d475/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
--
diff --git
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
index b1525df..93fab36 100644
---
a/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
+++
b/services/idp/src/main/java/org/apache/cxf/fediz/service/idp/beans/SigninParametersCacheAction.java
@@ -76,22 +76,27 @@ public class SigninParametersCacheAction {
MapString, Object signinParams =
(MapString,
Object)WebUtils.getAttributeFromExternalContext(context, uuidKey);
-String value =
(String)signinParams.get(FederationConstants.PARAM_REPLY);
-if (value != null) {
-WebUtils.putAttributeInFlowScope(context,
FederationConstants.PARAM_REPLY, value);
-}
-value = (String)signinParams.get(FederationConstants.PARAM_TREALM);
-if (value != null) {
-WebUtils.putAttributeInFlowScope(context,
FederationConstants.PARAM_TREALM, value);
-}
-value = (String)signinParams.get(FederationConstants.PARAM_HOME_REALM);
-if (value != null) {
-WebUtils.putAttributeInFlowScope(context,
FederationConstants.PARAM_HOME_REALM, value);
+if (signinParams != null) {
+String value =
(String)signinParams.get(FederationConstants.PARAM_REPLY);
+if (value != null) {
+WebUtils.putAttributeInFlowScope(context,
FederationConstants.PARAM_REPLY, value);
+}
+value = (String)signinParams.get(FederationConstants.PARAM_TREALM);
+if (value != null) {
+WebUtils.putAttributeInFlowScope(context,
FederationConstants.PARAM_TREALM, value);
+}
+value =
(String)signinParams.get(FederationConstants.PARAM_HOME_REALM);
+if (value != null) {
+WebUtils.putAttributeInFlowScope(context,
FederationConstants.PARAM_HOME_REALM, value);
+}
+
+LOG.debug(SignIn parameters restored: {},
signinParams.toString());
+WebUtils.removeAttributeFromFlowScope(context,
FederationConstants.PARAM_CONTEXT);
+LOG.info(SignIn parameters restored and +
FederationConstants.PARAM_CONTEXT + [
++ uuidKey + ] cleared.);
+} else {
+LOG.debug(Error in restoring security context);
}
-
-LOG.debug(SignIn parameters restored: {}, signinParams.toString());
-WebUtils.removeAttributeFromFlowScope(context,
FederationConstants.PARAM_CONTEXT);
-LOG.info(SignIn parameters restored and +
FederationConstants.PARAM_CONTEXT + [ + uuidKey + ] cleared.);
}
public void storeRPUrlInSession(RequestContext context) throws
ProcessingException {
