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 2016/04/27 17:43:32 UTC
[1/3] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 82591273f -> 122784a76
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/ae36b966
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ae36b966
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ae36b966
Branch: refs/heads/3.0.x-fixes
Commit: ae36b9661effcc4d5e4ae271b5c022abdd43a830
Parents: 0da2a5e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Apr 26 22:32:38 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Apr 26 22:32:38 2016 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae36b966/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d8538b6..a0a6705 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -972,6 +972,7 @@ M 3a1b80659af65063b8c8aa5bbc79cd2a888c8685
M 3a8a24326d690c8e0b58631b9428e3b460918ab5
M 3ad862c9dea70ed20a9950d2883de0a8c2510fdd
M 3af7c785c642db6ae64276f92fb05450d7f9aba3
+M 3b45e6080b782eb59395e9093627d4c687fb1151
M 3d3d495a2c58164abfb54b64208b3f72b4d235dd
M 3e648504409d9fbe56a92b62a7b0f581211ef7f2
M 409188bcc94490f9cd60d6871f853b34e031f300
[2/3] cxf git commit: [CXF-6884] - Don't include
Signature/EncryptedKey Elements if there are no references to be
signed/encrypted
Posted by co...@apache.org.
[CXF-6884] - Don't include Signature/EncryptedKey Elements if there are no references to be signed/encrypted
# Conflicts:
# rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0da2a5ef
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0da2a5ef
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0da2a5ef
Branch: refs/heads/3.0.x-fixes
Commit: 0da2a5ef359fcbb2b732dd544cbb2fae7871fec9
Parents: 8259127
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Apr 26 17:32:35 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Apr 26 22:32:38 2016 +0100
----------------------------------------------------------------------
.../AsymmetricBindingHandler.java | 69 +++++++++++---------
.../policyhandlers/SymmetricBindingHandler.java | 54 ++++++++-------
2 files changed, 67 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0da2a5ef/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 c7576c6..199623f 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
@@ -502,10 +502,14 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
this.insertBeforeBottomUp(attachment);
}
}
- this.addEncryptedKeyElement(encryptedKeyElement);
+ if (refList != null || (attachments != null && !attachments.isEmpty())) {
+ this.addEncryptedKeyElement(encryptedKeyElement);
+ }
} else {
Element refList = encr.encryptForRef(null, encrParts);
- this.addEncryptedKeyElement(encryptedKeyElement);
+ if (refList != null || (attachments != null && !attachments.isEmpty())) {
+ this.addEncryptedKeyElement(encryptedKeyElement);
+ }
// Add internal refs
if (refList != null) {
@@ -660,20 +664,21 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
dkSign.setParts(sigParts);
List<Reference> referenceList = dkSign.addReferencesToSign(sigParts, secHeader);
-
- // Add elements to header
- addDerivedKeyElement(dkSign.getdktElement());
-
- //Do signature
- if (bottomUpElement == null) {
- dkSign.computeSignature(referenceList, false, null);
- } else {
- dkSign.computeSignature(referenceList, true, bottomUpElement);
+ if (!referenceList.isEmpty()) {
+ // Add elements to header
+ addDerivedKeyElement(dkSign.getdktElement());
+
+ //Do signature
+ if (bottomUpElement == null) {
+ dkSign.computeSignature(referenceList, false, null);
+ } else {
+ dkSign.computeSignature(referenceList, true, bottomUpElement);
+ }
+ bottomUpElement = dkSign.getSignatureElement();
+ signatures.add(dkSign.getSignatureValue());
+
+ mainSigId = dkSign.getSignatureId();
}
- bottomUpElement = dkSign.getSignatureElement();
- signatures.add(dkSign.getSignatureValue());
-
- mainSigId = dkSign.getSignatureId();
} catch (Exception ex) {
LOG.log(Level.FINE, ex.getMessage(), ex);
throw new Fault(ex);
@@ -695,24 +700,26 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
}
List<Reference> referenceList = sig.addReferencesToSign(sigParts, secHeader);
- //Do signature
- if (bottomUpElement == null) {
- sig.computeSignature(referenceList, false, null);
- } else {
- sig.computeSignature(referenceList, true, bottomUpElement);
- }
- bottomUpElement = sig.getSignatureElement();
-
- if (!abinding.isProtectTokens()) {
- Element bstElement = sig.getBinarySecurityTokenElement();
- if (bstElement != null) {
- secHeader.getSecurityHeader().insertBefore(bstElement, bottomUpElement);
+ if (!referenceList.isEmpty()) {
+ //Do signature
+ if (bottomUpElement == null) {
+ sig.computeSignature(referenceList, false, null);
+ } else {
+ sig.computeSignature(referenceList, true, bottomUpElement);
+ }
+ bottomUpElement = sig.getSignatureElement();
+
+ if (!abinding.isProtectTokens()) {
+ Element bstElement = sig.getBinarySecurityTokenElement();
+ if (bstElement != null) {
+ secHeader.getSecurityHeader().insertBefore(bstElement, bottomUpElement);
+ }
}
+
+ signatures.add(sig.getSignatureValue());
+
+ mainSigId = sig.getId();
}
-
- signatures.add(sig.getSignatureValue());
-
- mainSigId = sig.getId();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/0da2a5ef/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
index 69ac52f..0ae599b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
@@ -732,22 +732,24 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
dkSign.setParts(sigs);
List<Reference> referenceList = dkSign.addReferencesToSign(sigs, secHeader);
-
- //Add elements to header
- Element el = dkSign.getdktElement();
- addDerivedKeyElement(el);
-
- //Do signature
- if (bottomUpElement == null) {
- dkSign.computeSignature(referenceList, false, null);
- } else {
- dkSign.computeSignature(referenceList, true, bottomUpElement);
+ if (!referenceList.isEmpty()) {
+ //Add elements to header
+ Element el = dkSign.getdktElement();
+ addDerivedKeyElement(el);
+
+ //Do signature
+ if (bottomUpElement == null) {
+ dkSign.computeSignature(referenceList, false, null);
+ } else {
+ dkSign.computeSignature(referenceList, true, bottomUpElement);
+ }
+ bottomUpElement = dkSign.getSignatureElement();
+
+ this.mainSigId = dkSign.getSignatureId();
+
+ return dkSign.getSignatureValue();
}
- bottomUpElement = dkSign.getSignatureElement();
-
- this.mainSigId = dkSign.getSignatureId();
-
- return dkSign.getSignatureValue();
+ return null;
}
private byte[] doSignature(List<WSEncryptionPart> sigs,
@@ -857,17 +859,19 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
sig.prepare(saaj.getSOAPPart(), crypto, secHeader);
sig.setParts(sigs);
List<Reference> referenceList = sig.addReferencesToSign(sigs, secHeader);
-
- //Do signature
- if (bottomUpElement == null) {
- sig.computeSignature(referenceList, false, null);
- } else {
- sig.computeSignature(referenceList, true, bottomUpElement);
+ if (!referenceList.isEmpty()) {
+ //Do signature
+ if (bottomUpElement == null) {
+ sig.computeSignature(referenceList, false, null);
+ } else {
+ sig.computeSignature(referenceList, true, bottomUpElement);
+ }
+ bottomUpElement = sig.getSignatureElement();
+
+ this.mainSigId = sig.getId();
+ return sig.getSignatureValue();
}
- bottomUpElement = sig.getSignatureElement();
-
- this.mainSigId = sig.getId();
- return sig.getSignatureValue();
+ return null;
}
}
[3/3] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
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/122784a7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/122784a7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/122784a7
Branch: refs/heads/3.0.x-fixes
Commit: 122784a7677ae9752e41ee7a730077df623106ca
Parents: ae36b96
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Apr 27 16:43:27 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Apr 27 16:43:27 2016 +0100
----------------------------------------------------------------------
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/122784a7/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a0a6705..6ac547f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -169,6 +169,7 @@ B 2fe88ec153b6193a8c80f7c1226db19600e0839a
B 3019c331c0f069ed63611b5263df3ee4d427e4a7
B 3051c2a54adc909be8d63c690b1444eb2f9e5e35
B 30853113b4c4d47200bcf5305e5e88735f32cc8f
+B 30ad57d5590257960030161c2bd20ab4131d9c7b
B 3134609dcd0443d4007a7829df57c148fff947b3
B 315e357e850407e9f3233259bab33ea765633271
B 321b2f8b66bf6b9d1fa68aba086c8cddf18070e3
@@ -637,6 +638,7 @@ B b4536602d376a36bcbd02d21d5ab42f19d4e5b22
B b4872363fda49f205001d4385ecbc35133c2c755
B b48c79cc187d16a81e45be8a24e56437a0df56e3
B b4a17ce9970cd124cec61eaed04061a529e2398f
+B b4a1e352028e992ce6ff8f71666467ea4f96d7f8
B b4bfa886ee80b681b09eb578c69a03a43ea964e2
B b54fe0dfdf3c3d76df1e07fb3686d5d8a1061d48
B b5fc90f09c6b039a54564e0825a264310453c550
@@ -668,6 +670,7 @@ B bc025f0fe4acf7191430230080318346272543e1
B bc5bbe8959a6767051b58a41b24a7d748b67fa84
B bc752dc5bd89b5d70d00435fc1185e72659d7e4d
B bc9e3714adc8848f37694eea62d33748b01fbb91
+B bca5ead51899b3aa4864d8b4a675c829096bcd3b
B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
B bd94b4c8778e360d538d5acb3f6a3710af92e6f1
B bdd359af4de505f7bbe50bf9990da5788e12fd71
@@ -676,6 +679,7 @@ B be4e40a46784d81c559b073b487255cf87334a77
B bea22d764138e365513856c23be760a7719530a0
B beb4af748ff260ccbe2ac29a0a251ebcbe77ab8c
B bec40a5178e4ce6a434830589d5e44f62961cabb
+B bec482729cf3c0938658cbe2ccb542e1a9ab034d
B bee2c0d849c4cffd396eaafbe710ddfb499c7a18
B bef3d8408feb07365e17ca6960db7b4b2f1436ec
B bf3d1faa9ea33419f0e1bac90cecc7bba112dd5c