Author: veithen
Date: Sat Oct 29 21:40:27 2011
New Revision: 1195044
URL: http://svn.apache.org/viewvc?rev=1195044&view=rev
Log:
Replaced tabs by spaces and fixed some other formatting issues.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/STSMessageReceiver.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenValidator.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerConfig.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLAttributeCallback.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallback.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallbackHandler.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLNameIdentifierCallback.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SignKeyHolder.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java
Sat Oct 29 21:40:27 2011
@@ -33,7 +33,7 @@ import org.apache.axiom.om.OMElement;
*
*/
public class EncryptedKeyToken extends Token {
-
+
/**
* SHA1 value of the encrypted key
*/
@@ -42,29 +42,29 @@ public class EncryptedKeyToken extends T
public EncryptedKeyToken(){
super();
}
-
- public EncryptedKeyToken (String id,Date created, Date expires) {
- super(id,created,expires);
- }
-
- public EncryptedKeyToken (String id, OMElement tokenElem,
- Date created, Date expires)throws
TrustException{
- super(id,tokenElem,created,expires);
- }
-
- /**
- * @param sha SHA1 of the encrypted key
- */
- public void setSHA1(String sha) {
- this.sha = sha;
- }
-
- /**
- * @return SHA1 value of the encrypted key
- */
- public String getSHA1() {
- return sha;
- }
+
+ public EncryptedKeyToken (String id,Date created, Date expires) {
+ super(id,created,expires);
+ }
+
+ public EncryptedKeyToken (String id, OMElement tokenElem,
+ Date created, Date expires)throws
TrustException{
+ super(id,tokenElem,created,expires);
+ }
+
+ /**
+ * @param sha SHA1 of the encrypted key
+ */
+ public void setSHA1(String sha) {
+ this.sha = sha;
+ }
+
+ /**
+ * @return SHA1 value of the encrypted key
+ */
+ public String getSHA1() {
+ return sha;
+ }
public void writeExternal(ObjectOutput out)
throws IOException {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
Sat Oct 29 21:40:27 2011
@@ -126,8 +126,8 @@ public class RahasConstants {
public static final String TOK_TYPE_SAML_20 =
"http://docs.oasis-open.org/wss/"; +
"oasis-wss-saml-token-profile-1.1#SAMLV2.0";
//Attrs
- public static final String ATTR_TYPE = "Type";
- public static final String ATTR_CLAIMS_DIALECT = "Dialect";
+ public static final String ATTR_TYPE = "Type";
+ public static final String ATTR_CLAIMS_DIALECT = "Dialect";
//Constants required for SAML2 assertion generation
public final static String X509_CERT ="X509Certificate";
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
Sat Oct 29 21:40:27 2011
@@ -305,15 +305,15 @@ public class RahasData {
*
*/
private void processClaims() throws TrustException{
- claimElem = this.rstElement
- .getFirstChildWithName(new QName(this.wstNs,
-
RahasConstants.IssuanceBindingLocalNames.CLAIMS));
-
- if(claimElem != null){
- claimDialect = claimElem.getAttributeValue(new
QName(this.wstNs,
-
RahasConstants.ATTR_CLAIMS_DIALECT));
- }
-
+ claimElem = this.rstElement
+ .getFirstChildWithName(new QName(this.wstNs,
+ RahasConstants.IssuanceBindingLocalNames.CLAIMS));
+
+ if(claimElem != null){
+ claimDialect = claimElem.getAttributeValue(new QName(this.wstNs,
+ RahasConstants.ATTR_CLAIMS_DIALECT));
+ }
+
}
private void processValidateTarget()throws TrustException{
@@ -335,7 +335,7 @@ public class RahasData {
if (str.containsReference()) {
tokenId = str.getReference().getURI();
} else if(str.containsKeyIdentifier()){
- tokenId = str.getKeyIdentifierValue();
+ tokenId = str.getKeyIdentifierValue();
}
} catch (WSSecurityException e) {
throw new TrustException("errorExtractingTokenId",e);
@@ -361,7 +361,7 @@ public class RahasData {
if (str.containsReference()) {
tokenId = str.getReference().getURI();
} else if(str.containsKeyIdentifier()){
- tokenId = str.getKeyIdentifierValue();
+ tokenId = str.getKeyIdentifierValue();
}
if(tokenId == null){
if(str.containsKeyIdentifier()){
@@ -535,13 +535,13 @@ public class RahasData {
this.ephmeralKey = ephmeralKey;
}
- public String getClaimDialect() {
- return claimDialect;
- }
-
- public OMElement getClaimElem() {
- return claimElem;
- }
+ public String getClaimDialect() {
+ return claimDialect;
+ }
+
+ public OMElement getClaimElem() {
+ return claimElem;
+ }
public OMElement getAppliesToEpr() {
return appliesToEpr;
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/STSMessageReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/STSMessageReceiver.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/STSMessageReceiver.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/STSMessageReceiver.java
Sat Oct 29 21:40:27 2011
@@ -29,7 +29,7 @@ import javax.xml.namespace.QName;
public class STSMessageReceiver extends AbstractInOutMessageReceiver {
- private static final Log log =
LogFactory.getLog(STSMessageReceiver.class);
+ private static final Log log = LogFactory.getLog(STSMessageReceiver.class);
public void invokeBusinessLogic(MessageContext inMessage,
MessageContext outMessage) throws AxisFault {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
Sat Oct 29 21:40:27 2011
@@ -231,7 +231,7 @@ public class SimpleTokenStore implements
} else if(child.getQName().equals(Reference.TOKEN)) {
String uri = child.getAttributeValue(new QName("URI"));
if (uri.charAt(0) == '#') {
- uri = uri.substring(1);
+ uri = uri.substring(1);
}
return uri;
} else {
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
Sat Oct 29 21:40:27 2011
@@ -49,9 +49,9 @@ public class TokenRequestDispatcher {
public SOAPEnvelope handle(MessageContext inMsgCtx,
MessageContext outMsgCtx) throws TrustException
{
- if(mlog.isDebugEnabled()){
- mlog.debug("*********************** TokenRequestDispatcher
received \n"+inMsgCtx.getEnvelope());
- }
+ if(mlog.isDebugEnabled()){
+ mlog.debug("*********************** TokenRequestDispatcher
received \n"+inMsgCtx.getEnvelope());
+ }
RahasData data = new RahasData(inMsgCtx);
String reqType = data.getRequestType();
@@ -72,8 +72,8 @@ public class TokenRequestDispatcher {
outMsgCtx.getOptions().setAction(issuer.getResponseAction(data));
if(mlog.isDebugEnabled()){
- mlog.debug("***********************
TokenRequestDispatcher sent out \n"+response);
- }
+ mlog.debug("*********************** TokenRequestDispatcher
sent out \n"+response);
+ }
return response;
} else if((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_VALIDATE).equals(reqType) ||
@@ -94,9 +94,9 @@ public class TokenRequestDispatcher {
RahasConstants.RSTR_ACTION_VALIDATE));
return response;
-
-
-
+
+
+
} else if((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_RENEW).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_RENEW).equals(reqType)) {
log.debug("renew");
@@ -114,8 +114,8 @@ public class TokenRequestDispatcher {
TrustUtil.getActionValue(data.getVersion(),
RahasConstants.RSTR_ACTION_RENEW));
- return response;
-
+ return response;
+
} else if((RahasConstants.WST_NS_05_02 +
RahasConstants.REQ_TYPE_CANCEL).equals(reqType) ||
(RahasConstants.WST_NS_05_12 +
RahasConstants.REQ_TYPE_CANCEL).equals(reqType)) {
log.debug("cancel");
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
Sat Oct 29 21:40:27 2011
@@ -246,63 +246,63 @@ public class TrustUtil {
}
/**
- * Create and add wst:AttachedReference element
- *
- * @param rstrElem
- * wst:RequestSecurityToken element
- * @param id
- * Token identifier
- * @throws TrustException
- */
+ * Create and add wst:AttachedReference element
+ *
+ * @param rstrElem
+ * wst:RequestSecurityToken element
+ * @param id
+ * Token identifier
+ * @throws TrustException
+ */
public static void createRequestedAttachedRef(OMElement rstrElem, String
id, int version)
- throws TrustException {
- OMFactory fac = null;
- OMElement rar = null;
- OMElement str = null;
- OMElement ki = null;
-
- String ns = TrustUtil.getWSTNamespace(version);
- fac = rstrElem.getOMFactory();
- rar = fac.createOMElement(new QName(ns,
-
RahasConstants.IssuanceBindingLocalNames.REQUESTED_ATTACHED_REFERENCE,
- RahasConstants.WST_PREFIX), rstrElem);
- str = fac.createOMElement(new QName(WSConstants.WSSE_NS,
-
SecurityTokenReference.SECURITY_TOKEN_REFERENCE, WSConstants.WSSE_PREFIX), rar);
- ki = fac.createOMElement(new QName(WSConstants.WSSE_NS,
"KeyIdentifier",
- WSConstants.WSSE_PREFIX), str);
- ki.addAttribute("ValueType",
WSConstants.WSS_SAML_KI_VALUE_TYPE, null);
- ki.setText(id);
- }
-
- /**
- * Create and add wst:UnattachedReference element
- *
- * @param rstrElem
- * wst:RequestSecurityToken element
- * @param id
- * Token identifier
- * @throws TrustException
- */
- public static void createRequestedUnattachedRef(OMElement rstrElem,
String id, int version)
- throws TrustException {
- OMFactory fac = null;
- OMElement rar = null;
- OMElement str = null;
- OMElement ki = null;
-
- String ns = TrustUtil.getWSTNamespace(version);
- fac = rstrElem.getOMFactory();
- rar = fac.createOMElement(new QName(ns,
-
RahasConstants.IssuanceBindingLocalNames.REQUESTED_UNATTACHED_REFERENCE,
- RahasConstants.WST_PREFIX), rstrElem);
- str = fac.createOMElement(new QName(WSConstants.WSSE_NS,
-
SecurityTokenReference.SECURITY_TOKEN_REFERENCE, WSConstants.WSSE_PREFIX), rar);
- ki = fac.createOMElement(new QName(WSConstants.WSSE_NS,
"KeyIdentifier",
- WSConstants.WSSE_PREFIX), str);
-
- ki.addAttribute("ValueType",
WSConstants.WSS_SAML_KI_VALUE_TYPE, null);
- ki.setText(id);
- }
+ throws TrustException {
+ OMFactory fac = null;
+ OMElement rar = null;
+ OMElement str = null;
+ OMElement ki = null;
+
+ String ns = TrustUtil.getWSTNamespace(version);
+ fac = rstrElem.getOMFactory();
+ rar = fac.createOMElement(new QName(ns,
+
RahasConstants.IssuanceBindingLocalNames.REQUESTED_ATTACHED_REFERENCE,
+ RahasConstants.WST_PREFIX), rstrElem);
+ str = fac.createOMElement(new QName(WSConstants.WSSE_NS,
+ SecurityTokenReference.SECURITY_TOKEN_REFERENCE,
WSConstants.WSSE_PREFIX), rar);
+ ki = fac.createOMElement(new QName(WSConstants.WSSE_NS,
"KeyIdentifier",
+ WSConstants.WSSE_PREFIX), str);
+ ki.addAttribute("ValueType", WSConstants.WSS_SAML_KI_VALUE_TYPE, null);
+ ki.setText(id);
+ }
+
+ /**
+ * Create and add wst:UnattachedReference element
+ *
+ * @param rstrElem
+ * wst:RequestSecurityToken element
+ * @param id
+ * Token identifier
+ * @throws TrustException
+ */
+ public static void createRequestedUnattachedRef(OMElement rstrElem, String
id, int version)
+ throws TrustException {
+ OMFactory fac = null;
+ OMElement rar = null;
+ OMElement str = null;
+ OMElement ki = null;
+
+ String ns = TrustUtil.getWSTNamespace(version);
+ fac = rstrElem.getOMFactory();
+ rar = fac.createOMElement(new QName(ns,
+
RahasConstants.IssuanceBindingLocalNames.REQUESTED_UNATTACHED_REFERENCE,
+ RahasConstants.WST_PREFIX), rstrElem);
+ str = fac.createOMElement(new QName(WSConstants.WSSE_NS,
+ SecurityTokenReference.SECURITY_TOKEN_REFERENCE,
WSConstants.WSSE_PREFIX), rar);
+ ki = fac.createOMElement(new QName(WSConstants.WSSE_NS,
"KeyIdentifier",
+ WSConstants.WSSE_PREFIX), str);
+
+ ki.addAttribute("ValueType", WSConstants.WSS_SAML_KI_VALUE_TYPE, null);
+ ki.setText(id);
+ }
public static OMElement createKeySizeElement(int version,
OMElement parent,
@@ -544,14 +544,14 @@ public class TrustUtil {
}
public static OMElement createClaims(int version,
-
OMElement parent, String dialect) throws TrustException{
+ OMElement parent, String dialect) throws TrustException{
OMElement omElem = createOMElement(parent,
getWSTNamespace(version),
RahasConstants.IssuanceBindingLocalNames.CLAIMS,
- RahasConstants.WST_PREFIX);
+ RahasConstants.WST_PREFIX);
OMNamespace ns =
omElem.getOMFactory().createOMNamespace(getWSTNamespace(version),
- RahasConstants.WSP_PREFIX);
+ RahasConstants.WSP_PREFIX);
omElem.addAttribute(RahasConstants.ATTR_CLAIMS_DIALECT , dialect, ns);
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
Sat Oct 29 21:40:27 2011
@@ -568,8 +568,8 @@ public class STSClient {
id = token.getAttributeValue(new QName(WSConstants.WSU_NS, "Id"));
if ( id == null )
{
- // If we are dealing with a SAML Assetion, look for AssertionID.
- id = token.getAttributeValue(new QName( "AssertionID"));
+ // If we are dealing with a SAML Assetion, look for
AssertionID.
+ id = token.getAttributeValue(new QName( "AssertionID"));
}
}
return id;
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
Sat Oct 29 21:40:27 2011
@@ -100,20 +100,20 @@ public class SAML2TokenIssuer implements
private static Log log = LogFactory.getLog(SAML2TokenIssuer.class);
static {
- try {
- // Set the "javax.xml.parsers.DocumentBuilderFactory" system
property
- // to the endorsed JAXP impl.
- System.setProperty("javax.xml.parsers.DocumentBuilderFactory",
- "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl");
- DefaultBootstrap.bootstrap();
- } catch (ConfigurationException e) {
- log.error("SAML2TokenIssuerBootstrapError", e);
- throw new RuntimeException(e);
- } finally {
- // Unset the DOM impl to default
- DocumentBuilderFactoryImpl.setDOOMRequired(false);
- }
+ try {
+ // Set the "javax.xml.parsers.DocumentBuilderFactory" system
property
+ // to the endorsed JAXP impl.
+ System.setProperty("javax.xml.parsers.DocumentBuilderFactory",
+ "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl");
+ DefaultBootstrap.bootstrap();
+ } catch (ConfigurationException e) {
+ log.error("SAML2TokenIssuerBootstrapError", e);
+ throw new RuntimeException(e);
+ } finally {
+ // Unset the DOM impl to default
+ DocumentBuilderFactoryImpl.setDOOMRequired(false);
}
+ }
public SOAPEnvelope issue(RahasData data) throws TrustException {
MessageContext inMsgCtx = data.getInMessageContext();
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
Sat Oct 29 21:40:27 2011
@@ -189,11 +189,11 @@ public class SAMLTokenIssuer implements
}
if (config.addRequestedAttachedRef) {
- TrustUtil.createRequestedAttachedRef(rstrElem,
assertion.getId(),wstVersion);
+ TrustUtil.createRequestedAttachedRef(rstrElem,
assertion.getId(),wstVersion);
}
if (config.addRequestedUnattachedRef) {
- TrustUtil.createRequestedUnattachedRef(rstrElem,
assertion.getId(),wstVersion);
+ TrustUtil.createRequestedUnattachedRef(rstrElem,
assertion.getId(),wstVersion);
}
if (data.getAppliesToAddress() != null) {
@@ -256,18 +256,18 @@ public class SAMLTokenIssuer implements
SAMLAssertion assertion;
// In the case where the principal is a UT
if (principal instanceof WSUsernameTokenPrincipal) {
- SAMLNameIdentifier nameId = null;
- if(config.getCallbackHandler() != null){
- SAMLNameIdentifierCallback cb = new
SAMLNameIdentifierCallback(data);
- cb.setUserId(principal.getName());
- SAMLCallbackHandler callbackHandler =
config.getCallbackHandler();
- callbackHandler.handle(cb);
- nameId = cb.getNameId();
- }else{
- nameId = new SAMLNameIdentifier(
- principal.getName(), null,
SAMLNameIdentifier.FORMAT_EMAIL);
- }
- assertion = createAuthAssertion(doc, SAMLSubject.CONF_BEARER,
+ SAMLNameIdentifier nameId = null;
+ if(config.getCallbackHandler() != null){
+ SAMLNameIdentifierCallback cb = new
SAMLNameIdentifierCallback(data);
+ cb.setUserId(principal.getName());
+ SAMLCallbackHandler callbackHandler =
config.getCallbackHandler();
+ callbackHandler.handle(cb);
+ nameId = cb.getNameId();
+ }else{
+ nameId = new SAMLNameIdentifier(
+ principal.getName(), null,
SAMLNameIdentifier.FORMAT_EMAIL);
+ }
+ assertion = createAuthAssertion(doc, SAMLSubject.CONF_BEARER,
nameId, null, config, crypto, creationTime,
expirationTime, data);
return assertion;
@@ -436,33 +436,33 @@ public class SAMLTokenIssuer implements
SAMLAttribute[] attrs = null;
if(config.getCallbackHandler() != null){
- SAMLAttributeCallback cb = new SAMLAttributeCallback(data);
- SAMLCallbackHandler handler = config.getCallbackHandler();
- handler.handle(cb);
- attrs = cb.getAttributes();
+ SAMLAttributeCallback cb = new SAMLAttributeCallback(data);
+ SAMLCallbackHandler handler = config.getCallbackHandler();
+ handler.handle(cb);
+ attrs = cb.getAttributes();
} else if (config.getCallbackHandlerName() != null
- &&
config.getCallbackHandlerName().trim().length() > 0) {
- SAMLAttributeCallback cb = new
SAMLAttributeCallback(data);
- SAMLCallbackHandler handler = null;
- MessageContext msgContext =
data.getInMessageContext();
- ClassLoader classLoader =
msgContext.getAxisService().getClassLoader();
- Class cbClass = null;
- try {
- cbClass = Loader.loadClass(classLoader,
config.getCallbackHandlerName());
- } catch (ClassNotFoundException e) {
- throw new
TrustException("cannotLoadPWCBClass", new String[]{config
-
.getCallbackHandlerName()}, e);
- }
- try {
- handler = (SAMLCallbackHandler)
cbClass.newInstance();
- } catch (java.lang.Exception e) {
- throw new
TrustException("cannotCreatePWCBInstance", new String[]{config
-
.getCallbackHandlerName()}, e);
- }
- handler.handle(cb);
- attrs = cb.getAttributes();
+ && config.getCallbackHandlerName().trim().length() > 0) {
+ SAMLAttributeCallback cb = new SAMLAttributeCallback(data);
+ SAMLCallbackHandler handler = null;
+ MessageContext msgContext = data.getInMessageContext();
+ ClassLoader classLoader =
msgContext.getAxisService().getClassLoader();
+ Class cbClass = null;
+ try {
+ cbClass = Loader.loadClass(classLoader,
config.getCallbackHandlerName());
+ } catch (ClassNotFoundException e) {
+ throw new TrustException("cannotLoadPWCBClass", new
String[]{config
+ .getCallbackHandlerName()}, e);
+ }
+ try {
+ handler = (SAMLCallbackHandler) cbClass.newInstance();
+ } catch (java.lang.Exception e) {
+ throw new TrustException("cannotCreatePWCBInstance", new
String[]{config
+ .getCallbackHandlerName()}, e);
+ }
+ handler.handle(cb);
+ attrs = cb.getAttributes();
}else{
- //TODO Remove this after discussing
+ //TODO Remove this after discussing
SAMLAttribute attribute = new SAMLAttribute("Name",
"https://rahas.apache.org/saml/attrns";, null, -1,
Arrays
.asList(new String[] { "Colombo/Rahas" }));
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
Sat Oct 29 21:40:27 2011
@@ -45,9 +45,9 @@ import java.util.Properties;
*/
public class SAMLTokenIssuerConfig extends AbstractIssuerConfig {
-
- Log log = LogFactory.getLog(SAMLTokenIssuerConfig.class);
-
+
+ Log log = LogFactory.getLog(SAMLTokenIssuerConfig.class);
+
/**
* The QName of the configuration element of the SAMLTokenIssuer
*/
@@ -60,15 +60,15 @@ public class SAMLTokenIssuerConfig exten
private final static QName ISSUER_KEY_ALIAS = new QName("issuerKeyAlias");
/**
- * Element name to include the password of the private key to sign the
response or the issued
- * token
- */
- private final static QName ISSUER_KEY_PASSWD = new
QName("issuerKeyPassword");
-
- /**
- * Element name of the attribute call-back handler
- */
- private final static QName ATTR_CALLBACK_HANDLER_NAME = new
QName("attrCallbackHandlerName");
+ * Element name to include the password of the private key to sign the
response or the issued
+ * token
+ */
+ private final static QName ISSUER_KEY_PASSWD = new
QName("issuerKeyPassword");
+
+ /**
+ * Element name of the attribute call-back handler
+ */
+ private final static QName ATTR_CALLBACK_HANDLER_NAME = new
QName("attrCallbackHandlerName");
/**
* Element to specify the lifetime of the SAMLToken
@@ -252,24 +252,24 @@ public class SAMLTokenIssuerConfig exten
}
- OMElement attrElemet =
elem.getFirstChildWithName(SAML_CALLBACK_CLASS);
- if (attrElemet != null) {
- try {
- String value = attrElemet.getText();
- Class handlerClass =
Class.forName(value);
- this.callbackHandler =
(SAMLCallbackHandler)handlerClass.newInstance();
- } catch (ClassNotFoundException e) {
- log.error("Error loading class" , e);
- throw new TrustException("Error loading
class" , e);
- } catch (InstantiationException e) {
- log.error("Error instantiating class" ,
e);
- throw new TrustException("Error
instantiating class" , e);
- } catch (IllegalAccessException e) {
- log.error("Illegal Access" , e);
- throw new TrustException("Illegal
Access" , e);
- }
- }
-
+ OMElement attrElemet = elem.getFirstChildWithName(SAML_CALLBACK_CLASS);
+ if (attrElemet != null) {
+ try {
+ String value = attrElemet.getText();
+ Class handlerClass = Class.forName(value);
+ this.callbackHandler =
(SAMLCallbackHandler)handlerClass.newInstance();
+ } catch (ClassNotFoundException e) {
+ log.error("Error loading class" , e);
+ throw new TrustException("Error loading class" , e);
+ } catch (InstantiationException e) {
+ log.error("Error instantiating class" , e);
+ throw new TrustException("Error instantiating class" , e);
+ } catch (IllegalAccessException e) {
+ log.error("Illegal Access" , e);
+ throw new TrustException("Illegal Access" , e);
+ }
+ }
+
}
@@ -408,30 +408,30 @@ public class SAMLTokenIssuerConfig exten
}
@Deprecated
- public SAMLCallbackHandler getCallbackHander() {
- return callbackHandler;
- }
+ public SAMLCallbackHandler getCallbackHander() {
+ return callbackHandler;
+ }
@Deprecated
- public void setCallbackHander(SAMLCallbackHandler callbackHandler) {
- this.callbackHandler = callbackHandler;
- }
-
- public SAMLCallbackHandler getCallbackHandler() {
- return callbackHandler;
- }
-
- public void setCallbackHandler(SAMLCallbackHandler callbackHandler) {
- this.callbackHandler = callbackHandler;
- }
-
- public String getCallbackHandlerName() {
- return callbackHandlerName;
- }
-
- public void setCallbackHandlerName(String callbackHandlerName) {
- this.callbackHandlerName = callbackHandlerName;
- }
+ public void setCallbackHander(SAMLCallbackHandler callbackHandler) {
+ this.callbackHandler = callbackHandler;
+ }
+
+ public SAMLCallbackHandler getCallbackHandler() {
+ return callbackHandler;
+ }
+
+ public void setCallbackHandler(SAMLCallbackHandler callbackHandler) {
+ this.callbackHandler = callbackHandler;
+ }
+
+ public String getCallbackHandlerName() {
+ return callbackHandlerName;
+ }
+
+ public void setCallbackHandlerName(String callbackHandlerName) {
+ this.callbackHandlerName = callbackHandlerName;
+ }
/**
* Uses the <code>wst:AppliesTo</code> to figure out the certificate to
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenValidator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenValidator.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenValidator.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenValidator.java
Sat Oct 29 21:40:27 2011
@@ -44,68 +44,68 @@ public class SAMLTokenValidator implemen
* request.
*/
public SOAPEnvelope validate(RahasData data) throws TrustException {
- // retrieve the message context
- MessageContext inMsgCtx = data.getInMessageContext();
+ // retrieve the message context
+ MessageContext inMsgCtx = data.getInMessageContext();
- // retrieve the list of tokens from the message context
- TokenStorage tkStorage = TrustUtil.getTokenStore(inMsgCtx);
+ // retrieve the list of tokens from the message context
+ TokenStorage tkStorage = TrustUtil.getTokenStore(inMsgCtx);
- try {
- // Set the DOM impl to DOOM
- DocumentBuilderFactoryImpl.setDOOMRequired(true);
-
- // Create envelope
- SOAPEnvelope env = TrustUtil.createSOAPEnvelope(inMsgCtx
- .getEnvelope().getNamespace().getNamespaceURI());
-
- // Create RSTR element, with respective version
- OMElement rstrElem;
- int wstVersion = data.getVersion();
- if (RahasConstants.VERSION_05_02 == wstVersion) {
- rstrElem = TrustUtil.createRequestSecurityTokenResponseElement(
- wstVersion, env.getBody());
- } else {
- OMElement rstrcElem = TrustUtil
- .createRequestSecurityTokenResponseCollectionElement(
- wstVersion, env.getBody());
- rstrElem = TrustUtil.createRequestSecurityTokenResponseElement(
- wstVersion, rstrcElem);
- }
-
- // Create TokenType element, set to RSTR/Status
- TrustUtil.createTokenTypeElement(wstVersion, rstrElem).setText(
- TrustUtil.getWSTNamespace(wstVersion)
- + RahasConstants.TOK_TYPE_STATUS);
-
- // Create Status element
- OMElement statusElement = createMessageElement(wstVersion,
- rstrElem, RahasConstants.LocalNames.STATUS);
-
- // Obtain the token
- Token tk = tkStorage.getToken(data.getTokenId());
-
- // create the crypto object
- PublicKey issuerPBKey = getIssuerPublicKey(inMsgCtx);
-
- boolean valid = isValid(tk, issuerPBKey);
- String validityCode;
-
- if (valid) {
- validityCode = RahasConstants.STATUS_CODE_VALID;
- } else {
- validityCode = RahasConstants.STATUS_CODE_INVALID;
- }
-
- // Create Code element (inside Status) and set it to the
- // correspondent value
- createMessageElement(wstVersion, statusElement,
- RahasConstants.LocalNames.CODE).setText(
- TrustUtil.getWSTNamespace(wstVersion) + validityCode);
-
- return env;
- } finally {
- DocumentBuilderFactoryImpl.setDOOMRequired(false);
- }
+ try {
+ // Set the DOM impl to DOOM
+ DocumentBuilderFactoryImpl.setDOOMRequired(true);
+
+ // Create envelope
+ SOAPEnvelope env = TrustUtil.createSOAPEnvelope(inMsgCtx
+ .getEnvelope().getNamespace().getNamespaceURI());
+
+ // Create RSTR element, with respective version
+ OMElement rstrElem;
+ int wstVersion = data.getVersion();
+ if (RahasConstants.VERSION_05_02 == wstVersion) {
+ rstrElem = TrustUtil.createRequestSecurityTokenResponseElement(
+ wstVersion, env.getBody());
+ } else {
+ OMElement rstrcElem = TrustUtil
+ .createRequestSecurityTokenResponseCollectionElement(
+ wstVersion, env.getBody());
+ rstrElem = TrustUtil.createRequestSecurityTokenResponseElement(
+ wstVersion, rstrcElem);
+ }
+
+ // Create TokenType element, set to RSTR/Status
+ TrustUtil.createTokenTypeElement(wstVersion, rstrElem).setText(
+ TrustUtil.getWSTNamespace(wstVersion)
+ + RahasConstants.TOK_TYPE_STATUS);
+
+ // Create Status element
+ OMElement statusElement = createMessageElement(wstVersion,
+ rstrElem, RahasConstants.LocalNames.STATUS);
+
+ // Obtain the token
+ Token tk = tkStorage.getToken(data.getTokenId());
+
+ // create the crypto object
+ PublicKey issuerPBKey = getIssuerPublicKey(inMsgCtx);
+
+ boolean valid = isValid(tk, issuerPBKey);
+ String validityCode;
+
+ if (valid) {
+ validityCode = RahasConstants.STATUS_CODE_VALID;
+ } else {
+ validityCode = RahasConstants.STATUS_CODE_INVALID;
+ }
+
+ // Create Code element (inside Status) and set it to the
+ // correspondent value
+ createMessageElement(wstVersion, statusElement,
+ RahasConstants.LocalNames.CODE).setText(
+ TrustUtil.getWSTNamespace(wstVersion) + validityCode);
+
+ return env;
+ } finally {
+ DocumentBuilderFactoryImpl.setDOOMRequired(false);
+ }
}
/**
@@ -118,83 +118,83 @@ public class SAMLTokenValidator implemen
* @return true if the token has been signed by the issuer.
*/
private boolean isValid(Token token, PublicKey issuerPBKey) {
- // extract SAMLAssertion object from token
- OMElement assertionOMElement = token.getToken();
- SAMLAssertion samlAssertion = null;
+ // extract SAMLAssertion object from token
+ OMElement assertionOMElement = token.getToken();
+ SAMLAssertion samlAssertion = null;
- try {
- samlAssertion = new SAMLAssertion((Element) assertionOMElement);
+ try {
+ samlAssertion = new SAMLAssertion((Element) assertionOMElement);
- log.info("Verifying token validity...");
+ log.info("Verifying token validity...");
- // check if the token has been signed by the issuer.
- samlAssertion.verify(issuerPBKey);
+ // check if the token has been signed by the issuer.
+ samlAssertion.verify(issuerPBKey);
- } catch (SAMLException e) {
- log.error("Could not verify signature", e);
- return false;
- }
+ } catch (SAMLException e) {
+ log.error("Could not verify signature", e);
+ return false;
+ }
- // if there was no exception, then the token is valid
- return true;
+ // if there was no exception, then the token is valid
+ return true;
}
//here we basically reuse the SAMLTokenIssuer config
// to create the crypto object, so we can load the issuer's certificates
private PublicKey getIssuerPublicKey(MessageContext inMsgCtx) {
- PublicKey issuerPBKey = null;
- SAMLTokenIssuerConfig config = null;
+ PublicKey issuerPBKey = null;
+ SAMLTokenIssuerConfig config = null;
- try {
- if (configElement != null) {
- config = new SAMLTokenIssuerConfig(
- configElement
-
.getFirstChildWithName(SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG));
- }
-
- // Look for the file
- if ((config == null) && (configFile != null)) {
- config = new SAMLTokenIssuerConfig(configFile);
- }
-
- // Look for the param
- if ((config == null) && (configParamName != null)) {
- Parameter param = inMsgCtx.getParameter(configParamName);
- if ((param != null) && (param.getParameterElement() != null)) {
- config = new SAMLTokenIssuerConfig(param
- .getParameterElement().getFirstChildWithName(
- SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG));
- } else {
- throw new TrustException("expectedParameterMissing",
- new String[] { configParamName });
- }
- }
-
- if (config == null) {
- throw new TrustException("configurationIsNull");
- }
-
- Crypto crypto;
- if (config.cryptoElement != null) { // crypto props
- // defined as
- // elements
- crypto = CryptoFactory.getInstance(TrustUtil
- .toProperties(config.cryptoElement), inMsgCtx
- .getAxisService().getClassLoader());
- } else { // crypto props defined in a properties file
- crypto = CryptoFactory.getInstance(config.cryptoPropertiesFile,
- inMsgCtx.getAxisService().getClassLoader());
- }
-
- X509Certificate[] issuerCerts = crypto
- .getCertificates(config.issuerKeyAlias);
-
- issuerPBKey = issuerCerts[0].getPublicKey();
-
- } catch (Exception e) {
- log.error("Could not retrieve issuer public key", e);
- }
- return issuerPBKey;
+ try {
+ if (configElement != null) {
+ config = new SAMLTokenIssuerConfig(
+ configElement
+
.getFirstChildWithName(SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG));
+ }
+
+ // Look for the file
+ if ((config == null) && (configFile != null)) {
+ config = new SAMLTokenIssuerConfig(configFile);
+ }
+
+ // Look for the param
+ if ((config == null) && (configParamName != null)) {
+ Parameter param = inMsgCtx.getParameter(configParamName);
+ if ((param != null) && (param.getParameterElement() != null)) {
+ config = new SAMLTokenIssuerConfig(param
+ .getParameterElement().getFirstChildWithName(
+ SAMLTokenIssuerConfig.SAML_ISSUER_CONFIG));
+ } else {
+ throw new TrustException("expectedParameterMissing",
+ new String[] { configParamName });
+ }
+ }
+
+ if (config == null) {
+ throw new TrustException("configurationIsNull");
+ }
+
+ Crypto crypto;
+ if (config.cryptoElement != null) { // crypto props
+ // defined as
+ // elements
+ crypto = CryptoFactory.getInstance(TrustUtil
+ .toProperties(config.cryptoElement), inMsgCtx
+ .getAxisService().getClassLoader());
+ } else { // crypto props defined in a properties file
+ crypto = CryptoFactory.getInstance(config.cryptoPropertiesFile,
+ inMsgCtx.getAxisService().getClassLoader());
+ }
+
+ X509Certificate[] issuerCerts = crypto
+ .getCertificates(config.issuerKeyAlias);
+
+ issuerPBKey = issuerCerts[0].getPublicKey();
+
+ } catch (Exception e) {
+ log.error("Could not retrieve issuer public key", e);
+ }
+ return issuerPBKey;
}
/**
@@ -206,15 +206,15 @@ public class SAMLTokenValidator implemen
* the parent OMElement.
*/
private static OMElement createMessageElement(int version,
- OMElement parent, String elementName) throws TrustException {
- return createOMElement(parent, TrustUtil.getWSTNamespace(version),
- elementName, RahasConstants.WST_PREFIX);
+ OMElement parent, String elementName) throws TrustException {
+ return createOMElement(parent, TrustUtil.getWSTNamespace(version),
+ elementName, RahasConstants.WST_PREFIX);
}
private static OMElement createOMElement(OMElement parent, String ns,
- String ln, String prefix) {
- return parent.getOMFactory().createOMElement(new QName(ns, ln, prefix),
- parent);
+ String ln, String prefix) {
+ return parent.getOMFactory().createOMElement(new QName(ns, ln, prefix),
+ parent);
}
// ========================================================================
@@ -227,7 +227,7 @@ public class SAMLTokenValidator implemen
* @param configFile
*/
public void setConfigurationFile(String configFile) {
- this.configFile = configFile;
+ this.configFile = configFile;
}
/**
@@ -240,11 +240,11 @@ public class SAMLTokenValidator implemen
* @see org.apache.axis2.description.Parameter
*/
public void setConfigurationParamName(String configParamName) {
- this.configParamName = configParamName;
+ this.configParamName = configParamName;
}
public void setConfigurationElement(OMElement configElement) {
- this.configElement = configElement;
+ this.configElement = configElement;
}
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerConfig.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerConfig.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerConfig.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerConfig.java
Sat Oct 29 21:40:27 2011
@@ -27,13 +27,13 @@ import java.io.FileInputStream;
*/
public class TokenCancelerConfig {
- /*
- <parameter name="token-canceler-config">
- <token-canceler-config>
- <proofToken>EncryptedKey</proofToken>
-
<cryptoProperties>sctIssuer.properties</cryptoProperties>
- <addRequestedAttachedRef />
- </stoken-canceler-config>
+ /*
+ <parameter name="token-canceler-config">
+ <token-canceler-config>
+ <proofToken>EncryptedKey</proofToken>
+ <cryptoProperties>sctIssuer.properties</cryptoProperties>
+ <addRequestedAttachedRef />
+ </stoken-canceler-config>
</parameter>
*/
public final static QName TOKEN_CANCELER_CONFIG = new
QName("token-canceler-config");
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLAttributeCallback.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLAttributeCallback.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLAttributeCallback.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLAttributeCallback.java
Sat Oct 29 21:40:27 2011
@@ -8,22 +8,22 @@ import org.opensaml.SAMLAttribute;
import org.opensaml.saml2.core.Attribute;
public class SAMLAttributeCallback implements SAMLCallback{
-
- private List attributes = null;
- private RahasData data = null;
-
- public SAMLAttributeCallback(RahasData data){
- attributes = new ArrayList();
- this.data = data;
- }
-
- public int getCallbackType(){
- return SAMLCallback.ATTR_CALLBACK;
- }
-
- public void addAttributes(SAMLAttribute attribute){
- attributes.add(attribute);
- }
+
+ private List attributes = null;
+ private RahasData data = null;
+
+ public SAMLAttributeCallback(RahasData data){
+ attributes = new ArrayList();
+ this.data = data;
+ }
+
+ public int getCallbackType(){
+ return SAMLCallback.ATTR_CALLBACK;
+ }
+
+ public void addAttributes(SAMLAttribute attribute){
+ attributes.add(attribute);
+ }
/**
* Overloaded method to support SAML2
@@ -40,14 +40,14 @@ public class SAMLAttributeCallback imple
public Attribute[] getSAML2Attributes(){
return (Attribute[])attributes.toArray(new
Attribute[attributes.size()]);
}
-
- public SAMLAttribute[] getAttributes(){
- return (SAMLAttribute[])attributes.toArray(new
SAMLAttribute[attributes.size()]);
-
- }
+
+ public SAMLAttribute[] getAttributes(){
+ return (SAMLAttribute[])attributes.toArray(new
SAMLAttribute[attributes.size()]);
+
+ }
- public RahasData getData() {
- return data;
- }
+ public RahasData getData() {
+ return data;
+ }
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallback.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallback.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallback.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallback.java
Sat Oct 29 21:40:27 2011
@@ -5,21 +5,21 @@ package org.apache.rahas.impl.util;
*
*/
public interface SAMLCallback {
-
- /**
- * Attribute callback
- */
- public static final int ATTR_CALLBACK = 1;
-
- /**
- * Subject name identifier
- */
- public static final int NAME_IDENTIFIER_CALLBACK = 2;
-
- /**
- * Returns the type of callback
- * @return
- */
- int getCallbackType();
+
+ /**
+ * Attribute callback
+ */
+ public static final int ATTR_CALLBACK = 1;
+
+ /**
+ * Subject name identifier
+ */
+ public static final int NAME_IDENTIFIER_CALLBACK = 2;
+
+ /**
+ * Returns the type of callback
+ * @return
+ */
+ int getCallbackType();
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallbackHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallbackHandler.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallbackHandler.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallbackHandler.java
Sat Oct 29 21:40:27 2011
@@ -11,18 +11,18 @@ import org.opensaml.SAMLException;
*/
public interface SAMLCallbackHandler {
- /**
- * SAMLCallback object has indicates what kind of data is required.
- * if(callback.getCallbackType() == SAMLCallback.ATTR_CALLBACK)
- * {
- * SAMLAttributeCallback attrCallback =
(SAMLAttributeCallback)callback;
- * \//Retrieve required data from the RahasData inside
SAMLAttributeCallback
- * \//Add your SAMLAttributes to the attrCallback here.
- *
- * }
- * @param callback
- * @throws SAMLException
- */
- public void handle(SAMLCallback callback) throws SAMLException;
+ /**
+ * SAMLCallback object has indicates what kind of data is required.
+ * if(callback.getCallbackType() == SAMLCallback.ATTR_CALLBACK)
+ * {
+ * SAMLAttributeCallback attrCallback =
(SAMLAttributeCallback)callback;
+ * \//Retrieve required data from the RahasData inside
SAMLAttributeCallback
+ * \//Add your SAMLAttributes to the attrCallback here.
+ *
+ * }
+ * @param callback
+ * @throws SAMLException
+ */
+ public void handle(SAMLCallback callback) throws SAMLException;
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLNameIdentifierCallback.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLNameIdentifierCallback.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLNameIdentifierCallback.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLNameIdentifierCallback.java
Sat Oct 29 21:40:27 2011
@@ -11,37 +11,37 @@ import org.opensaml.SAMLNameIdentifier;
*
*/
public class SAMLNameIdentifierCallback implements SAMLCallback{
-
- private SAMLNameIdentifier nameId = null;
- private String userId = null;
- private RahasData data = null;
-
- public SAMLNameIdentifierCallback(RahasData data){
- this.data = data;
- }
-
- public int getCallbackType(){
- return SAMLCallback.NAME_IDENTIFIER_CALLBACK;
- }
+
+ private SAMLNameIdentifier nameId = null;
+ private String userId = null;
+ private RahasData data = null;
+
+ public SAMLNameIdentifierCallback(RahasData data){
+ this.data = data;
+ }
+
+ public int getCallbackType(){
+ return SAMLCallback.NAME_IDENTIFIER_CALLBACK;
+ }
- public SAMLNameIdentifier getNameId() {
- return nameId;
- }
+ public SAMLNameIdentifier getNameId() {
+ return nameId;
+ }
- public void setNameId(SAMLNameIdentifier nameId) {
- this.nameId = nameId;
- }
+ public void setNameId(SAMLNameIdentifier nameId) {
+ this.nameId = nameId;
+ }
- public void setUserId(String userId) {
- this.userId = userId;
- }
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
- public String getUserId() {
- return userId;
- }
+ public String getUserId() {
+ return userId;
+ }
- public RahasData getData() {
- return data;
- }
-
+ public RahasData getData() {
+ return data;
+ }
+
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SignKeyHolder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SignKeyHolder.java?rev=1195044&r1=1195043&r2=1195044&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SignKeyHolder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SignKeyHolder.java
Sat Oct 29 21:40:27 2011
@@ -39,7 +39,7 @@ public class SignKeyHolder implements X5
private X509Certificate[] issuerCerts = null;
- private PrivateKey issuerPK = null;
+ private PrivateKey issuerPK = null;
public String getSignatureAlgorithm() {
