Picketlink SVN: r940 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-05-17 00:57:46 -0400 (Tue, 17 May 2011)
New Revision: 940
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java
Log:
add constant
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2011-05-13 09:59:13 UTC (rev 939)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2011-05-17 04:57:46 UTC (rev 940)
@@ -33,115 +33,182 @@
*/
public interface WSTrustConstants
{
- String BASE_NAMESPACE = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
- String PREFIX = "wst";
+ String BASE_NAMESPACE = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
+ String PREFIX = "wst";
+
// WS-Trust request types
- String BATCH_ISSUE_REQUEST = BASE_NAMESPACE + "/BatchIssue";
- String ISSUE_REQUEST = BASE_NAMESPACE + "/Issue";
- String RENEW_REQUEST = BASE_NAMESPACE + "/Renew";
- String CANCEL_REQUEST = BASE_NAMESPACE + "/Cancel";
- String VALIDATE_REQUEST = BASE_NAMESPACE + "/Validate";
- String BATCH_VALIDATE_REQUEST = BASE_NAMESPACE + "/BatchValidate";
-
+ String BATCH_ISSUE_REQUEST = BASE_NAMESPACE + "/BatchIssue";
+
+ String ISSUE_REQUEST = BASE_NAMESPACE + "/Issue";
+
+ String RENEW_REQUEST = BASE_NAMESPACE + "/Renew";
+
+ String CANCEL_REQUEST = BASE_NAMESPACE + "/Cancel";
+
+ String VALIDATE_REQUEST = BASE_NAMESPACE + "/Validate";
+
+ String BATCH_VALIDATE_REQUEST = BASE_NAMESPACE + "/BatchValidate";
+
// WS-Trust validation constants.
- String STATUS_TYPE = BASE_NAMESPACE + "/RSTR/Status";
- String STATUS_CODE_VALID = BASE_NAMESPACE + "/status/valid";
- String STATUS_CODE_INVALID = BASE_NAMESPACE + "/status/invalid";
-
+ String STATUS_TYPE = BASE_NAMESPACE + "/RSTR/Status";
+
+ String STATUS_CODE_VALID = BASE_NAMESPACE + "/status/valid";
+
+ String STATUS_CODE_INVALID = BASE_NAMESPACE + "/status/invalid";
+
// WS-Trust key types.
- String KEY_TYPE_BEARER = BASE_NAMESPACE + "/Bearer";
- String KEY_TYPE_SYMMETRIC = BASE_NAMESPACE + "/SymmetricKey";
- String KEY_TYPE_PUBLIC = BASE_NAMESPACE + "/PublicKey";
-
+ String KEY_TYPE_BEARER = BASE_NAMESPACE + "/Bearer";
+
+ String KEY_TYPE_SYMMETRIC = BASE_NAMESPACE + "/SymmetricKey";
+
+ String KEY_TYPE_PUBLIC = BASE_NAMESPACE + "/PublicKey";
+
// WS-Trust binary secret types.
- String BS_TYPE_ASYMMETRIC = BASE_NAMESPACE + "/AsymmetricKey";
- String BS_TYPE_SYMMETRIC = BASE_NAMESPACE + "/SymmetricKey";
- String BS_TYPE_NONCE = BASE_NAMESPACE + "/Nonce";
-
+ String BS_TYPE_ASYMMETRIC = BASE_NAMESPACE + "/AsymmetricKey";
+
+ String BS_TYPE_SYMMETRIC = BASE_NAMESPACE + "/SymmetricKey";
+
+ String BS_TYPE_NONCE = BASE_NAMESPACE + "/Nonce";
+
// WS-Trust computed key types.
- String CK_PSHA1 = BASE_NAMESPACE + "/CK/PSHA1";
-
+ String CK_PSHA1 = BASE_NAMESPACE + "/CK/PSHA1";
+
// WSS namespaces values.
- String WSA_NS = "http://www.w3.org/2005/08/addressing";
- String WSP_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
- String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...";
- String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
- String WSSE11_NS = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd";
- String XENC_NS = "http://www.w3.org/2001/04/xmlenc#";
- String DSIG_NS = "http://www.w3.org/2000/09/xmldsig#";
- String SAML2_ASSERTION_NS = "urn:oasis:names:tc:SAML:2.0:assertion";
-
+ String WSA_NS = "http://www.w3.org/2005/08/addressing";
+
+ String WSP_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
+
+ String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...";
+
+ String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
+
+ String WSSE11_NS = "http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd";
+
+ String XENC_NS = "http://www.w3.org/2001/04/xmlenc#";
+
+ String DSIG_NS = "http://www.w3.org/2000/09/xmldsig#";
+
+ String SAML2_ASSERTION_NS = "urn:oasis:names:tc:SAML:2.0:assertion";
+
// WSS Fault codes
- QName SECURITY_TOKEN_UNAVAILABLE = new QName(WSSE_NS, "SecurityTokenUnavailable");
- QName INVALID_SECURITY_TOKEN = new QName(WSSE_NS, "InvalidSecurityToken");
- QName INVALID_SECURITY = new QName(WSSE_NS, "InvalidSecurity");
- QName FAILED_AUTHENTICATION = new QName(WSSE_NS, "FailedAuthentication");
-
+ QName SECURITY_TOKEN_UNAVAILABLE = new QName(WSSE_NS, "SecurityTokenUnavailable");
+
+ QName INVALID_SECURITY_TOKEN = new QName(WSSE_NS, "InvalidSecurityToken");
+
+ QName INVALID_SECURITY = new QName(WSSE_NS, "InvalidSecurity");
+
+ QName FAILED_AUTHENTICATION = new QName(WSSE_NS, "FailedAuthentication");
+
//Token Types
- String SAML2_TOKEN_TYPE = "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0";
- String RSTR_STATUS_TOKEN_TYPE = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/Status";
-
+ String SAML2_TOKEN_TYPE = "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0";
+
+ String RSTR_STATUS_TOKEN_TYPE = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/RSTR/Status";
+
//Element Names
- String BINARY_SECRET = "BinarySecret";
- String CREATED = "Created";
- String ENTROPY = "Entropy";
- String EXPIRES = "Expires";
- String ON_BEHALF_OF = "OnBehalfOf";
- String COMPUTED_KEY = "ComputedKey";
- String KEY_SIZE = "KeySize";
- String KEY_TYPE = "KeyType";
- String LIFETIME = "Lifetime";
- String RST = "RequestSecurityToken";
- String RSTR = "RequestSecurityTokenResponse";
- String RST_COLLECTION = "RequestSecurityTokenCollection";
- String RSTR_COLLECTION = "RequestSecurityTokenResponseCollection";
- String REQUESTED_TOKEN = "RequestedSecurityToken";
- String REQUESTED_TOKEN_CANCELLED = "RequestedTokenCancelled";
- String REQUESTED_PROOF_TOKEN = "RequestedProofToken";
- String REQUESTED_ATTACHED_REFERENCE = "RequestedAttachedReference";
- String REQUEST_TYPE = "RequestType";
- String TOKEN_TYPE = "TokenType";
- String CANCEL_TARGET = "CancelTarget";
- String RENEW_TARGET = "RenewTarget";
- String VALIDATE_TARGET = "ValidateTarget";
- String USE_KEY = "UseKey";
- String STATUS = "Status";
- String CODE = "Code";
- String REASON = "Reason";
-
+ String BINARY_SECRET = "BinarySecret";
+
+ String CREATED = "Created";
+
+ String ENTROPY = "Entropy";
+
+ String EXPIRES = "Expires";
+
+ String ISSUER = "Issuer";
+
+ String ON_BEHALF_OF = "OnBehalfOf";
+
+ String COMPUTED_KEY = "ComputedKey";
+
+ String KEY_SIZE = "KeySize";
+
+ String KEY_TYPE = "KeyType";
+
+ String LIFETIME = "Lifetime";
+
+ String RST = "RequestSecurityToken";
+
+ String RSTR = "RequestSecurityTokenResponse";
+
+ String RST_COLLECTION = "RequestSecurityTokenCollection";
+
+ String RSTR_COLLECTION = "RequestSecurityTokenResponseCollection";
+
+ String REQUESTED_TOKEN = "RequestedSecurityToken";
+
+ String REQUESTED_TOKEN_CANCELLED = "RequestedTokenCancelled";
+
+ String REQUESTED_PROOF_TOKEN = "RequestedProofToken";
+
+ String REQUESTED_ATTACHED_REFERENCE = "RequestedAttachedReference";
+
+ String REQUEST_TYPE = "RequestType";
+
+ String TOKEN_TYPE = "TokenType";
+
+ String CANCEL_TARGET = "CancelTarget";
+
+ String RENEW_TARGET = "RenewTarget";
+
+ String VALIDATE_TARGET = "ValidateTarget";
+
+ String USE_KEY = "UseKey";
+
+ String STATUS = "Status";
+
+ String CODE = "Code";
+
+ String REASON = "Reason";
+
//Attribute Names
- String RST_CONTEXT = "Context";
- String TYPE = "Type";
- String VALUE_TYPE = "ValueType";
-
- public interface XMLDSig
- {
- String DSIG_NS = "http://www.w3.org/2000/09/xmldsig#";
- String EXPONENT = "Exponent";
- String KEYINFO = "KeyInfo";
- String KEYVALUE = "KeyValue";
- String MODULUS = "Modulus";
- String DSIG_PREFIX = "ds";
- String RSA_KEYVALUE = "RSAKeyValue";
- String DSA_KEYVALUE = "DSAKeyValue";
- String X509DATA = "X509Data";
- String X509CERT = "X509Certificate";
- }
-
- public interface XMLEnc
- {
- String XMLENC_NS = "http://www.w3.org/2001/04/xmlenc#";
- String ENCRYPTED_KEY = "EncryptedKey";
- }
-
- public interface WSSE
- {
- String KEY_IDENTIFIER = "KeyIdentifier";
- String KEY_IDENTIFIER_VALUETYPE_SAML = "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID";
- String PREFIX_11 = "wsse11";
- String SECURITY_TOKEN_REFERENCE = "SecurityTokenReference";
- String USERNAME_TOKEN = "UsernameToken";
- String VALUE_TYPE = "ValueType";
- }
+ String RST_CONTEXT = "Context";
+
+ String TYPE = "Type";
+
+ String VALUE_TYPE = "ValueType";
+
+ public interface XMLDSig
+ {
+ String DSIG_NS = "http://www.w3.org/2000/09/xmldsig#";
+
+ String EXPONENT = "Exponent";
+
+ String KEYINFO = "KeyInfo";
+
+ String KEYVALUE = "KeyValue";
+
+ String MODULUS = "Modulus";
+
+ String DSIG_PREFIX = "ds";
+
+ String RSA_KEYVALUE = "RSAKeyValue";
+
+ String DSA_KEYVALUE = "DSAKeyValue";
+
+ String X509DATA = "X509Data";
+
+ String X509CERT = "X509Certificate";
+ }
+
+ public interface XMLEnc
+ {
+ String XMLENC_NS = "http://www.w3.org/2001/04/xmlenc#";
+
+ String ENCRYPTED_KEY = "EncryptedKey";
+ }
+
+ public interface WSSE
+ {
+ String KEY_IDENTIFIER = "KeyIdentifier";
+
+ String KEY_IDENTIFIER_VALUETYPE_SAML = "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLID";
+
+ String PREFIX_11 = "wsse11";
+
+ String SECURITY_TOKEN_REFERENCE = "SecurityTokenReference";
+
+ String USERNAME_TOKEN = "UsernameToken";
+
+ String VALUE_TYPE = "ValueType";
+ }
}
\ No newline at end of file
12 years, 11 months
- 1
- 0
Picketlink SVN: r939 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion.
by picketlink-commits＠lists.jboss.org
Author: jonananas
Date: 2011-05-13 05:59:13 -0400 (Fri, 13 May 2011)
New Revision: 939
Modified:
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java
federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java
Log:
Made classes serializable
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java 2011-05-12 14:13:40 UTC (rev 938)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java 2011-05-13 09:59:13 UTC (rev 939)
@@ -21,7 +21,9 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
+
/**
* <p>Java class for ActionType complex type.
*
@@ -39,8 +41,10 @@
*
*
*/
-public class ActionType {
+public class ActionType implements Serializable {
+ private static final long serialVersionUID = 1L;
+
protected String value;
protected String namespace;
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java 2011-05-12 14:13:40 UTC (rev 938)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java 2011-05-13 09:59:13 UTC (rev 939)
@@ -22,6 +22,7 @@
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -50,8 +51,9 @@
*
*
*/
-public class AdviceType
+public class AdviceType implements Serializable
{
+ private static final long serialVersionUID = 1L;
protected List<Object> advices = new ArrayList<Object>();
/**
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java 2011-05-12 14:13:40 UTC (rev 938)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java 2011-05-13 09:59:13 UTC (rev 939)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -50,8 +51,10 @@
* </pre>
*
*/
-public class AttributeType
+public class AttributeType implements Serializable
{
+ private static final long serialVersionUID = 1L;
+
protected List<Object> attributeValue = new ArrayList<Object>();
protected String name;
protected String nameFormat;
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java 2011-05-12 14:13:40 UTC (rev 938)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java 2011-05-13 09:59:13 UTC (rev 939)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
import java.net.URI;
/**
@@ -28,8 +29,9 @@
* @author Anil.Saldhana(a)redhat.com
* @since Nov 24, 2010
*/
-public class AuthnContextDeclRefType implements URIType
+public class AuthnContextDeclRefType implements URIType, Serializable
{
+ private static final long serialVersionUID = 1L;
private URI value;
public AuthnContextDeclRefType(URI value)
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java 2011-05-12 14:13:40 UTC (rev 938)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java 2011-05-13 09:59:13 UTC (rev 939)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
import java.net.URI;
/**
@@ -28,8 +29,10 @@
* @author Anil.Saldhana(a)redhat.com
* @since Nov 24, 2010
*/
-public class AuthnContextDeclType implements URIType
+public class AuthnContextDeclType implements URIType, Serializable
{
+ private static final long serialVersionUID = 1L;
+
private URI value;
public AuthnContextDeclType( URI value )
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java 2011-05-12 14:13:40 UTC (rev 938)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java 2011-05-13 09:59:13 UTC (rev 939)
@@ -21,7 +21,9 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
+
/**
* <p>Java class for ConditionAbstractType complex type.
*
@@ -38,6 +40,7 @@
*
*
*/
-public abstract class ConditionAbstractType
+public abstract class ConditionAbstractType implements Serializable
{
+ private static final long serialVersionUID = 1L;
}
\ No newline at end of file
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java 2011-05-12 14:13:40 UTC (rev 938)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java 2011-05-13 09:59:13 UTC (rev 939)
@@ -22,6 +22,7 @@
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
@@ -50,8 +51,9 @@
*
*
*/
-public class EvidenceType
+public class EvidenceType implements Serializable
{
+ private static final long serialVersionUID = 1L;
protected List<ChoiceType> evidences = new ArrayList<ChoiceType>();
/**
@@ -81,8 +83,9 @@
return Collections.unmodifiableList( evidences );
}
- public static class ChoiceType
+ public static class ChoiceType implements Serializable
{
+ private static final long serialVersionUID = 1L;
private String AssertionIDRef;
private URI AssertionURIRef;
private AssertionType assertion;
Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java 2011-05-12 14:13:40 UTC (rev 938)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java 2011-05-13 09:59:13 UTC (rev 939)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
+import java.io.Serializable;
/**
* <p>Java class for SubjectLocalityType complex type.
@@ -39,57 +40,64 @@
* </pre>
*
*
- */
-public class SubjectLocalityType
-{
- protected String address;
- protected String dnsName;
+ */
+public class SubjectLocalityType implements Serializable
+{
+ private static final long serialVersionUID = 1L;
- /**
- * Gets the value of the address property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getAddress() {
- return address;
- }
+ protected String address;
- /**
- * Sets the value of the address property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setAddress(String value) {
- this.address = value;
- }
+ protected String dnsName;
- /**
- * Gets the value of the dnsName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDNSName() {
- return dnsName;
- }
+ /**
+ * Gets the value of the address property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getAddress()
+ {
+ return address;
+ }
- /**
- * Sets the value of the dnsName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDNSName(String value) {
- this.dnsName = value;
- }
+ /**
+ * Sets the value of the address property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setAddress(String value)
+ {
+ this.address = value;
+ }
+
+ /**
+ * Gets the value of the dnsName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDNSName()
+ {
+ return dnsName;
+ }
+
+ /**
+ * Sets the value of the dnsName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDNSName(String value)
+ {
+ this.dnsName = value;
+ }
}
\ No newline at end of file
12 years, 11 months
- 1
- 0
Picketlink SVN: r938 - integration-tests/trunk/common-dist/scripts.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-05-12 10:13:40 -0400 (Thu, 12 May 2011)
New Revision: 938
Modified:
integration-tests/trunk/common-dist/scripts/stopjboss.sh
Log:
change shell
Modified: integration-tests/trunk/common-dist/scripts/stopjboss.sh
===================================================================
--- integration-tests/trunk/common-dist/scripts/stopjboss.sh 2011-05-10 23:59:53 UTC (rev 937)
+++ integration-tests/trunk/common-dist/scripts/stopjboss.sh 2011-05-12 14:13:40 UTC (rev 938)
@@ -1,2 +1,2 @@
-#!/bin/ksh
+#!/bin/bash
ps -u`whoami` -opid,comm,args | grep "org.jboss.Main" | awk '{ print $1 }' | xargs kill -9
12 years, 11 months
- 1
- 0
Picketlink SVN: r937 - trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-05-10 19:59:53 -0400 (Tue, 10 May 2011)
New Revision: 937
Modified:
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java
Log:
javadoc
Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java 2011-05-10 23:57:26 UTC (rev 936)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java 2011-05-10 23:59:53 UTC (rev 937)
@@ -375,7 +375,7 @@
/**
- * Given a binary token, create a {@link SOAPElement}
+ * Given username and pass, create a {@link SOAPElement} for WSSE UsernameToken Profile
* @param token
* @return
* @throws SOAPException
12 years, 11 months
- 1
- 0
Picketlink SVN: r936 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-05-10 19:57:26 -0400 (Tue, 10 May 2011)
New Revision: 936
Modified:
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
Log:
fall back for older versions of JBossSX
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2011-05-10 23:56:45 UTC (rev 935)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2011-05-10 23:57:26 UTC (rev 936)
@@ -447,7 +447,14 @@
{
//password is masked
String salt = (String) options.get(PicketLinkFederationConstants.SALT);
- int iterationCount = Integer.parseInt((String) options.get(PicketLinkFederationConstants.ITERATION_COUNT));
+ if (StringUtil.isNullOrEmpty(salt))
+ throw new RuntimeException("Salt is not configured as module option");
+
+ String iCount = (String) options.get(PicketLinkFederationConstants.ITERATION_COUNT);
+ if (StringUtil.isNullOrEmpty(iCount))
+ throw new RuntimeException("Iteration Count is not configured as module option");
+
+ int iterationCount = Integer.parseInt(iCount);
try
{
builder.password(StringUtil.decode(passwordString, salt, iterationCount));
@@ -682,6 +689,7 @@
}
}
+ @SuppressWarnings("deprecation")
protected void populateSubject()
{
MappingManager mappingManager = getMappingManager();
@@ -690,10 +698,26 @@
return;
}
- MappingContext<Principal> principalMappingContext = mappingManager.getMappingContext(MappingType.PRINCIPAL
- .toString());
- MappingContext<RoleGroup> roleMappingContext = mappingManager.getMappingContext(MappingType.ROLE.toString());
+ MappingContext<Principal> principalMappingContext = null;
+ MappingContext<RoleGroup> roleMappingContext = null;
+ try
+ {
+ principalMappingContext = mappingManager.getMappingContext(MappingType.PRINCIPAL.toString());
+ }
+ catch (NoSuchMethodError nse)
+ {
+ principalMappingContext = mappingManager.getMappingContext(Principal.class);
+ }
+ try
+ {
+ roleMappingContext = mappingManager.getMappingContext(MappingType.ROLE.toString());
+ }
+ catch (NoSuchMethodError nse)
+ {
+ roleMappingContext = mappingManager.getMappingContext(RoleGroup.class);
+ }
+
Map<String, Object> contextMap = new HashMap<String, Object>();
contextMap.put(SHARED_TOKEN, this.samlToken);
12 years, 11 months
- 1
- 0
Picketlink SVN: r935 - in integration-tests/trunk/picketlink-trust-tests: src/test/java/org/picketlink/test/trust/tests and 8 other directories.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-05-10 19:56:45 -0400 (Tue, 10 May 2011)
New Revision: 935
Added:
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/JBWSTokenIssuingLoginModuleUnitTestCase.java
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/ServletToWSTestCase.java
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/servlets/
integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/servlets/TestWSInvokingServlet.java
integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/
integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/
integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/jboss-web.xml
integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/jboss-wsse.xml
integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/web.xml
Modified:
integration-tests/trunk/picketlink-trust-tests/pom.xml
integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml
integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-roles.properties
integration-tests/trunk/picketlink-trust-tests/src/test/resources/webapp/WEB-INF/web.xml
Log:
add tests to verify usage of BinaryTokenHandler in outgoing WS call to STS
Modified: integration-tests/trunk/picketlink-trust-tests/pom.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/pom.xml 2011-05-10 23:52:55 UTC (rev 934)
+++ integration-tests/trunk/picketlink-trust-tests/pom.xml 2011-05-10 23:56:45 UTC (rev 935)
@@ -28,30 +28,76 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<warName>pojo-test</warName>
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<warSourceDirectory>src/test/resources/webapp</warSourceDirectory>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-pojo-test</webappDirectory>
<webResources>
<resource>
<!-- this is relative to the pom.xml directory -->
<directory>target/test-classes</directory>
<targetPath>WEB-INF/classes</targetPath>
<includes>
- <include>**/POJOBean*</include>
+ <include>**/POJOBean*</include>
<include>**/auth*</include>
</includes>
</resource>
</webResources>
</configuration>
+ <executions>
+ <execution>
+ <id>pojo</id>
+ <phase>package</phase>
+ <configuration>
+ <warName>pojo-test</warName>
+ <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+ <warSourceDirectory>src/test/resources/webapp</warSourceDirectory>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-pojo-test</webappDirectory>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>target/test-classes</directory>
+ <targetPath>WEB-INF/classes</targetPath>
+ <includes>
+ <include>**/POJOBean*</include>
+ <include>**/auth*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>binary</id>
+ <phase>package</phase>
+ <configuration>
+ <warName>binary-test</warName>
+ <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+ <warSourceDirectory>src/test/resources/binary</warSourceDirectory>
+ <webappDirectory>${project.build.directory}/${project.build.finalName}-binary-test</webappDirectory>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>target/test-classes</directory>
+ <targetPath>WEB-INF/classes</targetPath>
+ <includes>
+ <include>**/TestWSInvokingServlet.class</include>
+ </includes>
+ <excludes>
+ <exclude>binary/**</exclude>
+ </excludes>
+ </resource>
+ </webResources>
+ </configuration>
+ <goals>
+ <goal>war</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -109,6 +155,12 @@
<artifactId>picketlink-trust-jbossws</artifactId>
<version>${version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/JBWSTokenIssuingLoginModuleUnitTestCase.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/JBWSTokenIssuingLoginModuleUnitTestCase.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/JBWSTokenIssuingLoginModuleUnitTestCase.java 2011-05-10 23:56:45 UTC (rev 935)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.security.auth.Subject;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginContext;
+
+import org.jboss.security.auth.callback.JBossCallbackHandler;
+import org.junit.Before;
+import org.junit.Test;
+import org.picketlink.trust.jbossws.jaas.JBWSTokenIssuingLoginModule;
+
+/**
+ * Unit test the {@link JBWSTokenIssuingLoginModule}
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Apr 25, 2011
+ */
+public class JBWSTokenIssuingLoginModuleUnitTestCase
+{
+ @Test
+ public void testLM() throws Exception
+ {
+ System.setProperty("binary.http.header", "TEST_HEADER");
+ LoginContext lc = new LoginContext("test", new JBossCallbackHandler());
+ lc.login();
+ Subject subject = lc.getSubject();
+ assertEquals( 1, subject.getPublicCredentials().size());
+ }
+
+ @Before
+ public void setup() throws Exception
+ {
+ Configuration.setConfiguration(new Configuration()
+ {
+ @Override
+ public void refresh()
+ {
+ }
+
+ @Override
+ public AppConfigurationEntry[] getAppConfigurationEntry(String arg0)
+ {
+ Map<String,Object> options = new HashMap<String,Object>();
+ options.put("endpointAddress", "http://localhost:8080/picketlink-sts");
+ options.put("wspAppliesTo","http://services.testcorp.org/provider1");
+
+ options.put("serviceName", "PicketLinkSTS");
+ options.put("portName", "PicketLinkSTSPort");
+ options.put("inject.callerprincipal", "true");
+ options.put("groupPrincipalName", "Membership");
+ // options.put("handlerChain", "binary");
+ options.put("username", "UserA");
+ options.put("password", "PassA");
+
+ AppConfigurationEntry entry = new AppConfigurationEntry(JBWSTokenIssuingLoginModule.class.getName(),
+ LoginModuleControlFlag.REQUIRED, options);
+
+ return new AppConfigurationEntry[] {entry};
+ }
+ });
+ }
+}
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/ServletToWSTestCase.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/ServletToWSTestCase.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/tests/ServletToWSTestCase.java 2011-05-10 23:56:45 UTC (rev 935)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.junit.Test;
+
+/**
+ * A Test that passes a binary header to a servlet
+ * that is governed by the {@code PicketLinkAuthenticator}.
+ * The {@code JBWSTokenIssuingLoginModule} is invoked which
+ * calls the STS. On the call to the STS, the binary token handler
+ * kicks in and reads the binary token and adds it to the sts call.
+ *
+ * Once the SAML2 Assertion is obtained, the servlet then makes
+ * a call to the WS
+ *
+ * @author Anil.Saldhana(a)redhat.com
+ * @since May 9, 2011
+ */
+public class ServletToWSTestCase
+{
+ @Test
+ public void testServlet2WS() throws Exception
+ {
+ HttpClient client = new HttpClient();
+ PostMethod post = new PostMethod("http://localhost:8080/binary-test/TestWSInvokingServlet");
+ post.addRequestHeader("TEST_HEADER", "somevalue");
+ int result = client.executeMethod(post);
+ assertEquals(200, result);
+ }
+}
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/servlets/TestWSInvokingServlet.java
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/servlets/TestWSInvokingServlet.java (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/java/org/picketlink/test/trust/ws/servlets/TestWSInvokingServlet.java 2011-05-10 23:56:45 UTC (rev 935)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.test.trust.ws.servlets;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.Handler;
+
+import org.picketlink.test.trust.ws.WSTest;
+import org.picketlink.trust.jbossws.handler.BinaryTokenHandler;
+
+/**
+ * A Servlet that invokes a WS
+ * @author Anil.Saldhana(a)redhat.com
+ * @since May 9, 2011
+ */
+public class TestWSInvokingServlet extends HttpServlet
+{
+ private static final long serialVersionUID = 1L;
+
+ @SuppressWarnings("rawtypes")
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ System.setProperty("binary.http.header", "TEST_HEADER");
+
+ URL wsdl = new URL("http://localhost:8080/picketlink-wstest-tests/TestBean?wsdl");
+ QName serviceName = new QName("http://ws.trust.test.picketlink.org/", "TestBeanService");
+ Service service = Service.create(wsdl, serviceName);
+ WSTest port = service.getPort(new QName("http://ws.trust.test.picketlink.org/", "TestBeanPort"), WSTest.class);
+
+ BindingProvider bp = (BindingProvider) port;
+ List<Handler> handlers = bp.getBinding().getHandlerChain();
+ handlers.add(new BinaryTokenHandler());
+ bp.getBinding().setHandlerChain(handlers);
+
+ String value = port.echo("Test");
+ if( value == null || value.equals("Test") == false)
+ throw new ServletException();
+ }
+}
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/jboss-web.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/jboss-web.xml (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/jboss-web.xml 2011-05-10 23:56:45 UTC (rev 935)
@@ -0,0 +1,3 @@
+<jboss-web>
+ <security-domain>binary</security-domain>
+</jboss-web>
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/jboss-wsse.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/jboss-wsse.xml (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/jboss-wsse.xml 2011-05-10 23:56:45 UTC (rev 935)
@@ -0,0 +1,26 @@
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config
+ http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+
+ <port name="POJOBeanPort">
+ <operation name="{http://ws.trust.test.picketlink.org/}echoUnchecked">
+ <config>
+ <authorize>
+ <unchecked/>
+ </authorize>
+ </config>
+ </operation>
+
+ <operation name="{http://ws.trust.test.picketlink.org/}echo">
+ <config>
+ <authorize>
+ <role>JBossAdmin</role>
+ </authorize>
+ </config>
+ </operation>
+ </port>
+
+
+
+</jboss-ws-security>
\ No newline at end of file
Added: integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/web.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/web.xml (rev 0)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/binary/WEB-INF/web.xml 2011-05-10 23:56:45 UTC (rev 935)
@@ -0,0 +1,35 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <servlet>
+ <display-name>TestWSInvokingServlet</display-name>
+ <servlet-name>TestWSInvokingServlet</servlet-name>
+ <servlet-class>org.picketlink.test.trust.ws.servlets.TestWSInvokingServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestWSInvokingServlet</servlet-name>
+ <url-pattern>/TestWSInvokingServlet</url-pattern>
+ </servlet-mapping>
+
+ <security-constraint>
+ <display-name>Restricted POST</display-name>
+ <web-resource-collection>
+ <web-resource-name>POST</web-resource-name>
+ <url-pattern>/TestWSInvokingServlet</url-pattern>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>SECURITY_DOMAIN</auth-method>
+ <realm-name>default</realm-name>
+ </login-config>
+</web-app>
\ No newline at end of file
Modified: integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml 2011-05-10 23:52:55 UTC (rev 934)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/domains/sts-jboss-beans.xml 2011-05-10 23:56:45 UTC (rev 935)
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- ejb3 test application-policy definition -->
<application-policy xmlns="urn:jboss:security-beans:1.0" name="sts">
<authentication>
<login-module code="org.picketlink.identity.federation.bindings.jboss.auth.SAML2STSLoginModule" flag="required">
@@ -17,6 +15,33 @@
</authentication>
</application-policy>
+
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="binary">
+ <authentication>
+ <login-module code="org.picketlink.trust.jbossws.jaas.JBWSTokenIssuingLoginModule" flag="required">
+ <module-option name="endpointAddress">http://localhost:8080/picketlink-sts/PicketLinkSTS</module-option>
+ <module-option name="serviceName">PicketLinkSTS</module-option>
+ <module-option name="portName">PicketLinkSTSPort</module-option>
+ <module-option name="inject.callerprincipal">true</module-option>
+ <module-option name="handlerChain">binary</module-option>
+ <module-option name="username">admin</module-option>
+ <module-option name="password">MASK-0BbleBL2LZk=</module-option>
+ <module-option name="salt">18273645</module-option>
+ <module-option name="iterationCount">56</module-option>
+ <module-option name="useOptionsCredentials">true</module-option>
+ <module-option name="overrideDispatch">true</module-option>
+ <module-option name="wspAppliesTo">http://services.testcorp.org/provider1</module-option>
+ <module-option name="password-stacking">useFirstPass</module-option>
+ </login-module>
+
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required">
+ <module-option name="usersProperties">sts-users.properties</module-option>
+ <module-option name="rolesProperties">sts-roles.properties</module-option>
+ <module-option name="password-stacking">useFirstPass</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
<!-- ejb3 test application-policy definition -->
<application-policy xmlns="urn:jboss:security-beans:1.0" name="jmx-console">
<authentication>
@@ -26,5 +51,14 @@
</login-module>
</authentication>
</application-policy>
+
+
+ <bean name="PicketLinkTestSystemProperties"
+ class="org.jboss.varia.property.SystemPropertiesService">
+ <property name="properties">
+ binary.http.header=TEST_HEADER
+ </property>
+ </bean>
+
</deployment>
\ No newline at end of file
Modified: integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-roles.properties
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-roles.properties 2011-05-10 23:52:55 UTC (rev 934)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/props/sts-roles.properties 2011-05-10 23:56:45 UTC (rev 935)
@@ -2,4 +2,5 @@
UserA=STSClient,testRole,JBossAdmin
UserB=STSClient
UserC=STSClient
-admin=JBossAdmin
\ No newline at end of file
+admin=JBossAdmin
+custom-authenticator-user=STSClient
Modified: integration-tests/trunk/picketlink-trust-tests/src/test/resources/webapp/WEB-INF/web.xml
===================================================================
--- integration-tests/trunk/picketlink-trust-tests/src/test/resources/webapp/WEB-INF/web.xml 2011-05-10 23:52:55 UTC (rev 934)
+++ integration-tests/trunk/picketlink-trust-tests/src/test/resources/webapp/WEB-INF/web.xml 2011-05-10 23:56:45 UTC (rev 935)
@@ -7,7 +7,7 @@
<servlet-name>POJOBeanService</servlet-name>
<servlet-class>org.picketlink.test.trust.ws.POJOBean</servlet-class>
<load-on-startup>1</load-on-startup>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>POJOBeanService</servlet-name>
<url-pattern>/POJOBeanService</url-pattern>
12 years, 11 months
- 1
- 0
Picketlink SVN: r934 - in trust/trunk/jbossws: src/main/java/org/picketlink/trust/jbossws and 1 other directory.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-05-10 19:52:55 -0400 (Tue, 10 May 2011)
New Revision: 934
Modified:
trust/trunk/jbossws/.classpath
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/Constants.java
Log:
new const
Modified: trust/trunk/jbossws/.classpath
===================================================================
--- trust/trunk/jbossws/.classpath 2011-05-10 23:52:39 UTC (rev 933)
+++ trust/trunk/jbossws/.classpath 2011-05-10 23:52:55 UTC (rev 934)
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1.jar" sourcepath="M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jaxbintros/jboss-jaxb-intros/1.0.2.GA/jboss-jaxb-intros-1.0.2.GA.jar" sourcepath="M2_REPO/jboss/jaxbintros/jboss-jaxb-intros/1.0.2.GA/jboss-jaxb-intros-1.0.2.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/xml/ws/jboss-jaxws-api_2.2_spec/1.0.0.Final/jboss-jaxws-api_2.2_spec-1.0.0.Final.jar" sourcepath="M2_REPO/org/jboss/spec/javax/xml/ws/jboss-jaxws-api_2.2_spec/1.0.0.Final/jboss-jaxws-api_2.2_spec-1.0.0.Final-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketbox/jboss-security-spi/3.0.0.Final/jboss-security-spi-3.0.0.Final.jar" sourcepath="M2_REPO/org/picketbox/jboss-security-spi/3.0.0.Final/jboss-security-spi-3.0.0.Final-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketbox/jbosssx/3.0.0.Final/jbosssx-3.0.0.Final.jar" sourcepath="M2_REPO/org/picketbox/jbosssx/3.0.0.Final/jbosssx-3.0.0.Final-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/1.4.1.GA/jbossws-common-1.4.1.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-common/1.4.1.GA/jbossws-common-1.4.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.4.1.GA/jbossws-spi-1.4.1.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-spi/1.4.1.GA/jbossws-spi-1.4.1.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-bindings/2.0.0-SNAPSHOT/picketlink-bindings-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-bindings/2.0.0-SNAPSHOT/picketlink-bindings-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-bindings-jboss/2.0.0-SNAPSHOT/picketlink-bindings-jboss-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-bindings-jboss/2.0.0-SNAPSHOT/picketlink-bindings-jboss-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed-api/2.0.0-SNAPSHOT/picketlink-fed-api-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed-api/2.0.0-SNAPSHOT/picketlink-fed-api-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed-core/2.0.0-SNAPSHOT/picketlink-fed-core-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed-core/2.0.0-SNAPSHOT/picketlink-fed-core-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed-model/2.0.0-SNAPSHOT/picketlink-fed-model-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed-model/2.0.0-SNAPSHOT/picketlink-fed-model-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-web/2.0.0-SNAPSHOT/picketlink-web-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-web/2.0.0-SNAPSHOT/picketlink-web-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-xmlsec-model/2.0.0-SNAPSHOT/picketlink-xmlsec-model-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-xmlsec-model/2.0.0-SNAPSHOT/picketlink-xmlsec-model-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.3/xmlsec-1.4.3.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1.jar" sourcepath="M2_REPO/org/apache/ant/ant/1.7.1/ant-1.7.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/security/jacc/jboss-jacc-api_1.4_spec/1.0.0.Final/jboss-jacc-api_1.4_spec-1.0.0.Final.jar" sourcepath="M2_REPO/org/jboss/spec/javax/security/jacc/jboss-jacc-api_1.4_spec/1.0.0.Final/jboss-jacc-api_1.4_spec-1.0.0.Final-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jaxbintros/jboss-jaxb-intros/1.0.2.GA/jboss-jaxb-intros-1.0.2.GA.jar" sourcepath="M2_REPO/jboss/jaxbintros/jboss-jaxb-intros/1.0.2.GA/jboss-jaxb-intros-1.0.2.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/xml/ws/jboss-jaxws-api_2.2_spec/1.0.0.Final/jboss-jaxws-api_2.2_spec-1.0.0.Final.jar" sourcepath="M2_REPO/org/jboss/spec/javax/xml/ws/jboss-jaxws-api_2.2_spec/1.0.0.Final/jboss-jaxws-api_2.2_spec-1.0.0.Final-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketbox/jboss-security-spi/3.0.0.Final/jboss-security-spi-3.0.0.Final.jar" sourcepath="M2_REPO/org/picketbox/jboss-security-spi/3.0.0.Final/jboss-security-spi-3.0.0.Final-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar" sourcepath="M2_REPO/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketbox/jbosssx/3.0.0.Final/jbosssx-3.0.0.Final.jar" sourcepath="M2_REPO/org/picketbox/jbosssx/3.0.0.Final/jbosssx-3.0.0.Final-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-common/1.4.1.GA/jbossws-common-1.4.1.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-common/1.4.1.GA/jbossws-common-1.4.1.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.4.1.GA/jbossws-spi-1.4.1.GA.jar" sourcepath="M2_REPO/org/jboss/ws/jbossws-spi/1.4.1.GA/jbossws-spi-1.4.1.GA-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.4/jbossxacml-2.0.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/openid4java/openid4java-nodeps/0.9.5/openid4java-nodeps-0.9.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-bindings/2.0.0-SNAPSHOT/picketlink-bindings-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-bindings/2.0.0-SNAPSHOT/picketlink-bindings-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-bindings-jboss/2.0.0-SNAPSHOT/picketlink-bindings-jboss-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-bindings-jboss/2.0.0-SNAPSHOT/picketlink-bindings-jboss-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed/2.0.0-SNAPSHOT/picketlink-fed-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed-api/2.0.0-SNAPSHOT/picketlink-fed-api-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed-api/2.0.0-SNAPSHOT/picketlink-fed-api-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed-core/2.0.0-SNAPSHOT/picketlink-fed-core-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed-core/2.0.0-SNAPSHOT/picketlink-fed-core-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-fed-model/2.0.0-SNAPSHOT/picketlink-fed-model-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-fed-model/2.0.0-SNAPSHOT/picketlink-fed-model-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-web/2.0.0-SNAPSHOT/picketlink-web-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-web/2.0.0-SNAPSHOT/picketlink-web-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/picketlink/picketlink-xmlsec-model/2.0.0-SNAPSHOT/picketlink-xmlsec-model-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/picketlink/picketlink-xmlsec-model/2.0.0-SNAPSHOT/picketlink-xmlsec-model-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.3/xmlsec-1.4.3.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/Constants.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-05-10 23:52:39 UTC (rev 933)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/Constants.java 2011-05-10 23:52:55 UTC (rev 934)
@@ -40,7 +40,12 @@
public static final String WSSE_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
public static final String WSSE_BINARY_SECURITY_TOKEN = "BinarySecurityToken";
+ public static final String WSSE_USERNAME_TOKEN = "UsernameToken";
+ public static final String WSSE_USERNAME = "Username";
+ public static final String WSSE_PASSWORD = "Password";
+ public static final String WSSE_PASSWORD_TEXT_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...";
+
public static final String WSSE_ENCODING_TYPE = "EncodingType";
public static final String WSSE_VALUE_TYPE = "ValueType";
12 years, 11 months
- 1
- 0
Picketlink SVN: r933 - trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-05-10 19:52:39 -0400 (Tue, 10 May 2011)
New Revision: 933
Added:
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java
Log:
alternative impl of Dispatch
Added: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java (rev 0)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java 2011-05-10 23:52:39 UTC (rev 933)
@@ -0,0 +1,406 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.picketlink.trust.jbossws;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Future;
+
+import javax.security.jacc.PolicyContext;
+import javax.security.jacc.PolicyContextException;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.bind.JAXBContext;
+import javax.xml.namespace.QName;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.ws.AsyncHandler;
+import javax.xml.ws.Binding;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.Response;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator;
+import org.picketlink.identity.federation.core.util.Base64;
+import org.picketlink.identity.federation.core.util.StringUtil;
+import org.picketlink.identity.federation.core.util.TransformerUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+/**
+ * <p>
+ * A concrete implementation of {@code Dispatch}
+ * that can be used as an alternative to the
+ * underlying JAXWS implementation.
+ * </p>
+ * <p>
+ * This is used by setting the module option "overrideDispatch"
+ * to true in the {@code JBWSTokenIssuingLoginModule}
+ * </p>
+ * @author Anil.Saldhana(a)redhat.com
+ * @since May 10, 2011
+ */
+public class PicketLinkDispatch implements Dispatch<Source>
+{
+ @SuppressWarnings("rawtypes")
+ private Dispatch parent;
+ private String endpoint;
+
+ private boolean useWSSE = false;
+
+ @SuppressWarnings("rawtypes")
+ public PicketLinkDispatch(Dispatch parent, String endpoint)
+ {
+ this.parent = parent;
+ this.endpoint = endpoint;
+ }
+
+ public void setUseWSSE(boolean val)
+ {
+ this.useWSSE = val;
+ }
+
+ public Map<String, Object> getRequestContext()
+ {
+ return parent.getRequestContext();
+ }
+
+ public Map<String, Object> getResponseContext()
+ {
+ return parent.getResponseContext();
+ }
+
+ public Binding getBinding()
+ {
+ return parent.getBinding();
+ }
+
+ public EndpointReference getEndpointReference()
+ {
+ return parent.getEndpointReference();
+ }
+
+ public <T extends EndpointReference> T getEndpointReference(Class<T> clazz)
+ {
+ return parent.getEndpointReference(clazz);
+ }
+
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ public Source invoke(Source msg)
+ {
+ PLMessageContext msgContext = new PLMessageContext();
+ msgContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE);
+
+ /** The JACC PolicyContext key for the current Subject */
+ String WEB_REQUEST_KEY = "javax.servlet.http.HttpServletRequest";
+
+ HttpServletRequest request = null;
+ try
+ {
+ request = (HttpServletRequest) PolicyContext.getContext(WEB_REQUEST_KEY);
+ }
+ catch (PolicyContextException e1)
+ {
+ throw new RuntimeException(e1);
+ }
+ msgContext.put(MessageContext.SERVLET_REQUEST, request);
+
+ MessageFactory messageFactory = null ;
+ SOAPMessage soapMessage = null;
+
+ try
+ {
+ messageFactory = MessageFactory.newInstance();
+ soapMessage = messageFactory.createMessage();
+ }
+ catch (SOAPException e)
+ {
+ throw new RuntimeException( e );
+ }
+
+ String userName = (String) parent.getRequestContext().get(BindingProvider.USERNAME_PROPERTY);
+ String passwd = (String) parent.getRequestContext().get(BindingProvider.PASSWORD_PROPERTY);
+ if( StringUtil.isNotNull(userName))
+ {
+ try
+ {
+ if(useWSSE)
+ {
+ SOAPElement security = create(userName, passwd);
+ soapMessage.getSOAPHeader().appendChild(security);
+ }
+ else
+ {
+ String authorization = Base64.encodeBytes((userName+":"+passwd).getBytes());
+ soapMessage.getMimeHeaders().addHeader("Authorization", "Basic "+authorization);
+ }
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ msgContext.setMessage(soapMessage);
+ DOMResult domresult = new DOMResult();
+ try
+ {
+ TransformerUtil.getTransformer().transform(msg, domresult);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ Node doc = domresult.getNode();
+
+
+ try
+ {
+ soapMessage.getSOAPBody().addDocument((Document) doc);
+ }
+ catch (SOAPException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ List<Handler> handlers = getBinding().getHandlerChain();
+ for( Handler handler: handlers)
+ {
+ boolean result = handler.handleMessage(msgContext);
+ if( !result)
+ throw new WebServiceException("Handler "+ handler.getClass() + " returned false");
+ }
+
+ SOAPBody body;
+ try
+ {
+ SOAPConnectionFactory connectFactory = SOAPConnectionFactory.newInstance();
+ SOAPConnection connection = connectFactory.createConnection();
+ //Send it across the wire
+ URL url = new URL(endpoint);
+
+ SOAPMessage response = connection.call(soapMessage, url);
+ body = response.getSOAPBody();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ DOMSource resultSource = new DOMSource(body.getFirstChild());
+
+ return resultSource;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Response<Source> invokeAsync(Source msg)
+ {
+ return parent.invokeAsync(msg);
+ }
+
+ @SuppressWarnings("unchecked")
+ public Future<?> invokeAsync(Source msg, AsyncHandler<Source> handler)
+ {
+ return parent.invokeAsync(msg, handler);
+ }
+
+ @SuppressWarnings("unchecked")
+ public void invokeOneWay(Source msg)
+ {
+ parent.invokeOneWay(msg);
+ }
+
+ public static class PLMessageContext implements MessageContext, SOAPMessageContext
+ {
+ private Map<String,Object> map = new HashMap<String,Object>();
+ private Map<String,Scope> scopeMap = new HashMap<String, MessageContext.Scope>();
+
+ private Map<String,Object> properties = new HashMap<String, Object>();
+
+ private SOAPMessage message;
+
+ public int size()
+ {
+ return map.size();
+ }
+
+ public boolean isEmpty()
+ {
+ return map.isEmpty();
+ }
+
+ public boolean containsKey(Object key)
+ {
+ return map.containsKey(key);
+ }
+
+ public boolean containsValue(Object value)
+ {
+ return map.containsValue(value);
+ }
+
+ public Object get(Object key)
+ {
+ return map.get(key);
+ }
+
+ public Object put(String key, Object value)
+ {
+ return map.put(key, value);
+ }
+
+ public Object remove(Object key)
+ {
+ return map.remove(key);
+ }
+
+ public void putAll(Map<? extends String, ? extends Object> m)
+ {
+ map.putAll(m);
+ }
+
+ public void clear()
+ {
+ map.clear();
+ }
+
+ public Set<String> keySet()
+ {
+ return map.keySet();
+ }
+
+ public Collection<Object> values()
+ {
+ return map.values();
+ }
+
+ public Set<java.util.Map.Entry<String, Object>> entrySet()
+ {
+ return map.entrySet();
+ }
+
+ public void setScope(String name, Scope scope)
+ {
+ this.scopeMap.put(name, scope);
+ }
+
+ public Scope getScope(String name)
+ {
+ return scopeMap.get(name);
+ }
+
+ public boolean containsProperty(String name)
+ {
+ return properties.containsKey(name);
+ }
+
+ public Object getProperty(String name)
+ {
+ return properties.get(name);
+ }
+
+ @SuppressWarnings("rawtypes")
+ public Iterator getPropertyNames()
+ {
+ return properties.keySet().iterator();
+ }
+
+ public void removeProperty(String name)
+ {
+ properties.remove(name);
+ }
+
+ public void setProperty(String name, Object value)
+ {
+ properties.put(name, value);
+ }
+
+ public SOAPMessage getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage(SOAPMessage message)
+ {
+ this.message = message;
+ }
+
+ public Object[] getHeaders(QName header, JAXBContext context, boolean allRoles)
+ {
+ throw new RuntimeException();
+ }
+
+ public Set<String> getRoles()
+ {
+ throw new RuntimeException();
+ }
+ }
+
+
+ /**
+ * Given a binary token, create a {@link SOAPElement}
+ * @param token
+ * @return
+ * @throws SOAPException
+ */
+ private SOAPElement create(String userName, String pass) throws SOAPException
+ {
+ SOAPFactory factory = SOAPFactory.newInstance();
+ SOAPElement security = factory.createElement(Constants.WSSE_LOCAL, Constants.WSSE_PREFIX, Constants.WSSE_NS);
+ security.addNamespaceDeclaration(Constants.WSU_PREFIX, Constants.WSU_NS);
+
+
+ SOAPElement userNameToken = factory.createElement(Constants.WSSE_USERNAME_TOKEN, Constants.WSSE_PREFIX, Constants.WSSE_NS);
+ userNameToken.addAttribute(new QName(Constants.WSU_NS,"Id",Constants.WSU_PREFIX), IDGenerator.create("token-"));
+
+ SOAPElement un = factory.createElement(Constants.WSSE_USERNAME, Constants.WSSE_PREFIX, Constants.WSSE_NS);
+ un.addTextNode(userName);
+ userNameToken.addChildElement(un);
+
+ SOAPElement passElement = factory.createElement(Constants.WSSE_PASSWORD, Constants.WSSE_PREFIX, Constants.WSSE_NS);
+ passElement.addAttribute(new QName("Type"), Constants.WSSE_PASSWORD_TEXT_NS);
+ passElement.addTextNode(pass);
+ userNameToken.addChildElement(passElement);
+
+
+ security.addChildElement(userNameToken);
+ return security;
+ }
+}
\ No newline at end of file
12 years, 11 months
- 1
- 0
Picketlink SVN: r932 - trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-05-10 19:52:16 -0400 (Tue, 10 May 2011)
New Revision: 932
Modified:
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java
Log:
use overrideDispatch if needed
Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java
===================================================================
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java 2011-05-10 23:51:18 UTC (rev 931)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java 2011-05-10 23:52:16 UTC (rev 932)
@@ -21,18 +21,26 @@
*/
package org.picketlink.trust.jbossws.jaas;
+import java.security.Principal;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import javax.security.auth.login.LoginException;
import javax.xml.transform.Source;
-import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Binding;
import javax.xml.ws.Dispatch;
import javax.xml.ws.handler.Handler;
+import org.jboss.logging.Logger;
+import org.picketlink.identity.federation.bindings.jboss.subject.PicketLinkPrincipal;
+import org.picketlink.identity.federation.core.util.StringUtil;
import org.picketlink.identity.federation.core.wstrust.STSClient;
import org.picketlink.identity.federation.core.wstrust.STSClientConfig;
import org.picketlink.identity.federation.core.wstrust.STSClientConfig.Builder;
+import org.picketlink.identity.federation.core.wstrust.SamlCredential;
import org.picketlink.identity.federation.core.wstrust.auth.STSIssuingLoginModule;
+import org.picketlink.trust.jbossws.PicketLinkDispatch;
import org.picketlink.trust.jbossws.handler.BinaryTokenHandler;
import org.picketlink.trust.jbossws.handler.SAML2Handler;
@@ -67,10 +75,43 @@
protected STSClient createWSTrustClient(STSClientConfig config)
{
return new JBWSTokenClient(config,options);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public boolean commit() throws LoginException
+ {
+ boolean result = super.commit();
+ if( result )
+ {
+ SamlCredential samlCredential = null;
+ Set<Object> creds = subject.getPublicCredentials();
+ for(Object cred: creds)
+ {
+ if( cred instanceof SamlCredential)
+ {
+ samlCredential = (SamlCredential) cred;
+ break;
+ }
+ }
+ if(samlCredential == null)
+ throw new LoginException("SamlCredential is not available in subject");
+ Principal principal = new PicketLinkPrincipal("");
+ if (super.isUseFirstPass())
+ {
+ this.sharedState.put("javax.security.auth.login.name", principal);
+ super.sharedState.put("javax.security.auth.login.password", samlCredential);
+ }
+
+ }
+ return result;
}
-
+
public class JBWSTokenClient extends STSClient
{
+ private Logger log = Logger.getLogger(JBWSTokenClient.class);
+ private boolean trace = log.isTraceEnabled();
+
public JBWSTokenClient()
{
super();
@@ -88,10 +129,26 @@
//Get pre-constructed Dispatch from super
Dispatch<Source> dispatch = super.getDispatch();
-
- BindingProvider bp = (BindingProvider) dispatch;
- List<Handler> handlers = bp.getBinding().getHandlerChain();
+
+ String overrideDispatchStr = (String) options.get("overrideDispatch");
+ if( StringUtil.isNotNull(overrideDispatchStr))
+ {
+ boolean bool = Boolean.valueOf(overrideDispatchStr);
+ if( bool )
+ {
+ dispatch = new PicketLinkDispatch(dispatch, (String) options.get("endpointAddress"));
+ String useWSSE = (String) options.get("useWSSE");
+ if( StringUtil.isNotNull(useWSSE) && useWSSE.equalsIgnoreCase("true"))
+ {
+ ((PicketLinkDispatch)dispatch).setUseWSSE(true);
+ }
+ }
+ }
+ Binding binding = dispatch.getBinding();
+
+ List<Handler> handlers = binding.getHandlerChain();
+
String handlerStr = (String) options.get("handlerChain");
//Lets utilize the login module options
@@ -107,15 +164,22 @@
handlers.add(samlHandler);
}
- bp.getBinding().setHandlerChain(handlers);
+ binding.setHandlerChain(handlers);
- //Check if we have security domain factory installed
- String secDomainFactory = SecurityActions.getSystemProperty("org.jboss.security.ssl.server.domain.name", null);
- if(secDomainFactory != null )
+ setDispatch(dispatch);
+
+ String securityDomainForFactory = (String) options.get("securityDomainForFactory");
+ if( StringUtil.isNotNull(securityDomainForFactory))
{
+ if(trace)
+ {
+ log.trace("We got security domain for domain ssl factory = " + securityDomainForFactory);
+ log.trace("Setting it on the system property org.jboss.security.ssl.domain.name");
+ }
+ SecurityActions.setSystemProperty("org.jboss.security.ssl.domain.name", securityDomainForFactory);
//StubExt.PROPERTY_SOCKET_FACTORY
- bp.getRequestContext().put( "org.jboss.ws.socketFactory",
- "org.jboss.security.ssl.JaasSecurityDomainServerSocketFactory");
+ dispatch.getRequestContext().put( "org.jboss.ws.socketFactory",
+ "org.jboss.security.ssl.JaasSecurityDomainSocketFactory");
}
}
}
12 years, 11 months
- 1
- 0
Picketlink SVN: r931 - trust/trunk/jbossws.
by picketlink-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2011-05-10 19:51:18 -0400 (Tue, 10 May 2011)
New Revision: 931
Modified:
trust/trunk/jbossws/pom.xml
Log:
add Jacc api for PolicyContext usage
Modified: trust/trunk/jbossws/pom.xml
===================================================================
--- trust/trunk/jbossws/pom.xml 2011-05-10 23:50:51 UTC (rev 930)
+++ trust/trunk/jbossws/pom.xml 2011-05-10 23:51:18 UTC (rev 931)
@@ -88,10 +88,14 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
- <scope>test</scope>
+ <scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
+ <version>1.0.0.Final</version>
+ </dependency>
-
</dependencies>
<reporting>
12 years, 11 months
- 1
- 0