You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/10/11 15:09:14 UTC
svn commit: r1531286 - in
/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax:
WSSec.java impl/processor/output/EncryptOutputProcessor.java
impl/processor/output/WSSSignatureEndingOutputProcessor.java
Author: coheigea
Date: Fri Oct 11 13:09:14 2013
New Revision: 1531286
URL: http://svn.apache.org/r1531286
Log:
More bug fixes
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java?rev=1531286&r1=1531285&r2=1531286&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/WSSec.java Fri Oct 11 13:09:14 2013
@@ -234,12 +234,16 @@ public class WSSec {
}
if (securityProperties.getEncryptionUseThisCertificate() == null
&& securityProperties.getEncryptionKeyStore() == null
- && !securityProperties.isUseReqSigCertForEncryption()) {
+ && securityProperties.getEncryptionCryptoProperties() == null
+ && !securityProperties.isUseReqSigCertForEncryption()
+ && securityProperties.isEncryptSymmetricEncrytionKey()
+ && securityProperties.getEncryptionCrypto() == null) {
throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE, "encryptionKeyStoreNotSet");
}
if (securityProperties.getEncryptionUser() == null
&& securityProperties.getEncryptionUseThisCertificate() == null
- && !securityProperties.isUseReqSigCertForEncryption()) {
+ && !securityProperties.isUseReqSigCertForEncryption()
+ && securityProperties.isEncryptSymmetricEncrytionKey()) {
throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE, "noEncryptionUser");
}
if (securityProperties.getEncryptionSymAlgorithm() == null) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java?rev=1531286&r1=1531285&r2=1531286&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java Fri Oct 11 13:09:14 2013
@@ -273,6 +273,15 @@ public class EncryptOutputProcessor exte
} else {
attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_WSC_05_02 + "/dk"));
}
+ } else if (WSSecurityTokenConstants.SpnegoContextToken.equals(tokenType)
+ || WSSecurityTokenConstants.SecurityContextToken.equals(tokenType)
+ || WSSecurityTokenConstants.SecureConversationToken.equals(tokenType)) {
+ boolean use200512Namespace = ((WSSSecurityProperties)getSecurityProperties()).isUse200512Namespace();
+ if (use200512Namespace) {
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_WSC_05_12 + "/sct"));
+ } else {
+ attributes.add(createAttribute(WSSConstants.ATT_NULL_ValueType, WSSConstants.NS_WSC_05_12 + "/sct"));
+ }
}
createStartElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_Reference, false, attributes);
createEndElementAndOutputAsEvent(outputProcessorChain, WSSConstants.TAG_wsse_Reference);
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java?rev=1531286&r1=1531285&r2=1531286&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java Fri Oct 11 13:09:14 2013
@@ -154,6 +154,15 @@ public class WSSSignatureEndingOutputPro
} else {
valueType = WSSConstants.NS_WSC_05_02 + "/dk";
}
+ } else if (WSSecurityTokenConstants.SpnegoContextToken.equals(securityToken.getTokenType())
+ || WSSecurityTokenConstants.SecurityContextToken.equals(securityToken.getTokenType())
+ || WSSecurityTokenConstants.SecureConversationToken.equals(securityToken.getTokenType())) {
+ boolean use200512Namespace = ((WSSSecurityProperties)getSecurityProperties()).isUse200512Namespace();
+ if (use200512Namespace) {
+ valueType = WSSConstants.NS_WSC_05_12 + "/sct";
+ } else {
+ valueType = WSSConstants.NS_WSC_05_02 + "/sct";
+ }
} else {
if (useSingleCertificate) {
valueType = WSSConstants.NS_X509_V3_TYPE;