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 2015/12/15 17:40:42 UTC
svn commit: r1720192 [8/33] - in /webservices/wss4j/trunk:
bindings/src/main/java/org/apache/wss4j/binding/wss10/
bindings/src/main/java/org/apache/wss4j/binding/wss11/
bindings/src/main/java/org/apache/wss4j/binding/wssc13/
bindings/src/main/java/org/...
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java?rev=1720192&r1=1720191&r2=1720192&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1ComponentBuilder.java Tue Dec 15 16:40:37 2015
@@ -75,51 +75,51 @@ import org.w3c.dom.Element;
* to construct SAML v1.1 statements using the OpenSaml library.
*/
public final class SAML1ComponentBuilder {
-
+
private static volatile SAMLObjectBuilder<Assertion> assertionV1Builder;
-
+
private static volatile SAMLObjectBuilder<Conditions> conditionsV1Builder;
-
+
private static volatile SAMLObjectBuilder<Advice> adviceV1Builder;
-
+
private static volatile SAMLObjectBuilder<AssertionIDReference> assertionIDReferenceBuilder;
-
+
private static volatile SAMLObjectBuilder<AudienceRestrictionCondition> audienceRestrictionV1Builder;
-
+
private static volatile SAMLObjectBuilder<Audience> audienceV1Builder;
-
+
private static volatile SAMLObjectBuilder<AuthenticationStatement> authenticationStatementV1Builder;
-
+
private static volatile SAMLObjectBuilder<Subject> subjectV1Builder;
-
+
private static volatile SAMLObjectBuilder<NameIdentifier> nameIdentifierV1Builder;
-
- private static volatile SAMLObjectBuilder<SubjectConfirmation>
+
+ private static volatile SAMLObjectBuilder<SubjectConfirmation>
subjectConfirmationV1Builder;
-
+
private static volatile SAMLObjectBuilder<ConfirmationMethod> confirmationMethodV1Builder;
-
- private static volatile SAMLObjectBuilder<AttributeStatement>
+
+ private static volatile SAMLObjectBuilder<AttributeStatement>
attributeStatementV1Builder;
-
+
private static volatile SAMLObjectBuilder<Attribute> attributeV1Builder;
-
+
private static volatile XSStringBuilder stringBuilder;
-
- private static volatile SAMLObjectBuilder<AuthorizationDecisionStatement>
+
+ private static volatile SAMLObjectBuilder<AuthorizationDecisionStatement>
authorizationDecisionStatementV1Builder;
-
+
private static volatile SAMLObjectBuilder<Action> actionElementV1Builder;
-
- private static volatile XMLObjectBuilderFactory builderFactory =
+
+ private static volatile XMLObjectBuilderFactory builderFactory =
XMLObjectProviderRegistrySupport.getBuilderFactory();
-
+
private static volatile SAMLObjectBuilder<SubjectLocality> subjectLocalityBuilder;
private SAML1ComponentBuilder() {
// Complete
}
-
+
/**
* Create a new SAML 1.1 assertion
*
@@ -129,7 +129,7 @@ public final class SAML1ComponentBuilder
@SuppressWarnings("unchecked")
public static Assertion createSamlv1Assertion(String issuer) {
if (assertionV1Builder == null) {
- assertionV1Builder = (SAMLObjectBuilder<Assertion>)
+ assertionV1Builder = (SAMLObjectBuilder<Assertion>)
builderFactory.getBuilder(Assertion.DEFAULT_ELEMENT_NAME);
if (assertionV1Builder == null) {
throw new IllegalStateException(
@@ -138,9 +138,9 @@ public final class SAML1ComponentBuilder
);
}
}
- Assertion assertion =
+ Assertion assertion =
assertionV1Builder.buildObject(
- Assertion.DEFAULT_ELEMENT_NAME,
+ Assertion.DEFAULT_ELEMENT_NAME,
Assertion.TYPE_NAME
);
assertion.setVersion(SAMLVersion.VERSION_11);
@@ -158,10 +158,10 @@ public final class SAML1ComponentBuilder
* @return A Saml 1.1 subject
*/
@SuppressWarnings("unchecked")
- public static Subject createSaml1v1Subject(SubjectBean subjectBean)
+ public static Subject createSaml1v1Subject(SubjectBean subjectBean)
throws org.opensaml.security.SecurityException, WSSecurityException {
if (subjectV1Builder == null) {
- subjectV1Builder = (SAMLObjectBuilder<Subject>)
+ subjectV1Builder = (SAMLObjectBuilder<Subject>)
builderFactory.getBuilder(Subject.DEFAULT_ELEMENT_NAME);
}
if (nameIdentifierV1Builder == null) {
@@ -171,27 +171,27 @@ public final class SAML1ComponentBuilder
if (subjectConfirmationV1Builder == null) {
subjectConfirmationV1Builder = (SAMLObjectBuilder<SubjectConfirmation>)
builderFactory.getBuilder(SubjectConfirmation.DEFAULT_ELEMENT_NAME);
-
+
}
if (confirmationMethodV1Builder == null) {
confirmationMethodV1Builder = (SAMLObjectBuilder<ConfirmationMethod>)
builderFactory.getBuilder(ConfirmationMethod.DEFAULT_ELEMENT_NAME);
}
-
+
Subject subject = subjectV1Builder.buildObject();
NameIdentifier nameIdentifier = nameIdentifierV1Builder.buildObject();
SubjectConfirmation subjectConfirmation = subjectConfirmationV1Builder.buildObject();
ConfirmationMethod confirmationMethod = confirmationMethodV1Builder.buildObject();
-
+
nameIdentifier.setNameQualifier(subjectBean.getSubjectNameQualifier());
nameIdentifier.setValue(subjectBean.getSubjectName());
nameIdentifier.setFormat(subjectBean.getSubjectNameIDFormat());
String confirmationMethodStr = subjectBean.getSubjectConfirmationMethod();
-
+
if (confirmationMethodStr == null) {
confirmationMethodStr = SAML1Constants.CONF_SENDER_VOUCHES;
}
-
+
confirmationMethod.setConfirmationMethod(confirmationMethodStr);
subjectConfirmation.getConfirmationMethods().add(confirmationMethod);
if (subjectBean.getKeyInfo() != null) {
@@ -200,17 +200,17 @@ public final class SAML1ComponentBuilder
}
subject.setNameIdentifier(nameIdentifier);
subject.setSubjectConfirmation(subjectConfirmation);
-
+
return subject;
}
-
+
/**
* Create an Opensaml KeyInfo object from the parameters
* @param keyInfo the KeyInfo bean from which to extract security credentials
* @return the KeyInfo object
* @throws org.opensaml.xml.security.SecurityException
*/
- public static KeyInfo createKeyInfo(KeyInfoBean keyInfo)
+ public static KeyInfo createKeyInfo(KeyInfoBean keyInfo)
throws org.opensaml.security.SecurityException, WSSecurityException {
if (keyInfo.getElement() != null) {
return (KeyInfo)OpenSAMLUtil.fromDom(keyInfo.getElement());
@@ -218,7 +218,7 @@ public final class SAML1ComponentBuilder
// Set the certificate or public key
if (keyInfo.getCertificate() != null) {
BasicCredential keyInfoCredential = new BasicX509Credential(keyInfo.getCertificate());
-
+
// Configure how to emit the certificate
X509KeyInfoGeneratorFactory kiFactory = new X509KeyInfoGeneratorFactory();
KeyInfoBean.CERT_IDENTIFIER certIdentifier = keyInfo.getCertIdentifer();
@@ -244,7 +244,7 @@ public final class SAML1ComponentBuilder
return kiFactory.newInstance().generate(keyInfoCredential);
}
}
-
+
return null;
}
@@ -257,23 +257,23 @@ public final class SAML1ComponentBuilder
@SuppressWarnings("unchecked")
public static Conditions createSamlv1Conditions(ConditionsBean conditionsBean) {
if (conditionsV1Builder == null) {
- conditionsV1Builder = (SAMLObjectBuilder<Conditions>)
+ conditionsV1Builder = (SAMLObjectBuilder<Conditions>)
builderFactory.getBuilder(Conditions.DEFAULT_ELEMENT_NAME);
-
+
}
Conditions conditions = conditionsV1Builder.buildObject();
-
+
if (conditionsBean == null) {
DateTime newNotBefore = new DateTime();
conditions.setNotBefore(newNotBefore);
conditions.setNotOnOrAfter(newNotBefore.plusMinutes(5));
return conditions;
}
-
+
long tokenPeriodSeconds = conditionsBean.getTokenPeriodSeconds();
DateTime notBefore = conditionsBean.getNotBefore();
DateTime notAfter = conditionsBean.getNotAfter();
-
+
if (notBefore != null && notAfter != null) {
if (notBefore.isAfter(notAfter)) {
throw new IllegalStateException(
@@ -288,22 +288,22 @@ public final class SAML1ComponentBuilder
if (tokenPeriodSeconds <= 0) {
tokenPeriodSeconds = 5L * 60L;
}
- DateTime notOnOrAfter =
+ DateTime notOnOrAfter =
new DateTime(newNotBefore.getMillis() + tokenPeriodSeconds * 1000L);
-
+
conditions.setNotOnOrAfter(notOnOrAfter);
}
-
- if (conditionsBean.getAudienceRestrictions() != null
+
+ if (conditionsBean.getAudienceRestrictions() != null
&& !conditionsBean.getAudienceRestrictions().isEmpty()) {
- for (AudienceRestrictionBean audienceRestrictionBean
+ for (AudienceRestrictionBean audienceRestrictionBean
: conditionsBean.getAudienceRestrictions()) {
- AudienceRestrictionCondition audienceRestriction =
+ AudienceRestrictionCondition audienceRestriction =
createSamlv1AudienceRestriction(audienceRestrictionBean);
conditions.getAudienceRestrictionConditions().add(audienceRestriction);
}
}
-
+
return conditions;
}
@@ -312,31 +312,31 @@ public final class SAML1ComponentBuilder
*
* @param adviceBean A AdviceBean object
* @return a Advice object
- * @throws WSSecurityException
+ * @throws WSSecurityException
*/
@SuppressWarnings("unchecked")
public static Advice createAdvice(AdviceBean adviceBean) throws WSSecurityException {
if (adviceV1Builder == null) {
- adviceV1Builder = (SAMLObjectBuilder<Advice>)
+ adviceV1Builder = (SAMLObjectBuilder<Advice>)
builderFactory.getBuilder(Advice.DEFAULT_ELEMENT_NAME);
}
-
+
Advice advice = adviceV1Builder.buildObject();
-
+
if (!adviceBean.getIdReferences().isEmpty()) {
if (assertionIDReferenceBuilder == null) {
- assertionIDReferenceBuilder = (SAMLObjectBuilder<AssertionIDReference>)
+ assertionIDReferenceBuilder = (SAMLObjectBuilder<AssertionIDReference>)
builderFactory.getBuilder(AssertionIDReference.DEFAULT_ELEMENT_NAME);
}
-
+
for (String ref : adviceBean.getIdReferences()) {
- AssertionIDReference assertionIdReference =
+ AssertionIDReference assertionIdReference =
assertionIDReferenceBuilder.buildObject();
assertionIdReference.setReference(ref);
advice.getAssertionIDReferences().add(assertionIdReference);
}
}
-
+
if (!adviceBean.getAssertions().isEmpty()) {
for (Element assertionElement : adviceBean.getAssertions()) {
XMLObject xmlObject = OpenSAMLUtil.fromDom(assertionElement);
@@ -346,10 +346,10 @@ public final class SAML1ComponentBuilder
}
}
}
-
+
return advice;
}
-
+
/**
* Create an AudienceRestrictionCondition object
*
@@ -357,20 +357,20 @@ public final class SAML1ComponentBuilder
* @return an AudienceRestrictionCondition object
*/
@SuppressWarnings("unchecked")
- public static AudienceRestrictionCondition
+ public static AudienceRestrictionCondition
createSamlv1AudienceRestriction(AudienceRestrictionBean audienceRestrictionBean) {
if (audienceRestrictionV1Builder == null) {
- audienceRestrictionV1Builder = (SAMLObjectBuilder<AudienceRestrictionCondition>)
+ audienceRestrictionV1Builder = (SAMLObjectBuilder<AudienceRestrictionCondition>)
builderFactory.getBuilder(AudienceRestrictionCondition.DEFAULT_ELEMENT_NAME);
}
if (audienceV1Builder == null) {
- audienceV1Builder = (SAMLObjectBuilder<Audience>)
+ audienceV1Builder = (SAMLObjectBuilder<Audience>)
builderFactory.getBuilder(Audience.DEFAULT_ELEMENT_NAME);
}
-
- AudienceRestrictionCondition audienceRestriction =
+
+ AudienceRestrictionCondition audienceRestriction =
audienceRestrictionV1Builder.buildObject();
-
+
for (String audienceURI : audienceRestrictionBean.getAudienceURIs()) {
Audience audience = audienceV1Builder.buildObject();
audience.setUri(audienceURI);
@@ -390,24 +390,24 @@ public final class SAML1ComponentBuilder
List<AuthenticationStatementBean> authBeans
) throws org.opensaml.security.SecurityException, WSSecurityException {
List<AuthenticationStatement> authenticationStatements = new ArrayList<>();
-
+
if (authenticationStatementV1Builder == null) {
- authenticationStatementV1Builder = (SAMLObjectBuilder<AuthenticationStatement>)
+ authenticationStatementV1Builder = (SAMLObjectBuilder<AuthenticationStatement>)
builderFactory.getBuilder(AuthenticationStatement.DEFAULT_ELEMENT_NAME);
}
if (subjectLocalityBuilder == null) {
- subjectLocalityBuilder = (SAMLObjectBuilder<SubjectLocality>)
+ subjectLocalityBuilder = (SAMLObjectBuilder<SubjectLocality>)
builderFactory.getBuilder(SubjectLocality.DEFAULT_ELEMENT_NAME);
}
if (authBeans != null && authBeans.size() > 0) {
for (AuthenticationStatementBean statementBean : authBeans) {
- AuthenticationStatement authenticationStatement =
+ AuthenticationStatement authenticationStatement =
authenticationStatementV1Builder.buildObject(
- AuthenticationStatement.DEFAULT_ELEMENT_NAME,
+ AuthenticationStatement.DEFAULT_ELEMENT_NAME,
AuthenticationStatement.TYPE_NAME
);
- Subject authSubject =
+ Subject authSubject =
SAML1ComponentBuilder.createSaml1v1Subject(statementBean.getSubject());
authenticationStatement.setSubject(authSubject);
@@ -422,7 +422,7 @@ public final class SAML1ComponentBuilder
authenticationStatement.setAuthenticationMethod(
transformAuthenticationMethod(statementBean.getAuthenticationMethod())
);
-
+
SubjectLocalityBean subjectLocalityBean = statementBean.getSubjectLocality();
if (subjectLocalityBean != null) {
SubjectLocality subjectLocality = subjectLocalityBuilder.buildObject();
@@ -431,7 +431,7 @@ public final class SAML1ComponentBuilder
authenticationStatement.setSubjectLocality(subjectLocality);
}
-
+
authenticationStatements.add(authenticationStatement);
}
}
@@ -440,7 +440,7 @@ public final class SAML1ComponentBuilder
}
/**
- * Method transformAuthenticationMethod transforms the user-supplied authentication method
+ * Method transformAuthenticationMethod transforms the user-supplied authentication method
* value into one of the supported specification-compliant values.
*
* @param sourceMethod of type String
@@ -469,7 +469,7 @@ public final class SAML1ComponentBuilder
List<AttributeStatementBean> attributeData
) throws org.opensaml.security.SecurityException, WSSecurityException {
if (attributeStatementV1Builder == null) {
- attributeStatementV1Builder = (SAMLObjectBuilder<AttributeStatement>)
+ attributeStatementV1Builder = (SAMLObjectBuilder<AttributeStatement>)
builderFactory.getBuilder(AttributeStatement.DEFAULT_ELEMENT_NAME);
}
@@ -479,17 +479,17 @@ public final class SAML1ComponentBuilder
for (AttributeStatementBean statementBean : attributeData) {
// Create the attribute statementBean and set the subject
AttributeStatement attributeStatement = attributeStatementV1Builder.buildObject();
- Subject attributeSubject =
+ Subject attributeSubject =
SAML1ComponentBuilder.createSaml1v1Subject(statementBean.getSubject());
attributeStatement.setSubject(attributeSubject);
// Add the individual attributes
for (AttributeBean values : statementBean.getSamlAttributes()) {
List<Object> attributeValues = values.getAttributeValues();
-
- Attribute samlAttribute =
+
+ Attribute samlAttribute =
createSamlv1Attribute(
values.getSimpleName(),
- values.getQualifiedName(),
+ values.getQualifiedName(),
attributeValues
);
attributeStatement.getAttributes().add(samlAttribute);
@@ -512,12 +512,12 @@ public final class SAML1ComponentBuilder
*/
@SuppressWarnings("unchecked")
public static Attribute createSamlv1Attribute(
- String attributeName,
+ String attributeName,
String attributeUrn,
List<Object> values
) {
if (attributeV1Builder == null) {
- attributeV1Builder = (SAMLObjectBuilder<Attribute>)
+ attributeV1Builder = (SAMLObjectBuilder<Attribute>)
builderFactory.getBuilder(Attribute.DEFAULT_ELEMENT_NAME);
}
if (stringBuilder == null) {
@@ -527,10 +527,10 @@ public final class SAML1ComponentBuilder
Attribute attribute = attributeV1Builder.buildObject();
attribute.setAttributeName(attributeName);
attribute.setAttributeNamespace(attributeUrn);
-
+
for (Object value : values) {
if (value instanceof String) {
- XSString attribute1 =
+ XSString attribute1 =
stringBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSString.TYPE_NAME);
attribute1.setValue((String)value);
attribute.getAttributeValues().add(attribute1);
@@ -550,21 +550,21 @@ public final class SAML1ComponentBuilder
*/
@SuppressWarnings("unchecked")
public static List<AuthorizationDecisionStatement> createSamlv1AuthorizationDecisionStatement(
- List<AuthDecisionStatementBean> decisionData)
+ List<AuthDecisionStatementBean> decisionData)
throws org.opensaml.security.SecurityException, WSSecurityException {
List<AuthorizationDecisionStatement> authDecisionStatements = new ArrayList<>();
if (authorizationDecisionStatementV1Builder == null) {
- authorizationDecisionStatementV1Builder =
- (SAMLObjectBuilder<AuthorizationDecisionStatement>)
+ authorizationDecisionStatementV1Builder =
+ (SAMLObjectBuilder<AuthorizationDecisionStatement>)
builderFactory.getBuilder(AuthorizationDecisionStatement.DEFAULT_ELEMENT_NAME);
-
+
}
if (decisionData != null && decisionData.size() > 0) {
for (AuthDecisionStatementBean decisionStatementBean : decisionData) {
- AuthorizationDecisionStatement authDecision =
+ AuthorizationDecisionStatement authDecision =
authorizationDecisionStatementV1Builder.buildObject();
- Subject authDecisionSubject =
+ Subject authDecisionSubject =
SAML1ComponentBuilder.createSaml1v1Subject(decisionStatementBean.getSubject());
authDecision.setSubject(authDecisionSubject);
@@ -575,11 +575,11 @@ public final class SAML1ComponentBuilder
Action actionElement = createSamlv1Action(actionBean);
authDecision.getActions().add(actionElement);
}
-
- if (decisionStatementBean.getEvidence() instanceof Evidence) {
+
+ if (decisionStatementBean.getEvidence() instanceof Evidence) {
authDecision.setEvidence((Evidence)decisionStatementBean.getEvidence());
}
-
+
authDecisionStatements.add(authDecision);
}
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java?rev=1720192&r1=1720191&r2=1720192&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML1Constants.java Tue Dec 15 16:40:37 2015
@@ -25,53 +25,53 @@ package org.apache.wss4j.common.saml.bui
* the SAML v1.x specification.
*/
public final class SAML1Constants {
-
+
//
// NAME ID FORMAT
//
-
- public static final String NAMEID_FORMAT_UNSPECIFIED =
+
+ public static final String NAMEID_FORMAT_UNSPECIFIED =
"urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
-
- public static final String NAMEID_FORMAT_EMAIL_ADDRESS =
+
+ public static final String NAMEID_FORMAT_EMAIL_ADDRESS =
"urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress";
-
- public static final String NAMEID_FORMAT_X509_SUBJECT_NAME =
+
+ public static final String NAMEID_FORMAT_X509_SUBJECT_NAME =
"urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName";
-
- public static final String NAMEID_FORMAT_WINDOWS_DQN =
+
+ public static final String NAMEID_FORMAT_WINDOWS_DQN =
"urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName";
//
// SUBJECT CONFIRMATION
- //
-
+ //
+
/**
* Assertion Bearer Confirmation Method Identifier
*/
- public static final String CONF_BEARER =
+ public static final String CONF_BEARER =
"urn:oasis:names:tc:SAML:1.0:cm:bearer";
/**
* Holder of Key Confirmation Method Identifier
*/
- public static final String CONF_HOLDER_KEY =
+ public static final String CONF_HOLDER_KEY =
"urn:oasis:names:tc:SAML:1.0:cm:holder-of-key";
/**
* Sender Vouches Confirmation Method Identifier
*/
- public static final String CONF_SENDER_VOUCHES =
+ public static final String CONF_SENDER_VOUCHES =
"urn:oasis:names:tc:SAML:1.0:cm:sender-vouches";
//
// AUTH METHOD
//
-
+
/**
* The authentication was performed by means of a password.
*/
- public static final String AUTH_METHOD_PASSWORD =
+ public static final String AUTH_METHOD_PASSWORD =
"urn:oasis:names:tc:SAML:1.0:am:password";
/**
@@ -81,7 +81,7 @@ public final class SAML1Constants {
public static final String AUTH_METHOD_KERBEROS = "urn:ietf:rfc:1510";
/**
- * The authentication was performed by means of Secure Remote Password protocol as specified in
+ * The authentication was performed by means of Secure Remote Password protocol as specified in
* [RFC 2945].
*/
public static final String AUTH_METHOD_SRP = "urn:ietf:rfc:2945";
@@ -89,11 +89,11 @@ public final class SAML1Constants {
/**
* The authentication was performed by means of an unspecified hardware token.
*/
- public static final String AUTH_METHOD_HARDWARE_TOKEN =
+ public static final String AUTH_METHOD_HARDWARE_TOKEN =
"urn:oasis:names:tc:SAML:1.0:am:HardwareToken";
/**
- * The authentication was performed using either the SSL or TLS protocol with certificate
+ * The authentication was performed using either the SSL or TLS protocol with certificate
* based client authentication. TLS is described in [RFC 2246].
*/
public static final String AUTH_METHOD_TLS_CLIENT = "urn:ietf:rfc:2246";
@@ -103,31 +103,31 @@ public final class SAML1Constants {
* means of an X.509 PKI [X.500][PKIX]. It may have been one of the mechanisms for which a more
* specific identifier has been defined.
*/
- public static final String AUTH_METHOD_X509 =
+ public static final String AUTH_METHOD_X509 =
"urn:oasis:names:tc:SAML:1.0:am:X509-PKI";
/**
- * The authentication was performed by some (unspecified) mechanism on a key authenticated by
- * means of a PGP web of trust [PGP]. It may have been one of the mechanisms for which a more
+ * The authentication was performed by some (unspecified) mechanism on a key authenticated by
+ * means of a PGP web of trust [PGP]. It may have been one of the mechanisms for which a more
* specific identifier has been defined.
*/
- public static final String AUTH_METHOD_PGP =
+ public static final String AUTH_METHOD_PGP =
"urn:oasis:names:tc:SAML:1.0:am:PGP";
/**
- * The authentication was performed by some (unspecified) mechanism on a key authenticated by
- * means of a SPKI PKI [SPKI]. It may have been one of the mechanisms for which a more specific
+ * The authentication was performed by some (unspecified) mechanism on a key authenticated by
+ * means of a SPKI PKI [SPKI]. It may have been one of the mechanisms for which a more specific
* identifier has been defined.
*/
- public static final String AUTH_METHOD_SPKI =
+ public static final String AUTH_METHOD_SPKI =
"urn:oasis:names:tc:SAML:1.0:am:SPKI";
/**
- * The authentication was performed by some (unspecified) mechanism on a key authenticated by
+ * The authentication was performed by some (unspecified) mechanism on a key authenticated by
* means of a XKMS trust service [XKMS]. It may have been one of the mechanisms for which a more
* specific identifier has been defined.
*/
- public static final String AUTH_METHOD_XKMS =
+ public static final String AUTH_METHOD_XKMS =
"urn:oasis:names:tc:SAML:1.0:am:XKMS";
/**
@@ -138,9 +138,9 @@ public final class SAML1Constants {
/**
* The authentication was performed by an unspecified means.
*/
- public static final String AUTH_METHOD_UNSPECIFIED =
+ public static final String AUTH_METHOD_UNSPECIFIED =
"urn:oasis:names:tc:SAML:1.0:am:unspecified";
-
+
private SAML1Constants() {
// Complete
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java?rev=1720192&r1=1720191&r2=1720192&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2ComponentBuilder.java Tue Dec 15 16:40:37 2015
@@ -85,64 +85,64 @@ import org.w3c.dom.Element;
*/
public final class SAML2ComponentBuilder {
private static volatile SAMLObjectBuilder<Assertion> assertionBuilder;
-
+
private static volatile SAMLObjectBuilder<Issuer> issuerBuilder;
-
+
private static volatile SAMLObjectBuilder<Subject> subjectBuilder;
-
+
private static volatile SAMLObjectBuilder<NameID> nameIdBuilder;
-
+
private static volatile SAMLObjectBuilder<SubjectConfirmation> subjectConfirmationBuilder;
-
+
private static volatile SAMLObjectBuilder<OneTimeUse> oneTimeUseBuilder;
-
+
private static volatile SAMLObjectBuilder<ProxyRestriction> proxyRestrictionBuilder;
-
+
private static volatile SAMLObjectBuilder<Conditions> conditionsBuilder;
-
+
private static volatile SAMLObjectBuilder<Advice> adviceBuilder;
-
+
private static volatile SAMLObjectBuilder<AssertionIDRef> assertionIDRefBuilder;
-
+
private static volatile SAMLObjectBuilder<AssertionURIRef> assertionURIRefBuilder;
-
+
private static volatile SAMLObjectBuilder<SubjectConfirmationData> subjectConfirmationDataBuilder;
-
+
private static volatile SAMLObjectBuilder<KeyInfoConfirmationDataType> keyInfoConfirmationDataBuilder;
-
+
private static volatile SAMLObjectBuilder<AuthnStatement> authnStatementBuilder;
-
+
private static volatile SAMLObjectBuilder<AuthnContext> authnContextBuilder;
-
+
private static volatile SAMLObjectBuilder<AuthnContextClassRef> authnContextClassRefBuilder;
-
+
private static volatile SAMLObjectBuilder<AttributeStatement> attributeStatementBuilder;
-
+
private static volatile SAMLObjectBuilder<Attribute> attributeBuilder;
-
+
private static volatile XSStringBuilder stringBuilder;
-
+
private static volatile SAMLObjectBuilder<AudienceRestriction> audienceRestrictionBuilder;
-
+
private static volatile SAMLObjectBuilder<DelegationRestrictionType> delegationRestrictionBuilder;
-
+
private static volatile SAMLObjectBuilder<Audience> audienceBuilder;
-
+
private static volatile SAMLObjectBuilder<Delegate> delegateBuilder;
-
+
private static volatile SAMLObjectBuilder<AuthzDecisionStatement> authorizationDecisionStatementBuilder;
-
+
private static volatile SAMLObjectBuilder<Action> actionElementBuilder;
-
- private static volatile XMLObjectBuilderFactory builderFactory =
+
+ private static volatile XMLObjectBuilderFactory builderFactory =
XMLObjectProviderRegistrySupport.getBuilderFactory();
-
+
private static volatile SAMLObjectBuilder<SubjectLocality> subjectLocalityBuilder;
private SAML2ComponentBuilder() {
// Complete
}
-
+
/**
* Create a SAML 2 assertion
*
@@ -151,7 +151,7 @@ public final class SAML2ComponentBuilder
@SuppressWarnings("unchecked")
public static Assertion createAssertion() {
if (assertionBuilder == null) {
- assertionBuilder = (SAMLObjectBuilder<Assertion>)
+ assertionBuilder = (SAMLObjectBuilder<Assertion>)
builderFactory.getBuilder(Assertion.DEFAULT_ELEMENT_NAME);
if (assertionBuilder == null) {
throw new IllegalStateException(
@@ -160,7 +160,7 @@ public final class SAML2ComponentBuilder
);
}
}
- Assertion assertion =
+ Assertion assertion =
assertionBuilder.buildObject(Assertion.DEFAULT_ELEMENT_NAME, Assertion.TYPE_NAME);
assertion.setID(IDGenerator.generateID("_"));
assertion.setVersion(SAMLVersion.VERSION_20);
@@ -179,13 +179,13 @@ public final class SAML2ComponentBuilder
@SuppressWarnings("unchecked")
public static Issuer createIssuer(String issuerValue, String issuerFormat, String issuerQualifier) {
if (issuerBuilder == null) {
- issuerBuilder = (SAMLObjectBuilder<Issuer>)
+ issuerBuilder = (SAMLObjectBuilder<Issuer>)
builderFactory.getBuilder(Issuer.DEFAULT_ELEMENT_NAME);
-
+
}
Issuer issuer = issuerBuilder.buildObject();
//
- // The SAML authority that is making the claim(s) in the assertion. The issuer SHOULD
+ // The SAML authority that is making the claim(s) in the assertion. The issuer SHOULD
// be unambiguous to the intended relying parties.
issuer.setValue(issuerValue);
issuer.setFormat(issuerFormat);
@@ -202,23 +202,23 @@ public final class SAML2ComponentBuilder
@SuppressWarnings("unchecked")
public static Conditions createConditions(ConditionsBean conditionsBean) {
if (conditionsBuilder == null) {
- conditionsBuilder = (SAMLObjectBuilder<Conditions>)
+ conditionsBuilder = (SAMLObjectBuilder<Conditions>)
builderFactory.getBuilder(Conditions.DEFAULT_ELEMENT_NAME);
}
-
+
Conditions conditions = conditionsBuilder.buildObject();
-
+
if (conditionsBean == null) {
DateTime newNotBefore = new DateTime();
conditions.setNotBefore(newNotBefore);
conditions.setNotOnOrAfter(newNotBefore.plusMinutes(5));
return conditions;
}
-
+
long tokenPeriodSeconds = conditionsBean.getTokenPeriodSeconds();
DateTime notBefore = conditionsBean.getNotBefore();
DateTime notAfter = conditionsBean.getNotAfter();
-
+
if (notBefore != null && notAfter != null) {
if (notBefore.isAfter(notAfter)) {
throw new IllegalStateException(
@@ -233,81 +233,81 @@ public final class SAML2ComponentBuilder
if (tokenPeriodSeconds <= 0) {
tokenPeriodSeconds = 5L * 60L;
}
- DateTime notOnOrAfter =
+ DateTime notOnOrAfter =
new DateTime(newNotBefore.getMillis() + tokenPeriodSeconds * 1000L);
-
+
conditions.setNotOnOrAfter(notOnOrAfter);
}
-
- if (conditionsBean.getAudienceRestrictions() != null
+
+ if (conditionsBean.getAudienceRestrictions() != null
&& !conditionsBean.getAudienceRestrictions().isEmpty()) {
- for (AudienceRestrictionBean audienceRestrictionBean
+ for (AudienceRestrictionBean audienceRestrictionBean
: conditionsBean.getAudienceRestrictions()) {
- AudienceRestriction audienceRestriction =
+ AudienceRestriction audienceRestriction =
createAudienceRestriction(audienceRestrictionBean);
conditions.getAudienceRestrictions().add(audienceRestriction);
}
}
-
+
if (conditionsBean.isOneTimeUse()) {
conditions.getConditions().add(createOneTimeUse());
}
-
+
if (conditionsBean.getProxyRestriction() != null) {
conditions.getConditions().add(createProxyRestriction(conditionsBean.getProxyRestriction()));
}
-
+
if (conditionsBean.getDelegates() != null && !conditionsBean.getDelegates().isEmpty()) {
- DelegationRestrictionType delegationRestriction =
+ DelegationRestrictionType delegationRestriction =
createDelegationRestriction(conditionsBean.getDelegates());
conditions.getConditions().add(delegationRestriction);
}
-
+
return conditions;
}
-
+
/**
* Create a Advice object
*
* @param adviceBean A AdviceBean object
* @return a Advice object
- * @throws WSSecurityException
+ * @throws WSSecurityException
*/
@SuppressWarnings("unchecked")
public static Advice createAdvice(AdviceBean adviceBean) throws WSSecurityException {
if (adviceBuilder == null) {
- adviceBuilder = (SAMLObjectBuilder<Advice>)
+ adviceBuilder = (SAMLObjectBuilder<Advice>)
builderFactory.getBuilder(Advice.DEFAULT_ELEMENT_NAME);
}
-
+
Advice advice = adviceBuilder.buildObject();
-
+
if (!adviceBean.getIdReferences().isEmpty()) {
if (assertionIDRefBuilder == null) {
- assertionIDRefBuilder = (SAMLObjectBuilder<AssertionIDRef>)
+ assertionIDRefBuilder = (SAMLObjectBuilder<AssertionIDRef>)
builderFactory.getBuilder(AssertionIDRef.DEFAULT_ELEMENT_NAME);
}
-
+
for (String ref : adviceBean.getIdReferences()) {
AssertionIDRef assertionIdRef = assertionIDRefBuilder.buildObject();
assertionIdRef.setAssertionID(ref);
advice.getAssertionIDReferences().add(assertionIdRef);
}
}
-
+
if (!adviceBean.getUriReferences().isEmpty()) {
if (assertionURIRefBuilder == null) {
- assertionURIRefBuilder = (SAMLObjectBuilder<AssertionURIRef>)
+ assertionURIRefBuilder = (SAMLObjectBuilder<AssertionURIRef>)
builderFactory.getBuilder(AssertionURIRef.DEFAULT_ELEMENT_NAME);
}
-
+
for (String ref : adviceBean.getUriReferences()) {
AssertionURIRef assertionURIRef = assertionURIRefBuilder.buildObject();
assertionURIRef.setAssertionURI(ref);
advice.getAssertionURIReferences().add(assertionURIRef);
}
}
-
+
if (!adviceBean.getAssertions().isEmpty()) {
for (Element assertionElement : adviceBean.getAssertions()) {
XMLObject xmlObject = OpenSAMLUtil.fromDom(assertionElement);
@@ -317,7 +317,7 @@ public final class SAML2ComponentBuilder
}
}
}
-
+
return advice;
}
@@ -332,16 +332,16 @@ public final class SAML2ComponentBuilder
AudienceRestrictionBean audienceRestrictionBean
) {
if (audienceRestrictionBuilder == null) {
- audienceRestrictionBuilder = (SAMLObjectBuilder<AudienceRestriction>)
+ audienceRestrictionBuilder = (SAMLObjectBuilder<AudienceRestriction>)
builderFactory.getBuilder(AudienceRestriction.DEFAULT_ELEMENT_NAME);
}
if (audienceBuilder == null) {
- audienceBuilder = (SAMLObjectBuilder<Audience>)
+ audienceBuilder = (SAMLObjectBuilder<Audience>)
builderFactory.getBuilder(Audience.DEFAULT_ELEMENT_NAME);
}
-
+
AudienceRestriction audienceRestriction = audienceRestrictionBuilder.buildObject();
-
+
for (String audienceURI : audienceRestrictionBean.getAudienceURIs()) {
Audience audience = audienceBuilder.buildObject();
audience.setAudienceURI(audienceURI);
@@ -349,7 +349,7 @@ public final class SAML2ComponentBuilder
}
return audienceRestriction;
}
-
+
/**
* Create an DelegationRestrictionType object
*
@@ -365,17 +365,17 @@ public final class SAML2ComponentBuilder
builderFactory.getBuilder(DelegationRestrictionType.TYPE_NAME);
}
DelegationRestrictionType delegationRestriction = delegationRestrictionBuilder.buildObject();
-
+
if (delegateBuilder == null) {
delegateBuilder = (SAMLObjectBuilder<Delegate>)
builderFactory.getBuilder(Delegate.DEFAULT_ELEMENT_NAME);
}
-
+
for (DelegateBean delegateBean : delegates) {
Delegate delegate = delegateBuilder.buildObject();
delegate.setConfirmationMethod(delegateBean.getConfirmationMethod());
delegate.setDelegationInstant(delegateBean.getDelegationInstant());
-
+
if (delegateBean.getNameIDBean() == null) {
throw new IllegalStateException(
"The value of NameIDBean in DelegateBean may not be null"
@@ -385,10 +385,10 @@ public final class SAML2ComponentBuilder
delegate.setNameID(nameID);
delegationRestriction.getDelegates().add(delegate);
}
-
+
return delegationRestriction;
}
-
+
/**
* Create a OneTimeUse object
*
@@ -397,13 +397,13 @@ public final class SAML2ComponentBuilder
@SuppressWarnings("unchecked")
public static OneTimeUse createOneTimeUse() {
if (oneTimeUseBuilder == null) {
- oneTimeUseBuilder = (SAMLObjectBuilder<OneTimeUse>)
+ oneTimeUseBuilder = (SAMLObjectBuilder<OneTimeUse>)
builderFactory.getBuilder(OneTimeUse.DEFAULT_ELEMENT_NAME);
}
-
+
return oneTimeUseBuilder.buildObject();
}
-
+
/**
* Create a ProxyRestriction object
*
@@ -412,18 +412,18 @@ public final class SAML2ComponentBuilder
@SuppressWarnings("unchecked")
public static ProxyRestriction createProxyRestriction(ProxyRestrictionBean proxyRestrictionBean) {
if (proxyRestrictionBuilder == null) {
- proxyRestrictionBuilder = (SAMLObjectBuilder<ProxyRestriction>)
+ proxyRestrictionBuilder = (SAMLObjectBuilder<ProxyRestriction>)
builderFactory.getBuilder(ProxyRestriction.DEFAULT_ELEMENT_NAME);
}
-
+
ProxyRestriction proxyRestriction = proxyRestrictionBuilder.buildObject();
if (proxyRestrictionBean.getCount() > 0) {
proxyRestriction.setProxyCount(proxyRestrictionBean.getCount());
}
-
+
if (!proxyRestrictionBean.getAudienceURIs().isEmpty()) {
if (audienceBuilder == null) {
- audienceBuilder = (SAMLObjectBuilder<Audience>)
+ audienceBuilder = (SAMLObjectBuilder<Audience>)
builderFactory.getBuilder(Audience.DEFAULT_ELEMENT_NAME);
}
for (String audienceURI : proxyRestrictionBean.getAudienceURIs()) {
@@ -432,7 +432,7 @@ public final class SAML2ComponentBuilder
proxyRestriction.getAudiences().add(audience);
}
}
-
+
return proxyRestriction;
}
@@ -447,24 +447,24 @@ public final class SAML2ComponentBuilder
List<AuthenticationStatementBean> authBeans
) {
List<AuthnStatement> authnStatements = new ArrayList<>();
-
+
if (authnStatementBuilder == null) {
- authnStatementBuilder = (SAMLObjectBuilder<AuthnStatement>)
+ authnStatementBuilder = (SAMLObjectBuilder<AuthnStatement>)
builderFactory.getBuilder(AuthnStatement.DEFAULT_ELEMENT_NAME);
}
if (authnContextBuilder == null) {
- authnContextBuilder = (SAMLObjectBuilder<AuthnContext>)
+ authnContextBuilder = (SAMLObjectBuilder<AuthnContext>)
builderFactory.getBuilder(AuthnContext.DEFAULT_ELEMENT_NAME);
}
if (authnContextClassRefBuilder == null) {
- authnContextClassRefBuilder = (SAMLObjectBuilder<AuthnContextClassRef>)
+ authnContextClassRefBuilder = (SAMLObjectBuilder<AuthnContextClassRef>)
builderFactory.getBuilder(AuthnContextClassRef.DEFAULT_ELEMENT_NAME);
}
if (subjectLocalityBuilder == null) {
- subjectLocalityBuilder = (SAMLObjectBuilder<SubjectLocality>)
+ subjectLocalityBuilder = (SAMLObjectBuilder<SubjectLocality>)
builderFactory.getBuilder(SubjectLocality.DEFAULT_ELEMENT_NAME);
}
-
+
if (authBeans != null && authBeans.size() > 0) {
for (AuthenticationStatementBean statementBean : authBeans) {
AuthnStatement authnStatement = authnStatementBuilder.buildObject();
@@ -473,16 +473,16 @@ public final class SAML2ComponentBuilder
authInstant = new DateTime();
}
authnStatement.setAuthnInstant(authInstant);
-
+
DateTime sessionNotOnOrAfter = statementBean.getSessionNotOnOrAfter();
if (sessionNotOnOrAfter != null) {
authnStatement.setSessionNotOnOrAfter(sessionNotOnOrAfter);
}
-
+
if (statementBean.getSessionIndex() != null) {
authnStatement.setSessionIndex(statementBean.getSessionIndex());
}
-
+
AuthnContextClassRef authnContextClassRef = authnContextClassRefBuilder.buildObject();
authnContextClassRef.setAuthnContextClassRef(
transformAuthenticationMethod(statementBean.getAuthenticationMethod())
@@ -499,7 +499,7 @@ public final class SAML2ComponentBuilder
authnStatement.setSubjectLocality(subjectLocality);
}
-
+
authnStatements.add(authnStatement);
}
}
@@ -508,7 +508,7 @@ public final class SAML2ComponentBuilder
}
/**
- * Transform the user-supplied authentication method value into one of the supported
+ * Transform the user-supplied authentication method value into one of the supported
* specification-compliant values.
*
* @param sourceMethod of type String
@@ -542,10 +542,10 @@ public final class SAML2ComponentBuilder
stringBuilder = (XSStringBuilder)builderFactory.getBuilder(XSString.TYPE_NAME);
}
Attribute attribute = createAttribute(friendlyName, name, nameFormat);
-
+
for (Object value : values) {
if (value instanceof String) {
- XSString attributeValue =
+ XSString attributeValue =
stringBuilder.buildObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSString.TYPE_NAME);
attributeValue.setValue((String)value);
attribute.getAttributeValues().add(attributeValue);
@@ -564,39 +564,39 @@ public final class SAML2ComponentBuilder
* @return a Subject
*/
@SuppressWarnings("unchecked")
- public static Subject createSaml2Subject(SubjectBean subjectBean)
+ public static Subject createSaml2Subject(SubjectBean subjectBean)
throws org.opensaml.security.SecurityException, WSSecurityException {
if (subjectBuilder == null) {
- subjectBuilder = (SAMLObjectBuilder<Subject>)
+ subjectBuilder = (SAMLObjectBuilder<Subject>)
builderFactory.getBuilder(Subject.DEFAULT_ELEMENT_NAME);
}
Subject subject = subjectBuilder.buildObject();
-
+
NameID nameID = SAML2ComponentBuilder.createNameID(subjectBean);
subject.setNameID(nameID);
-
+
SubjectConfirmationData subjectConfData = null;
if (subjectBean.getKeyInfo() != null || subjectBean.getSubjectConfirmationData() != null) {
- subjectConfData =
+ subjectConfData =
SAML2ComponentBuilder.createSubjectConfirmationData(
- subjectBean.getSubjectConfirmationData(),
- subjectBean.getKeyInfo()
+ subjectBean.getSubjectConfirmationData(),
+ subjectBean.getKeyInfo()
);
}
-
+
String confirmationMethodStr = subjectBean.getSubjectConfirmationMethod();
if (confirmationMethodStr == null) {
confirmationMethodStr = SAML2Constants.CONF_SENDER_VOUCHES;
}
- SubjectConfirmation subjectConfirmation =
+ SubjectConfirmation subjectConfirmation =
SAML2ComponentBuilder.createSubjectConfirmation(
confirmationMethodStr, subjectConfData
);
-
+
subject.getSubjectConfirmations().add(subjectConfirmation);
return subject;
}
-
+
/**
* Create a SubjectConfirmationData object
*
@@ -613,20 +613,20 @@ public final class SAML2ComponentBuilder
KeyInfo keyInfo = null;
if (keyInfoBean == null) {
if (subjectConfirmationDataBuilder == null) {
- subjectConfirmationDataBuilder = (SAMLObjectBuilder<SubjectConfirmationData>)
+ subjectConfirmationDataBuilder = (SAMLObjectBuilder<SubjectConfirmationData>)
builderFactory.getBuilder(SubjectConfirmationData.DEFAULT_ELEMENT_NAME);
}
subjectConfirmationData = subjectConfirmationDataBuilder.buildObject();
} else {
if (keyInfoConfirmationDataBuilder == null) {
- keyInfoConfirmationDataBuilder = (SAMLObjectBuilder<KeyInfoConfirmationDataType>)
+ keyInfoConfirmationDataBuilder = (SAMLObjectBuilder<KeyInfoConfirmationDataType>)
builderFactory.getBuilder(KeyInfoConfirmationDataType.TYPE_NAME);
}
subjectConfirmationData = keyInfoConfirmationDataBuilder.buildObject();
keyInfo = SAML1ComponentBuilder.createKeyInfo(keyInfoBean);
((KeyInfoConfirmationDataType)subjectConfirmationData).getKeyInfos().add(keyInfo);
}
-
+
if (subjectConfirmationDataBean != null) {
if (subjectConfirmationDataBean.getInResponseTo() != null) {
subjectConfirmationData.setInResponseTo(subjectConfirmationDataBean.getInResponseTo());
@@ -644,10 +644,10 @@ public final class SAML2ComponentBuilder
subjectConfirmationData.setNotBefore(subjectConfirmationDataBean.getNotBefore());
}
}
-
+
return subjectConfirmationData;
}
-
+
/**
* Create a SubjectConfirmation object
* One of the following subject confirmation methods MUST be used:
@@ -665,10 +665,10 @@ public final class SAML2ComponentBuilder
SubjectConfirmationData subjectConfirmationData
) {
if (subjectConfirmationBuilder == null) {
- subjectConfirmationBuilder = (SAMLObjectBuilder<SubjectConfirmation>)
+ subjectConfirmationBuilder = (SAMLObjectBuilder<SubjectConfirmation>)
builderFactory.getBuilder(SubjectConfirmation.DEFAULT_ELEMENT_NAME);
}
-
+
SubjectConfirmation subjectConfirmation = subjectConfirmationBuilder.buildObject();
subjectConfirmation.setMethod(method);
subjectConfirmation.setSubjectConfirmationData(subjectConfirmationData);
@@ -701,7 +701,7 @@ public final class SAML2ComponentBuilder
@SuppressWarnings("unchecked")
public static NameID createNameID(NameIDBean nameIDBean) {
if (nameIdBuilder == null) {
- nameIdBuilder = (SAMLObjectBuilder<NameID>)
+ nameIdBuilder = (SAMLObjectBuilder<NameID>)
builderFactory.getBuilder(NameID.DEFAULT_ELEMENT_NAME);
}
NameID nameID = nameIdBuilder.buildObject();
@@ -723,7 +723,7 @@ public final class SAML2ComponentBuilder
) {
List<AttributeStatement> attributeStatements = new ArrayList<>();
if (attributeStatementBuilder == null) {
- attributeStatementBuilder = (SAMLObjectBuilder<AttributeStatement>)
+ attributeStatementBuilder = (SAMLObjectBuilder<AttributeStatement>)
builderFactory.getBuilder(AttributeStatement.DEFAULT_ELEMENT_NAME);
}
@@ -732,9 +732,9 @@ public final class SAML2ComponentBuilder
AttributeStatement attributeStatement = attributeStatementBuilder.buildObject();
for (AttributeBean values : statementBean.getSamlAttributes()) {
List<Object> attributeValues = values.getAttributeValues();
- Attribute samlAttribute =
+ Attribute samlAttribute =
createAttribute(
- values.getSimpleName(),
+ values.getSimpleName(),
values.getQualifiedName(),
values.getNameFormat(),
attributeValues
@@ -763,7 +763,7 @@ public final class SAML2ComponentBuilder
attributeBuilder = (SAMLObjectBuilder<Attribute>)
builderFactory.getBuilder(Attribute.DEFAULT_ELEMENT_NAME);
}
-
+
Attribute attribute = attributeBuilder.buildObject();
attribute.setFriendlyName(friendlyName);
if (nameFormat == null) {
@@ -787,14 +787,14 @@ public final class SAML2ComponentBuilder
) {
List<AuthzDecisionStatement> authDecisionStatements = new ArrayList<>();
if (authorizationDecisionStatementBuilder == null) {
- authorizationDecisionStatementBuilder =
+ authorizationDecisionStatementBuilder =
(SAMLObjectBuilder<AuthzDecisionStatement>)
builderFactory.getBuilder(AuthzDecisionStatement.DEFAULT_ELEMENT_NAME);
}
if (decisionData != null && decisionData.size() > 0) {
for (AuthDecisionStatementBean decisionStatementBean : decisionData) {
- AuthzDecisionStatement authDecision =
+ AuthzDecisionStatement authDecision =
authorizationDecisionStatementBuilder.buildObject();
authDecision.setResource(decisionStatementBean.getResource());
authDecision.setDecision(
@@ -806,10 +806,10 @@ public final class SAML2ComponentBuilder
authDecision.getActions().add(actionElement);
}
- if (decisionStatementBean.getEvidence() instanceof Evidence) {
+ if (decisionStatementBean.getEvidence() instanceof Evidence) {
authDecision.setEvidence((Evidence)decisionStatementBean.getEvidence());
}
-
+
authDecisionStatements.add(authDecision);
}
}
@@ -844,7 +844,7 @@ public final class SAML2ComponentBuilder
* Create a DecisionTypeEnumeration object
*
* @param decision of type Decision
- * @return a DecisionTypeEnumeration object
+ * @return a DecisionTypeEnumeration object
*/
private static DecisionTypeEnumeration transformDecisionType(
AuthDecisionStatementBean.Decision decision
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java?rev=1720192&r1=1720191&r2=1720192&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/builder/SAML2Constants.java Tue Dec 15 16:40:37 2015
@@ -28,136 +28,136 @@ public final class SAML2Constants {
//
// NAME ID FORMAT
//
-
- public static final String NAMEID_FORMAT_UNSPECIFIED =
+
+ public static final String NAMEID_FORMAT_UNSPECIFIED =
"urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
-
- public static final String NAMEID_FORMAT_EMAIL_ADDRESS =
+
+ public static final String NAMEID_FORMAT_EMAIL_ADDRESS =
"urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress";
-
- public static final String NAMEID_FORMAT_X509_SUBJECT_NAME =
+
+ public static final String NAMEID_FORMAT_X509_SUBJECT_NAME =
"urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName";
-
- public static final String NAMEID_FORMAT_WINDOWS_DQN =
+
+ public static final String NAMEID_FORMAT_WINDOWS_DQN =
"urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName";
-
- public static final String NAMEID_FORMAT_KERBEROS =
+
+ public static final String NAMEID_FORMAT_KERBEROS =
"urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos";
-
- public static final String NAMEID_FORMAT_ENTITY =
+
+ public static final String NAMEID_FORMAT_ENTITY =
"urn:oasis:names:tc:SAML:2.0:nameid-format:entity";
-
- public static final String NAMEID_FORMAT_PERSISTENT =
+
+ public static final String NAMEID_FORMAT_PERSISTENT =
"urn:oasis:names:tc:SAML:2.0:nameid-format:persistent";
-
- public static final String NAMEID_FORMAT_TRANSIENT =
+
+ public static final String NAMEID_FORMAT_TRANSIENT =
"urn:oasis:names:tc:SAML:2.0:nameid-format:transient";
//
// SUBJECT CONFIRMATION
//
-
- public static final String CONF_BEARER =
+
+ public static final String CONF_BEARER =
"urn:oasis:names:tc:SAML:2.0:cm:bearer";
-
- public static final String CONF_HOLDER_KEY =
+
+ public static final String CONF_HOLDER_KEY =
"urn:oasis:names:tc:SAML:2.0:cm:holder-of-key";
-
- public static final String CONF_SENDER_VOUCHES =
+
+ public static final String CONF_SENDER_VOUCHES =
"urn:oasis:names:tc:SAML:2.0:cm:sender-vouches";
-
+
//
// AUTH CONTEXT CLASS REF
//
-
- public static final String AUTH_CONTEXT_CLASS_REF_INTERNET_PROTOCOL =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_INTERNET_PROTOCOL =
"urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol";
-
- public static final String AUTH_CONTEXT_CLASS_REF_INTERNET_PROTOCOL_PASSWORD =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_INTERNET_PROTOCOL_PASSWORD =
"urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword";
-
- public static final String AUTH_CONTEXT_CLASS_REF_KERBEROS =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_KERBEROS =
"urn:oasis:names:tc:SAML:2.0:ac:classes:Kerberos";
-
- public static final String AUTH_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_UNREGISTERED =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_UNREGISTERED =
"urn:oasis:names:tc:SAML:2.0:ac:classes:MobileOneFactorUnregistered";
-
- public static final String AUTH_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_UNREGISTERED =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_UNREGISTERED =
"urn:oasis:names:tc:SAML:2.0:ac:classes:MobileTwoFactorUnregistered";
-
- public static final String AUTH_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_CONTRACT =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_MOBILE_ONE_FACTOR_CONTRACT =
"urn:oasis:names:tc:SAML:2.0:ac:classes:MobileOneFactorContract";
-
- public static final String AUTH_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_CONTRACT =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_MOBILE_TWO_FACTOR_CONTRACT =
"urn:oasis:names:tc:SAML:2.0:ac:classes:MobileTwoFactorContract";
-
- public static final String AUTH_CONTEXT_CLASS_REF_PASSWORD =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_PASSWORD =
"urn:oasis:names:tc:SAML:2.0:ac:classes:Password";
-
- public static final String AUTH_CONTEXT_CLASS_REF_PASSWORD_PROTECTED_TRANSPORT =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_PASSWORD_PROTECTED_TRANSPORT =
"urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport";
-
- public static final String AUTH_CONTEXT_CLASS_REF_PREVIOUS_SESSION =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_PREVIOUS_SESSION =
"urn:oasis:names:tc:SAML:2.0:ac:classes:PreviousSession";
-
- public static final String AUTH_CONTEXT_CLASS_REF_X509 =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_X509 =
"urn:oasis:names:tc:SAML:2.0:ac:classes:X509";
-
- public static final String AUTH_CONTEXT_CLASS_REF_PGP =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_PGP =
"urn:oasis:names:tc:SAML:2.0:ac:classes:PGP";
-
- public static final String AUTH_CONTEXT_CLASS_REF_SPKI =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_SPKI =
"urn:oasis:names:tc:SAML:2.0:ac:classes:SPKI";
-
- public static final String AUTH_CONTEXT_CLASS_REF_XMLDSIG =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_XMLDSIG =
"urn:oasis:names:tc:SAML:2.0:ac:classes:XMLDSig";
-
- public static final String AUTH_CONTEXT_CLASS_REF_SMARTCARD =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_SMARTCARD =
"urn:oasis:names:tc:SAML:2.0:ac:classes:Smartcard";
-
- public static final String AUTH_CONTEXT_CLASS_REF_SMARTCARD_PKI =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_SMARTCARD_PKI =
"urn:oasis:names:tc:SAML:2.0:ac:classes:SmartcardPKI";
-
- public static final String AUTH_CONTEXT_CLASS_REF_SOFTWARE_PKI =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_SOFTWARE_PKI =
"urn:oasis:names:tc:SAML:2.0:ac:classes:SoftwarePKI";
-
- public static final String AUTH_CONTEXT_CLASS_REF_TELEPHONY =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_TELEPHONY =
"urn:oasis:names:tc:SAML:2.0:ac:classes:Telephony";
-
- public static final String AUTH_CONTEXT_CLASS_REF_NOMAD_TELEPHONY =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_NOMAD_TELEPHONY =
"urn:oasis:names:tc:SAML:2.0:ac:classes:NomadTelephony";
-
- public static final String AUTH_CONTEXT_CLASS_REF_PERSONAL_TELEPHONY =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_PERSONAL_TELEPHONY =
"urn:oasis:names:tc:SAML:2.0:ac:classes:PersonalTelephony";
-
- public static final String AUTH_CONTEXT_CLASS_REF_AUTHENTICATED_TELEPHONY =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_AUTHENTICATED_TELEPHONY =
"urn:oasis:names:tc:SAML:2.0:ac:classes:AuthenticatedTelephony";
-
- public static final String AUTH_CONTEXT_CLASS_REF_SECURED_REMOTE_PASSWORD =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_SECURED_REMOTE_PASSWORD =
"urn:oasis:names:tc:SAML:2.0:ac:classes:SecureRemotePassword";
-
- public static final String AUTH_CONTEXT_CLASS_REF_TLS_CLIENT =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_TLS_CLIENT =
"urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient";
-
- public static final String AUTH_CONTEXT_CLASS_REF_TIME_SYNC_TOKEN =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_TIME_SYNC_TOKEN =
"urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken";
-
- public static final String AUTH_CONTEXT_CLASS_REF_UNSPECIFIED =
+
+ public static final String AUTH_CONTEXT_CLASS_REF_UNSPECIFIED =
"urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified";
//
// ATTRIBUTE NAME FORMAT
//
-
- public static final String ATTRNAME_FORMAT_UNSPECIFIED =
+
+ public static final String ATTRNAME_FORMAT_UNSPECIFIED =
"urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified";
-
- public static final String ATTRNAME_FORMAT_URI =
+
+ public static final String ATTRNAME_FORMAT_URI =
"urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
-
- public static final String ATTRNAME_FORMAT_BASIC =
+
+ public static final String ATTRNAME_FORMAT_BASIC =
"urn:oasis:names:tc:SAML:2.0:attrname-format:basic";
-
+
private SAML2Constants() {
// Complete
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java?rev=1720192&r1=1720191&r2=1720192&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java Tue Dec 15 16:40:37 2015
@@ -26,32 +26,32 @@ import org.ietf.jgss.GSSName;
import org.ietf.jgss.Oid;
/**
- * This class represents a PrivilegedAction implementation to obtain a (SPNEGO) service ticket from a
+ * This class represents a PrivilegedAction implementation to obtain a (SPNEGO) service ticket from a
* Kerberos Key Distribution Center.
*/
public class DefaultSpnegoClientAction implements SpnegoClientAction {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DefaultSpnegoClientAction.class);
-
+
private String serviceName;
private GSSContext secContext;
private boolean mutualAuth;
private boolean isUsernameServiceNameForm;
-
+
/**
* Whether to enable mutual authentication or not.
*/
public void setMutualAuth(boolean mutualAuthentication) {
mutualAuth = mutualAuthentication;
}
-
+
/**
* The Service Name
*/
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}
-
+
/**
* Obtain a service ticket
*/
@@ -65,7 +65,7 @@ public class DefaultSpnegoClientAction i
secContext.requestMutualAuth(mutualAuth);
secContext.requestCredDeleg(Boolean.FALSE);
-
+
byte[] token = new byte[0];
return secContext.initSecContext(token, 0, token.length);
} catch (GSSException e) {
@@ -76,7 +76,7 @@ public class DefaultSpnegoClientAction i
return null;
}
-
+
/**
* Get the GSSContext that was created after a service ticket was obtained
*/
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java?rev=1720192&r1=1720191&r2=1720192&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java Tue Dec 15 16:40:37 2015
@@ -26,32 +26,32 @@ import org.ietf.jgss.GSSName;
import org.ietf.jgss.Oid;
/**
- * This class represents a PrivilegedAction implementation to validate a received (SPNEGO) ticket
+ * This class represents a PrivilegedAction implementation to validate a received (SPNEGO) ticket
* to a KDC.
*/
public class DefaultSpnegoServiceAction implements SpnegoServiceAction {
private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(DefaultSpnegoServiceAction.class);
-
+
private byte[] ticket;
private String serviceName;
private boolean isUsernameServiceNameForm;
private GSSContext secContext;
-
+
/**
* Set the ticket to validate
*/
public void setTicket(byte[] ticket) {
this.ticket = ticket;
}
-
+
/**
* The Service Name
*/
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}
-
+
/**
* Validate a service ticket
*/
@@ -72,7 +72,7 @@ public class DefaultSpnegoServiceAction
return null;
}
-
+
/**
* Get the GSSContext that was created after a service ticket was obtained
*/
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoClientAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoClientAction.java?rev=1720192&r1=1720191&r2=1720192&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoClientAction.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoClientAction.java Tue Dec 15 16:40:37 2015
@@ -24,16 +24,16 @@ import java.security.PrivilegedAction;
import org.ietf.jgss.GSSContext;
/**
- * This interface represents a PrivilegedAction implementation to obtain a (SPNEGO) service ticket
+ * This interface represents a PrivilegedAction implementation to obtain a (SPNEGO) service ticket
* from a Kerberos Key Distribution Center.
*/
public interface SpnegoClientAction extends PrivilegedAction<byte[]> {
-
+
/**
* Whether to enable mutual authentication or not.
*/
void setMutualAuth(boolean mutualAuthentication);
-
+
/**
* The Service Name
*/
@@ -42,7 +42,7 @@ public interface SpnegoClientAction exte
/**
* If true - sets the SPN form to "username"
* <br/>If false<b>(default)</b> - the SPN form is "hostbased"
- *
+ *
* @param isUsernameServiceNameForm the isUsernameServiceNameForm to set
*/
void setUserNameServiceForm(boolean isUsernameServiceNameForm);
@@ -51,10 +51,10 @@ public interface SpnegoClientAction exte
* Obtain a service ticket
*/
byte[] run();
-
+
/**
* Get the GSSContext that was created after a service ticket was obtained
*/
GSSContext getContext();
-
+
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoServiceAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoServiceAction.java?rev=1720192&r1=1720191&r2=1720192&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoServiceAction.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoServiceAction.java Tue Dec 15 16:40:37 2015
@@ -24,37 +24,37 @@ import java.security.PrivilegedAction;
import org.ietf.jgss.GSSContext;
/**
- * This interface represents a PrivilegedAction implementation to validate a received (SPNEGO)
+ * This interface represents a PrivilegedAction implementation to validate a received (SPNEGO)
* ticket to a KDC.
*/
public interface SpnegoServiceAction extends PrivilegedAction<byte[]> {
-
+
/**
* Set the ticket to validate
*/
void setTicket(byte[] ticket);
-
+
/**
* The Service Name
*/
void setServiceName(String serviceName);
-
+
/**
* If true - sets the SPN form to "username"
* <br/>If false<b>(default)</b> - the SPN form is "hostbased"
- *
+ *
* @param isUsernameServiceNameForm the isUsernameServiceNameForm to set
*/
void setUsernameServiceNameForm(boolean isUsernameServiceNameForm);
-
+
/**
* Validate a service ticket
*/
byte[] run();
-
+
/**
* Get the GSSContext that was created after a service ticket was obtained
*/
GSSContext getContext();
-
+
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoTokenContext.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoTokenContext.java?rev=1720192&r1=1720191&r2=1720192&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoTokenContext.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/SpnegoTokenContext.java Tue Dec 15 16:40:37 2015
@@ -43,10 +43,10 @@ import org.ietf.jgss.MessageProp;
* This class wraps a GSSContext and provides some functionality to obtain and validate spnego tokens.
*/
public class SpnegoTokenContext {
-
- private static final org.slf4j.Logger LOG =
+
+ private static final org.slf4j.Logger LOG =
org.slf4j.LoggerFactory.getLogger(SpnegoTokenContext.class);
-
+
private GSSContext secContext;
private byte[] token;
private boolean mutualAuth;
@@ -64,53 +64,53 @@ public class SpnegoTokenContext {
* @throws WSSecurityException
*/
public void retrieveServiceTicket(
- String jaasLoginModuleName,
+ String jaasLoginModuleName,
CallbackHandler callbackHandler,
String serviceName
) throws WSSecurityException {
retrieveServiceTicket(jaasLoginModuleName, callbackHandler, serviceName, false);
}
-
-
+
+
/**
* Retrieve a service ticket from a KDC using the Kerberos JAAS module, and set it in this
* BinarySecurityToken.
* @param jaasLoginModuleName the JAAS Login Module name to use
* @param callbackHandler a CallbackHandler instance to retrieve a password (optional)
* @param serviceName the desired Kerberized service
- * @param isUsernameServiceNameForm
+ * @param isUsernameServiceNameForm
* @throws WSSecurityException
*/
public void retrieveServiceTicket(
- String jaasLoginModuleName,
+ String jaasLoginModuleName,
CallbackHandler callbackHandler,
String serviceName,
boolean isUsernameServiceNameForm
) throws WSSecurityException {
- retrieveServiceTicket(jaasLoginModuleName, callbackHandler, serviceName,
+ retrieveServiceTicket(jaasLoginModuleName, callbackHandler, serviceName,
isUsernameServiceNameForm, false, null);
}
-
+
/**
* Retrieve a service ticket from a KDC using the Kerberos JAAS module, and set it in this
* BinarySecurityToken.
* @param jaasLoginModuleName the JAAS Login Module name to use
* @param callbackHandler a CallbackHandler instance to retrieve a password (optional)
* @param serviceName the desired Kerberized service
- * @param isUsernameServiceNameForm
+ * @param isUsernameServiceNameForm
* @param requestCredDeleg Whether to request credential delegation or not
* @param delegationCredential The delegation credential to use
* @throws WSSecurityException
*/
public void retrieveServiceTicket(
- String jaasLoginModuleName,
+ String jaasLoginModuleName,
CallbackHandler callbackHandler,
String serviceName,
boolean isUsernameServiceNameForm,
boolean requestCredDeleg,
GSSCredential delegationCredential
) throws WSSecurityException {
-
+
// Get a TGT from the KDC using JAAS
LoginContext loginContext = null;
try {
@@ -125,22 +125,22 @@ public class SpnegoTokenContext {
LOG.debug(ex.getMessage(), ex);
}
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILURE, ex, "kerberosLoginError",
+ WSSecurityException.ErrorCode.FAILURE, ex, "kerberosLoginError",
new Object[] {ex.getMessage()});
}
if (LOG.isDebugEnabled()) {
LOG.debug("Successfully authenticated to the TGT");
}
-
+
Subject clientSubject = loginContext.getSubject();
Set<Principal> clientPrincipals = clientSubject.getPrincipals();
if (clientPrincipals.isEmpty()) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"kerberosLoginError",
new Object[] {"No Client principals found after login"});
}
-
+
// Get the service ticket
if (clientAction != null) {
clientAction.setServiceName(serviceName);
@@ -152,12 +152,12 @@ public class SpnegoTokenContext {
WSSecurityException.ErrorCode.FAILURE, "kerberosServiceTicketError"
);
}
-
+
secContext = clientAction.getContext();
} else {
- KerberosClientExceptionAction action =
- new KerberosClientExceptionAction(null, serviceName,
- isUsernameServiceNameForm,
+ KerberosClientExceptionAction action =
+ new KerberosClientExceptionAction(null, serviceName,
+ isUsernameServiceNameForm,
requestCredDeleg,
delegationCredential,
true,
@@ -165,14 +165,14 @@ public class SpnegoTokenContext {
KerberosContext krbCtx = null;
try {
krbCtx = (KerberosContext) Subject.doAs(clientSubject, action);
-
+
token = krbCtx.getKerberosToken();
if (token == null) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "kerberosServiceTicketError"
);
}
-
+
secContext = krbCtx.getGssContext();
} catch (PrivilegedActionException e) {
Throwable cause = e.getCause();
@@ -185,12 +185,12 @@ public class SpnegoTokenContext {
}
}
}
-
+
if (LOG.isDebugEnabled()) {
LOG.debug("Successfully retrieved a service ticket");
}
}
-
+
/**
* Validate a service ticket.
* @param jaasLoginModuleName
@@ -200,14 +200,14 @@ public class SpnegoTokenContext {
* @throws WSSecurityException
*/
public void validateServiceTicket(
- String jaasLoginModuleName,
+ String jaasLoginModuleName,
CallbackHandler callbackHandler,
String serviceName,
byte[] ticket
) throws WSSecurityException {
validateServiceTicket(jaasLoginModuleName, callbackHandler, serviceName, false, ticket);
}
-
+
/**
* Validate a service ticket.
* @param jaasLoginModuleName
@@ -217,7 +217,7 @@ public class SpnegoTokenContext {
* @throws WSSecurityException
*/
public void validateServiceTicket(
- String jaasLoginModuleName,
+ String jaasLoginModuleName,
CallbackHandler callbackHandler,
String serviceName,
boolean isUsernameServiceNameForm,
@@ -237,7 +237,7 @@ public class SpnegoTokenContext {
LOG.debug(ex.getMessage(), ex);
}
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILURE, ex, "kerberosLoginError",
+ WSSecurityException.ErrorCode.FAILURE, ex, "kerberosLoginError",
new Object[] {ex.getMessage()});
}
if (LOG.isDebugEnabled()) {
@@ -251,7 +251,7 @@ public class SpnegoTokenContext {
Set<Principal> principals = subject.getPrincipals();
if (principals.isEmpty()) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILURE,
+ WSSecurityException.ErrorCode.FAILURE,
"kerberosLoginError",
new Object[] {"No Client principals found after login"});
}
@@ -266,20 +266,20 @@ public class SpnegoTokenContext {
token = Subject.doAs(subject, serviceAction);
secContext = serviceAction.getContext();
} else {
- KerberosServiceExceptionAction action =
- new KerberosServiceExceptionAction(ticket, service,
+ KerberosServiceExceptionAction action =
+ new KerberosServiceExceptionAction(ticket, service,
isUsernameServiceNameForm, true);
KerberosServiceContext krbCtx = null;
try {
krbCtx = (KerberosServiceContext) Subject.doAs(subject, action);
-
+
token = krbCtx.getKerberosToken();
if (token == null) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "kerberosServiceTicketError"
);
}
-
+
secContext = krbCtx.getGssContext();
delegationCredential = krbCtx.getDelegationCredential();
spnegoPrincipal = krbCtx.getPrincipal();
@@ -294,12 +294,12 @@ public class SpnegoTokenContext {
}
}
}
-
+
if (LOG.isDebugEnabled()) {
LOG.debug("Successfully validated a service ticket");
}
}
-
+
/**
* Whether to enable mutual authentication or not. This only applies to retrieve service ticket.
*/
@@ -313,7 +313,7 @@ public class SpnegoTokenContext {
public byte[] getToken() {
return token;
}
-
+
/**
* Whether a connection has been established (at the service side)
*/
@@ -323,7 +323,7 @@ public class SpnegoTokenContext {
}
return secContext.isEstablished();
}
-
+
/**
* Unwrap a key
*/
@@ -340,7 +340,7 @@ public class SpnegoTokenContext {
);
}
}
-
+
/**
* Wrap a key
*/
@@ -357,21 +357,21 @@ public class SpnegoTokenContext {
);
}
}
-
+
/**
* Set a custom SpnegoClientAction implementation to use
*/
public void setSpnegoClientAction(SpnegoClientAction spnegoClientAction) {
this.clientAction = spnegoClientAction;
}
-
+
/**
* Set a custom SpnegoServiceAction implementation to use
*/
public void setSpnegoServiceAction(SpnegoServiceAction spnegoServiceAction) {
this.serviceAction = spnegoServiceAction;
}
-
+
public void clear() {
token = null;
mutualAuth = false;