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/03/11 13:33:43 UTC
svn commit: r1455116 - in /webservices/wss4j/trunk:
policy/src/main/java/org/apache/wss4j/policy/
policy/src/main/java/org/apache/wss4j/policy/builders/
policy/src/main/java/org/apache/wss4j/policy/model/
ws-security-policy-stax/src/test/java/org/apach...
Author: coheigea
Date: Mon Mar 11 12:33:43 2013
New Revision: 1455116
URL: http://svn.apache.org/r1455116
Log:
Added support for Initiator/Recipient Signature/Encryption tokens in the model for WS-SP 1.1
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java?rev=1455116&r1=1455115&r2=1455116&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java Mon Mar 11 12:33:43 2013
@@ -656,12 +656,12 @@ public class SP11Constants extends SPCon
@Override
public QName getInitiatorSignatureToken() {
- return EMPTY_QNAME;
+ return INITIATOR_SIGNATURE_TOKEN;
}
@Override
public QName getInitiatorEncryptionToken() {
- return EMPTY_QNAME;
+ return INITIATOR_ENCRYPTION_TOKEN;
}
@Override
@@ -671,12 +671,12 @@ public class SP11Constants extends SPCon
@Override
public QName getRecipientSignatureToken() {
- return EMPTY_QNAME;
+ return RECIPIENT_SIGNATURE_TOKEN;
}
@Override
public QName getRecipientEncryptionToken() {
- return EMPTY_QNAME;
+ return RECIPIENT_ENCRYPTION_TOKEN;
}
public enum SupportingTokenTypes implements SupportingTokenType {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java?rev=1455116&r1=1455115&r2=1455116&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java Mon Mar 11 12:33:43 2013
@@ -22,6 +22,7 @@ import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.builders.AssertionBuilder;
+import org.apache.wss4j.policy.SP11Constants;
import org.apache.wss4j.policy.SP13Constants;
import org.apache.wss4j.policy.SPConstants;
import org.apache.wss4j.policy.SPUtils;
@@ -53,6 +54,6 @@ public class InitiatorEncryptionTokenBui
@Override
public QName[] getKnownElements() {
- return new QName[]{SP13Constants.INITIATOR_ENCRYPTION_TOKEN};
+ return new QName[]{SP13Constants.INITIATOR_ENCRYPTION_TOKEN, SP11Constants.INITIATOR_ENCRYPTION_TOKEN};
}
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java?rev=1455116&r1=1455115&r2=1455116&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java Mon Mar 11 12:33:43 2013
@@ -22,6 +22,7 @@ import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.builders.AssertionBuilder;
+import org.apache.wss4j.policy.SP11Constants;
import org.apache.wss4j.policy.SP13Constants;
import org.apache.wss4j.policy.SPConstants;
import org.apache.wss4j.policy.SPUtils;
@@ -53,6 +54,6 @@ public class InitiatorSignatureTokenBuil
@Override
public QName[] getKnownElements() {
- return new QName[]{SP13Constants.INITIATOR_SIGNATURE_TOKEN};
+ return new QName[]{SP13Constants.INITIATOR_SIGNATURE_TOKEN, SP11Constants.INITIATOR_SIGNATURE_TOKEN};
}
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java?rev=1455116&r1=1455115&r2=1455116&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java Mon Mar 11 12:33:43 2013
@@ -22,6 +22,7 @@ import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.builders.AssertionBuilder;
+import org.apache.wss4j.policy.SP11Constants;
import org.apache.wss4j.policy.SP13Constants;
import org.apache.wss4j.policy.SPConstants;
import org.apache.wss4j.policy.SPUtils;
@@ -53,7 +54,7 @@ public class RecipientEncryptionTokenBui
@Override
public QName[] getKnownElements() {
- return new QName[]{SP13Constants.RECIPIENT_ENCRYPTION_TOKEN};
+ return new QName[]{SP13Constants.RECIPIENT_ENCRYPTION_TOKEN, SP11Constants.RECIPIENT_ENCRYPTION_TOKEN};
}
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java?rev=1455116&r1=1455115&r2=1455116&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java Mon Mar 11 12:33:43 2013
@@ -22,6 +22,7 @@ import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.builders.AssertionBuilder;
+import org.apache.wss4j.policy.SP11Constants;
import org.apache.wss4j.policy.SP13Constants;
import org.apache.wss4j.policy.SPConstants;
import org.apache.wss4j.policy.SPUtils;
@@ -53,7 +54,7 @@ public class RecipientSignatureTokenBuil
@Override
public QName[] getKnownElements() {
- return new QName[]{SP13Constants.RECIPIENT_SIGNATURE_TOKEN};
+ return new QName[]{SP13Constants.RECIPIENT_SIGNATURE_TOKEN, SP11Constants.RECIPIENT_SIGNATURE_TOKEN};
}
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java?rev=1455116&r1=1455115&r2=1455116&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java Mon Mar 11 12:33:43 2013
@@ -39,6 +39,7 @@ public class AlgorithmSuite extends Abst
static {
algorithmSuiteTypes.put("Basic256", new AlgorithmSuiteType(
+ "Basic256",
SPConstants.SHA1,
SPConstants.AES256,
SPConstants.KW_AES256,
@@ -47,6 +48,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
256, 192, 256, 256, 1024, 4096));
algorithmSuiteTypes.put("Basic192", new AlgorithmSuiteType(
+ "Basic192",
SPConstants.SHA1,
SPConstants.AES192,
SPConstants.KW_AES192,
@@ -55,6 +57,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192, 192, 1024, 4096));
algorithmSuiteTypes.put("Basic128", new AlgorithmSuiteType(
+ "Basic128",
SPConstants.SHA1,
SPConstants.AES128,
SPConstants.KW_AES128,
@@ -63,6 +66,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L128,
128, 128, 128, 128, 1024, 4096));
algorithmSuiteTypes.put("TripleDes", new AlgorithmSuiteType(
+ "TripleDes",
SPConstants.SHA1,
SPConstants.TRIPLE_DES,
SPConstants.KW_TRIPLE_DES,
@@ -71,6 +75,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192, 192, 1024, 4096));
algorithmSuiteTypes.put("Basic256Rsa15", new AlgorithmSuiteType(
+ "Basic256Rsa15",
SPConstants.SHA1,
SPConstants.AES256,
SPConstants.KW_AES256,
@@ -79,6 +84,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
256, 192, 256, 256, 1024, 4096));
algorithmSuiteTypes.put("Basic192Rsa15", new AlgorithmSuiteType(
+ "Basic192Rsa15",
SPConstants.SHA1,
SPConstants.AES192,
SPConstants.KW_AES192,
@@ -87,6 +93,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192, 192, 1024, 4096));
algorithmSuiteTypes.put("Basic128Rsa15", new AlgorithmSuiteType(
+ "Basic128Rsa15",
SPConstants.SHA1,
SPConstants.AES128,
SPConstants.KW_AES128,
@@ -95,6 +102,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L128,
128, 128, 128, 128, 1024, 4096));
algorithmSuiteTypes.put("TripleDesRsa15", new AlgorithmSuiteType(
+ "TripleDesRsa15",
SPConstants.SHA1,
SPConstants.TRIPLE_DES,
SPConstants.KW_TRIPLE_DES,
@@ -103,6 +111,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192, 192, 1024, 4096));
algorithmSuiteTypes.put("Basic256Sha256", new AlgorithmSuiteType(
+ "Basic256Sha256",
SPConstants.SHA256,
SPConstants.AES256,
SPConstants.KW_AES256,
@@ -111,6 +120,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
256, 256, 256, 256, 1024, 4096));
algorithmSuiteTypes.put("Basic192Sha256", new AlgorithmSuiteType(
+ "Basic192Sha256",
SPConstants.SHA256,
SPConstants.AES192,
SPConstants.KW_AES192,
@@ -119,6 +129,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192, 192, 1024, 4096));
algorithmSuiteTypes.put("Basic128Sha256", new AlgorithmSuiteType(
+ "Basic128Sha256",
SPConstants.SHA256,
SPConstants.AES128,
SPConstants.KW_AES128,
@@ -127,6 +138,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L128,
128, 128, 128, 128, 1024, 4096));
algorithmSuiteTypes.put("TripleDesSha256", new AlgorithmSuiteType(
+ "TripleDesSha256",
SPConstants.SHA256,
SPConstants.TRIPLE_DES,
SPConstants.KW_TRIPLE_DES,
@@ -135,6 +147,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192, 192, 1024, 4096));
algorithmSuiteTypes.put("Basic256Sha256Rsa15", new AlgorithmSuiteType(
+ "Basic256Sha256Rsa15",
SPConstants.SHA256,
SPConstants.AES256,
SPConstants.KW_AES256,
@@ -143,6 +156,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
256, 192, 256, 256, 1024, 4096));
algorithmSuiteTypes.put("Basic192Sha256Rsa15", new AlgorithmSuiteType(
+ "Basic192Sha256Rsa15",
SPConstants.SHA256,
SPConstants.AES192,
SPConstants.KW_AES192,
@@ -151,6 +165,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192, 192, 1024, 4096));
algorithmSuiteTypes.put("Basic128Sha256Rsa15", new AlgorithmSuiteType(
+ "Basic128Sha256Rsa15",
SPConstants.SHA256,
SPConstants.AES128,
SPConstants.KW_AES128,
@@ -159,6 +174,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L128,
128, 128, 128, 192, 1024, 4096));
algorithmSuiteTypes.put("TripleDesSha256Rsa15", new AlgorithmSuiteType(
+ "TripleDesSha256Rsa15",
SPConstants.SHA256,
SPConstants.TRIPLE_DES,
SPConstants.KW_TRIPLE_DES,
@@ -170,6 +186,7 @@ public class AlgorithmSuite extends Abst
public static final class AlgorithmSuiteType {
+ private String name;
private String digest;
private String encryption;
private String symmetricKeyWrap;
@@ -183,10 +200,11 @@ public class AlgorithmSuite extends Abst
private int minimumAsymmetricKeyLength;
private int maximumAsymmetricKeyLength;
- public AlgorithmSuiteType(String digest, String encryption, String symmetricKeyWrap, String asymmetricKeyWrap,
+ public AlgorithmSuiteType(String name, String digest, String encryption, String symmetricKeyWrap, String asymmetricKeyWrap,
String encryptionKeyDerivation, String signatureKeyDerivation, int encryptionDerivedKeyLength,
int signatureDerivedKeyLength, int minimumSymmetricKeyLength,
int maximumSymmetricKeyLength, int minimumAsymmetricKeyLength, int maximumAsymmetricKeyLength) {
+ this.name = name;
this.digest = digest;
this.encryption = encryption;
this.symmetricKeyWrap = symmetricKeyWrap;
@@ -200,6 +218,10 @@ public class AlgorithmSuite extends Abst
this.minimumAsymmetricKeyLength = minimumAsymmetricKeyLength;
this.maximumAsymmetricKeyLength = maximumAsymmetricKeyLength;
}
+
+ public String getName() {
+ return name;
+ }
public String getDigest() {
return digest;
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java?rev=1455116&r1=1455115&r2=1455116&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AlgorithmSuiteTest.java Mon Mar 11 12:33:43 2013
@@ -219,6 +219,7 @@ public class AlgorithmSuiteTest extends
if ("Basic128GCM".equals(assertionName)) {
setAlgorithmSuiteType(new AlgorithmSuiteType(
+ "Basic128GCM",
SPConstants.SHA1,
WSSConstants.NS_XENC11_AES128_GCM,
SPConstants.KW_AES128,
@@ -228,7 +229,9 @@ public class AlgorithmSuiteTest extends
128, 128, 128, 256, 1024, 4096
));
} else if ("Basic192GCM".equals(assertionName)) {
- setAlgorithmSuiteType(new AlgorithmSuiteType(SPConstants.SHA1,
+ setAlgorithmSuiteType(new AlgorithmSuiteType(
+ "Basic192GCM",
+ SPConstants.SHA1,
WSSConstants.NS_XENC11_AES192_GCM,
SPConstants.KW_AES192,
SPConstants.KW_RSA_OAEP,
@@ -237,6 +240,7 @@ public class AlgorithmSuiteTest extends
192, 192, 192, 256, 1024, 4096));
} else if ("Basic256GCM".equals(assertionName)) {
setAlgorithmSuiteType(new AlgorithmSuiteType(
+ "Basic256GCM",
SPConstants.SHA1,
WSSConstants.NS_XENC11_AES256_GCM,
SPConstants.KW_AES256,