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 2015/08/04 13:16:32 UTC
[1/3] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes e0157c468 -> 0479e4610
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/03e18fa6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/03e18fa6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/03e18fa6
Branch: refs/heads/3.0.x-fixes
Commit: 03e18fa6b0348f51c513e1301db104ce89844d94
Parents: 755a1a5
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Aug 4 12:01:43 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Aug 4 12:01:43 2015 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/03e18fa6/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 486380d..4e7b4b0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -500,6 +500,7 @@ M 4e79ef514e14ab325d13362076b8c63d5493ced8
M 4e9b960f4eab531e6086fbe9f3373bf69efca7cd
M 4f7948dd0a6df1e9494fde9c1dc931e0c8b24ebe
M 5031f5fbb1b265257e2b7f9d6edea0e00f147300
+M 5048d0b5a92cceb98fc46424d758b40107b47345
M 50b4ccf167d73fc547a0567f49cdffe41e68cb9a
M 50f5cd8c3b7c6d174f59ee111646f2625b890a00
M 51db79ca7bd2c703a4dbbd42d7761c97af3bad84
[2/3] cxf git commit: Some refactoring due to WSS-549
Posted by co...@apache.org.
Some refactoring due to WSS-549
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/755a1a5c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/755a1a5c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/755a1a5c
Branch: refs/heads/3.0.x-fixes
Commit: 755a1a5cac5ebc32d1cdd5df795aff6e9b9de6c5
Parents: e0157c4
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Aug 4 12:00:46 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Aug 4 12:01:43 2015 +0100
----------------------------------------------------------------------
.../AsymmetricBindingHandler.java | 59 ++++++++++++++++++--
.../policyhandlers/SymmetricBindingHandler.java | 11 +++-
2 files changed, 63 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/755a1a5c/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 3a5edea..7fa6873 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
@@ -416,7 +416,9 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
try {
Element secondRefList =
((WSSecDKEncrypt)encrBase).encryptForExternalRef(null, secondEncrParts);
- ((WSSecDKEncrypt)encrBase).addExternalRefElement(secondRefList, secHeader);
+ if (secondRefList != null) {
+ ((WSSecDKEncrypt)encrBase).addExternalRefElement(secondRefList, secHeader);
+ }
} catch (WSSecurityException ex) {
LOG.log(Level.FINE, ex.getMessage(), ex);
@@ -452,6 +454,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
assertPolicy(encrToken);
AlgorithmSuite algorithmSuite = abinding.getAlgorithmSuite();
if (encrToken.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) {
+<<<<<<< HEAD
try {
WSSecDKEncrypt dkEncr = new WSSecDKEncrypt(wssConfig);
dkEncr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message));
@@ -481,6 +484,9 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
LOG.log(Level.FINE, e.getMessage(), e);
policyNotAsserted(recToken, e);
}
+=======
+ return doEncryptionDerived(recToken, encrToken, encrParts, algorithmSuite);
+>>>>>>> 5048d0b... Some refactoring due to WSS-549
} else {
try {
WSSecEncrypt encr = new WSSecEncrypt(wssConfig);
@@ -535,7 +541,9 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
//Encrypt, get hold of the ref list and add it
if (externalRef) {
Element refList = encr.encryptForRef(null, encrParts);
- insertBeforeBottomUp(refList);
+ if (refList != null) {
+ insertBeforeBottomUp(refList);
+ }
if (attachments != null) {
for (Element attachment : attachments) {
this.insertBeforeBottomUp(attachment);
@@ -547,7 +555,9 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
this.addEncryptedKeyElement(encryptedKeyElement);
// Add internal refs
- encryptedKeyElement.appendChild(refList);
+ if (refList != null) {
+ encryptedKeyElement.appendChild(refList);
+ }
if (attachments != null) {
for (Element attachment : attachments) {
this.addEncryptedKeyElement(attachment);
@@ -568,7 +578,48 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
}
}
return null;
- }
+ }
+
+ private WSSecBase doEncryptionDerived(AbstractTokenWrapper recToken,
+ AbstractToken encrToken,
+ List<WSEncryptionPart> encrParts,
+ AlgorithmSuite algorithmSuite) {
+ try {
+ WSSecDKEncrypt dkEncr = new WSSecDKEncrypt();
+ dkEncr.setIdAllocator(wssConfig.getIdAllocator());
+ dkEncr.setCallbackLookup(callbackLookup);
+ dkEncr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message));
+ dkEncr.setStoreBytesInAttachment(storeBytesInAttachment);
+ if (recToken.getToken().getVersion() == SPConstants.SPVersion.SP11) {
+ dkEncr.setWscVersion(ConversationConstants.VERSION_05_02);
+ }
+
+ if (encrKey == null) {
+ setupEncryptedKey(recToken, encrToken);
+ }
+
+ dkEncr.setExternalKey(this.encryptedKeyValue, this.encryptedKeyId);
+ dkEncr.getParts().addAll(encrParts);
+ dkEncr.setCustomValueType(WSConstants.SOAPMESSAGE_NS11 + "#"
+ + WSConstants.ENC_KEY_VALUE_TYPE);
+ AlgorithmSuiteType algType = algorithmSuite.getAlgorithmSuiteType();
+ dkEncr.setSymmetricEncAlgorithm(algType.getEncryption());
+ dkEncr.setDerivedKeyLength(algType.getEncryptionDerivedKeyLength() / 8);
+ dkEncr.prepare(saaj.getSOAPPart());
+
+ addDerivedKeyElement(dkEncr.getdktElement());
+ Element refList = dkEncr.encryptForExternalRef(null, encrParts);
+ if (refList != null) {
+ insertBeforeBottomUp(refList);
+ }
+ return dkEncr;
+ } catch (Exception e) {
+ LOG.log(Level.FINE, e.getMessage(), e);
+ unassertPolicy(recToken, e);
+ }
+
+ return null;
+ }
private void assertUnusedTokens(AbstractTokenWrapper wrapper) {
if (wrapper == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/755a1a5c/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 451e2d2..9437a59 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
@@ -248,10 +248,11 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
&& !secondEncrParts.isEmpty()) {
secondRefList = ((WSSecDKEncrypt)encr).encryptForExternalRef(null,
secondEncrParts);
- this.addDerivedKeyElement(secondRefList);
} else if (!secondEncrParts.isEmpty()) {
//Encrypt, get hold of the ref list and add it
secondRefList = ((WSSecEncrypt)encr).encryptForRef(null, secondEncrParts);
+ }
+ if (secondRefList != null) {
this.addDerivedKeyElement(secondRefList);
}
}
@@ -605,14 +606,18 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder {
private void addAttachmentsForEncryption(boolean atEnd, Element refList, List<Element> attachments) {
if (atEnd) {
- this.insertBeforeBottomUp(refList);
+ if (refList != null) {
+ this.insertBeforeBottomUp(refList);
+ }
if (attachments != null) {
for (Element attachment : attachments) {
this.insertBeforeBottomUp(attachment);
}
}
} else {
- this.addDerivedKeyElement(refList);
+ if (refList != null) {
+ this.addDerivedKeyElement(refList);
+ }
if (attachments != null) {
for (Element attachment : attachments) {
this.addDerivedKeyElement(attachment);
[3/3] cxf git commit: Fixing backmerge
Posted by co...@apache.org.
Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0479e461
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0479e461
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0479e461
Branch: refs/heads/3.0.x-fixes
Commit: 0479e4610d38cf7561ab594bbb6c61049df3dab2
Parents: 03e18fa
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Aug 4 12:08:01 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Aug 4 12:08:01 2015 +0100
----------------------------------------------------------------------
.../AsymmetricBindingHandler.java | 48 +++-----------------
1 file changed, 7 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0479e461/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 7fa6873..c94c913 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
@@ -454,39 +454,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
assertPolicy(encrToken);
AlgorithmSuite algorithmSuite = abinding.getAlgorithmSuite();
if (encrToken.getDerivedKeys() == DerivedKeys.RequireDerivedKeys) {
-<<<<<<< HEAD
- try {
- WSSecDKEncrypt dkEncr = new WSSecDKEncrypt(wssConfig);
- dkEncr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message));
- dkEncr.setStoreBytesInAttachment(storeBytesInAttachment);
- if (recToken.getToken().getVersion() == SPConstants.SPVersion.SP11) {
- dkEncr.setWscVersion(ConversationConstants.VERSION_05_02);
- }
-
- if (encrKey == null) {
- setupEncryptedKey(recToken, encrToken);
- }
-
- dkEncr.setExternalKey(this.encryptedKeyValue, this.encryptedKeyId);
- dkEncr.setParts(encrParts);
- dkEncr.setCustomValueType(WSConstants.SOAPMESSAGE_NS11 + "#"
- + WSConstants.ENC_KEY_VALUE_TYPE);
- AlgorithmSuiteType algType = algorithmSuite.getAlgorithmSuiteType();
- dkEncr.setSymmetricEncAlgorithm(algType.getEncryption());
- dkEncr.setDerivedKeyLength(algType.getEncryptionDerivedKeyLength() / 8);
- dkEncr.prepare(saaj.getSOAPPart());
-
- addDerivedKeyElement(dkEncr.getdktElement());
- Element refList = dkEncr.encryptForExternalRef(null, encrParts);
- insertBeforeBottomUp(refList);
- return dkEncr;
- } catch (Exception e) {
- LOG.log(Level.FINE, e.getMessage(), e);
- policyNotAsserted(recToken, e);
- }
-=======
return doEncryptionDerived(recToken, encrToken, encrParts, algorithmSuite);
->>>>>>> 5048d0b... Some refactoring due to WSS-549
} else {
try {
WSSecEncrypt encr = new WSSecEncrypt(wssConfig);
@@ -585,28 +553,26 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
List<WSEncryptionPart> encrParts,
AlgorithmSuite algorithmSuite) {
try {
- WSSecDKEncrypt dkEncr = new WSSecDKEncrypt();
- dkEncr.setIdAllocator(wssConfig.getIdAllocator());
- dkEncr.setCallbackLookup(callbackLookup);
+ WSSecDKEncrypt dkEncr = new WSSecDKEncrypt(wssConfig);
dkEncr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message));
dkEncr.setStoreBytesInAttachment(storeBytesInAttachment);
if (recToken.getToken().getVersion() == SPConstants.SPVersion.SP11) {
dkEncr.setWscVersion(ConversationConstants.VERSION_05_02);
}
-
+
if (encrKey == null) {
setupEncryptedKey(recToken, encrToken);
}
-
+
dkEncr.setExternalKey(this.encryptedKeyValue, this.encryptedKeyId);
- dkEncr.getParts().addAll(encrParts);
+ dkEncr.setParts(encrParts);
dkEncr.setCustomValueType(WSConstants.SOAPMESSAGE_NS11 + "#"
- + WSConstants.ENC_KEY_VALUE_TYPE);
+ + WSConstants.ENC_KEY_VALUE_TYPE);
AlgorithmSuiteType algType = algorithmSuite.getAlgorithmSuiteType();
dkEncr.setSymmetricEncAlgorithm(algType.getEncryption());
dkEncr.setDerivedKeyLength(algType.getEncryptionDerivedKeyLength() / 8);
dkEncr.prepare(saaj.getSOAPPart());
-
+
addDerivedKeyElement(dkEncr.getdktElement());
Element refList = dkEncr.encryptForExternalRef(null, encrParts);
if (refList != null) {
@@ -615,7 +581,7 @@ public class AsymmetricBindingHandler extends AbstractBindingBuilder {
return dkEncr;
} catch (Exception e) {
LOG.log(Level.FINE, e.getMessage(), e);
- unassertPolicy(recToken, e);
+ policyNotAsserted(recToken, e);
}
return null;