Author: dimuthul
Date: Thu Feb 21 03:57:56 2008
New Revision: 13966
Log:
Formatting the code.
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderSimulator.java
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderTest.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyData.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyFilter.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/IssuerCertificateUtil.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/SAMLTokenConsumer.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/SAMLTokenVerifier.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/X509CredentialImpl.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/X509CredentialUtil.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/SAML1TokenHolder.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/SAML2TokenHolder.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/TokenHolder.java
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderSimulator.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderSimulator.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderSimulator.java
Thu Feb 21 03:57:56 2008
@@ -15,7 +15,7 @@
import org.wso2.solutions.identity.sts.IdentityProviderData;
/**
- * This simulator is written so that
+ * This simulator is written so that
*
*/
public class SAML1TokenBuilderSimulator
Modified:
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderTest.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderTest.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderTest.java
Thu Feb 21 03:57:56 2008
@@ -12,9 +12,10 @@
public class SAML1TokenBuilderTest
extends TestCase {
- static{
+ static {
Init.init();
}
+
public void testSAML1TokenCreation() throws Exception {
DefaultBootstrap.bootstrap();
@@ -32,12 +33,12 @@
builder.setSignature(XMLSignature.ALGO_ID_SIGNATURE_RSA, keyHolder);
builder.marshellAndSign();
Element elemSAML = builder.getSAMLasDOM();
-
- //now we have to compare something.
- //let's compare
-
-// String val = DOM2Writer.nodeToString(elemSAML);
-// System.out.println(val);
+
+ // now we have to compare something.
+ // let's compare
+
+ // String val = DOM2Writer.nodeToString(elemSAML);
+ // System.out.println(val);
}
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyData.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyData.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyData.java
Thu Feb 21 03:57:56 2008
@@ -15,7 +15,7 @@
public class RelyingPartyData {
private KeyStore systemStore = null;
-
+
private PrivateKey privateKey = null;
private String validatePolicy = null;
@@ -24,7 +24,6 @@
private KeyStore trustStore = null;
-
/**
* One array contains one DN name
*/
@@ -35,8 +34,6 @@
*/
private List[] whiteList = null;
-
-
/**
* This method read parameters from web.xml Step 1 : Read my private key
* Step 2 : Read the token validation policy Step 3 : Read paramters that
is
@@ -47,7 +44,7 @@
* details
*
*/
- public void loadData(FilterConfig filterConfig) throws ServletException{
+ public void loadData(FilterConfig filterConfig) throws ServletException {
String keyStore = filterConfig
.getInitParameter(TokenVerifierConstants.KEY_STORE);
String storeType = filterConfig
@@ -72,7 +69,8 @@
try {
KeyStore store = KeyStore.getInstance(storeType);
- String realPath =
filterConfig.getServletContext().getRealPath(keyStore);
+ String realPath = filterConfig.getServletContext().getRealPath(
+ keyStore);
store.load(new FileInputStream(realPath), storePass.toCharArray());
privateKey = (PrivateKey) store.getKey(keyAlias, keyPass
.toCharArray());
@@ -124,7 +122,8 @@
trustStore.load(new FileInputStream(realPath), IdPStorePass
.toCharArray());
} catch (Exception e) {
- throw new ServletException("Cannot load truted store"+
IdPstoreFilePath +" and "+IdPStorePass);
+ throw new ServletException("Cannot load truted store"
+ + IdPstoreFilePath + " and " + IdPStorePass);
}
String defaultStorePass = filterConfig
@@ -133,8 +132,7 @@
// assume that it hasn't been changed
defaultStorePass = "changeit";
}
-
-
+
String javaHome = System.getenv("JAVA_HOME");
if (javaHome == null) {
throw new ServletException("Cannot find JAVA_HOME");
@@ -154,7 +152,7 @@
sysKS.load(is, defaultStorePass.toCharArray());
} catch (Exception e) {
throw new ServletException("Cannot load system key store");
- }
+ }
}
}
@@ -206,7 +204,7 @@
public void setWhiteList(List[] whiteList) {
this.whiteList = whiteList;
}
-
+
public KeyStore getSystemStore() {
return systemStore;
}
@@ -244,7 +242,4 @@
return dnList;
}
-
-
-
}
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyFilter.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyFilter.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/servletfilter/RelyingPartyFilter.java
Thu Feb 21 03:57:56 2008
@@ -39,7 +39,6 @@
public static Log log = LogFactory.getLog(RelyingPartyFilter.class);
-
public RelyingPartyData data = null;
static {
WSSConfig.getDefaultWSConfig();
@@ -89,10 +88,11 @@
// differently.
OpenIDConsumer.getInstance().setInfocardSessionAttributes(
(HttpServletRequest) request);
- }else if (xmlToken != null && !isOpenIDInfoCardToken) {
+ } else if (xmlToken != null && !isOpenIDInfoCardToken) {
SAMLTokenConsumer.getInstance()
.setInfocardSessionAttributes(
- (HttpServletRequest) request, xmlToken,
data);
+ (HttpServletRequest) request, xmlToken,
+ data);
} else {
request.setAttribute(TokenVerifierConstants.ATTR_STATE,
TokenVerifierConstants.STATE_FAILURE);
@@ -112,8 +112,6 @@
chain.doFilter(request, response);
}
-
-
public void init(FilterConfig config) throws ServletException {
this.filterConfig = config;
data = new RelyingPartyData();
@@ -123,7 +121,4 @@
public void destroy() {
}
-
-
-
}
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/IssuerCertificateUtil.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/IssuerCertificateUtil.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/IssuerCertificateUtil.java
Thu Feb 21 03:57:56 2008
@@ -11,8 +11,6 @@
public class IssuerCertificateUtil {
-
-
/**
* This method is suppose to do the certificate validation. It should check
* for four things
@@ -27,8 +25,7 @@
* actual DN?
*/
public static boolean checkSystemStoree(X509Certificate signedCert,
- KeyStore trustStore, KeyStore systemStore)
- throws Exception {
+ KeyStore trustStore, KeyStore systemStore) throws Exception {
boolean isCertValid = false;
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/SAMLTokenConsumer.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/SAMLTokenConsumer.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/SAMLTokenConsumer.java
Thu Feb 21 03:57:56 2008
@@ -45,6 +45,7 @@
/**
* Returns the SAMLTokenConsuer
+ *
* @return
*/
public static SAMLTokenConsumer getInstance() {
@@ -55,10 +56,9 @@
}
/**
- * The control flow is
- * 1) Verify
- * 2) Validate policies
- * 3) Inject parameters into the HttpServletRequest
+ * The control flow is 1) Verify 2) Validate policies 3) Inject parameters
+ * into the HttpServletRequest
+ *
* @param request
* @param xmlToken
* @param data
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/SAMLTokenVerifier.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/SAMLTokenVerifier.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/SAMLTokenVerifier.java
Thu Feb 21 03:57:56 2008
@@ -204,8 +204,8 @@
throw new RelyingPartyException("signingCertNull");
/*
- do certificate validation
- for blacklist, whitelist and cert-validity
+ * do certificate validation for blacklist, whitelist and
+ * cert-validity
*/
signingCert.checkValidity();
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/X509CredentialImpl.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/X509CredentialImpl.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/X509CredentialImpl.java
Thu Feb 21 03:57:56 2008
@@ -26,6 +26,7 @@
private PublicKey publicKey = null;
private X509Certificate signingCert = null;
+
//cert chain
/**
@@ -41,7 +42,7 @@
KeyFactory keyFactory = KeyFactory.getInstance("RSA");
publicKey = keyFactory.generatePublic(spec);
}
-
+
public X509CredentialImpl(X509Certificate cert) {
publicKey = cert.getPublicKey();
signingCert = cert;
@@ -53,8 +54,7 @@
public PublicKey getPublicKey() {
return publicKey;
}
-
-
+
public X509Certificate getSigningCert() {
return signingCert;
}
@@ -70,8 +70,6 @@
return null;
}
-
-
public Collection<X509Certificate> getEntityCertificateChain() {
// TODO Auto-generated method stub
return null;
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/X509CredentialUtil.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/X509CredentialUtil.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/X509CredentialUtil.java
Thu Feb 21 03:57:56 2008
@@ -21,29 +21,31 @@
import org.wso2.solutions.identity.relyingparty.RelyingPartyException;
public class X509CredentialUtil {
-
+
public static KeyStore systemKeyStore = null;
-
- public static X509Credential loadCredentialFromTrustStore(String alias,
KeyStore trustStore) throws Exception{
+
+ public static X509Credential loadCredentialFromTrustStore(String alias,
+ KeyStore trustStore) throws Exception {
X509Credential credential = null;
- java.security.cert.X509Certificate cert = null;
- if(trustStore.containsAlias(alias)){
- cert =
(java.security.cert.X509Certificate)trustStore.getCertificate(alias);
+ java.security.cert.X509Certificate cert = null;
+ if (trustStore.containsAlias(alias)) {
+ cert = (java.security.cert.X509Certificate) trustStore
+ .getCertificate(alias);
credential = new X509CredentialImpl(cert);
}
return credential;
}
- public static X509Credential loadCredentialFromSignature(
- Signature signature) throws Exception {
+ public static X509Credential loadCredentialFromSignature(Signature
signature)
+ throws Exception {
X509Credential credential = null;
KeyInfo kinfo = signature.getKeyInfo();
-
- if(kinfo == null){
+
+ if (kinfo == null) {
// log.debug(); xxxx
return null;
}
-
+
List<X509Data> dataList = kinfo.getX509Datas();
List<KeyValue> keyValueList = kinfo.getKeyValues();
@@ -54,13 +56,15 @@
X509Data data = dataList.get(0);
List<X509Certificate> certList = data.getX509Certificates();
Iterator ite = certList.iterator();
- while(ite.hasNext()){
- X509Certificate certElem = (X509Certificate)ite.next();
+ while (ite.hasNext()) {
+ X509Certificate certElem = (X509Certificate) ite.next();
String certValue = certElem.getValue();
byte[] certInBytes = Base64.decode(certValue);
ByteArrayInputStream bis = new
ByteArrayInputStream(certInBytes);
- CertificateFactory factory =
CertificateFactory.getInstance("X509");
- java.security.cert.X509Certificate x509Cert =
(java.security.cert.X509Certificate)factory.generateCertificate(bis);
+ CertificateFactory factory = CertificateFactory
+ .getInstance("X509");
+ java.security.cert.X509Certificate x509Cert =
(java.security.cert.X509Certificate) factory
+ .generateCertificate(bis);
credential = new X509CredentialImpl(x509Cert);
}
} else if (keyValueList.size() > 0) {
@@ -81,7 +85,7 @@
BigInteger mod = Base64.decodeBigIntegerFromElement(modElem);
BigInteger exp = Base64.decodeBigIntegerFromElement(expElem);
credential = new X509CredentialImpl(mod, exp);
- }else{
+ } else {
// log.error("Unknow key "); log stuff xxxx
}
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/SAML1TokenHolder.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/SAML1TokenHolder.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/SAML1TokenHolder.java
Thu Feb 21 03:57:56 2008
@@ -27,10 +27,11 @@
private static Log log = LogFactory.getLog(SAML1TokenHolder.class);
/**
- * Creates the SAML object from the element
- * This method must be called first
+ * Creates the SAML object from the element This method must be called
first
+ *
* @param elem
- * @throws UnmarshallingException If the token creation fails
+ * @throws UnmarshallingException
+ * If the token creation fails
*/
public void createToken(Element elem) throws UnmarshallingException {
UnmarshallerFactory unmarshallerFactory = Configuration
@@ -49,6 +50,7 @@
/**
* Issuer of the SAML token
+ *
* @return
*/
public String getIssuerName() {
@@ -57,6 +59,7 @@
/**
* Populates the attributes.
+ *
* @param attributeTable
*/
public void populateAttributeTable(Map attributeTable) {
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/SAML2TokenHolder.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/SAML2TokenHolder.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/SAML2TokenHolder.java
Thu Feb 21 03:57:56 2008
@@ -27,10 +27,11 @@
private static Log log = LogFactory.getLog(SAML1TokenHolder.class);
/**
- * Creates the SAML object from the element
- * This method must be called first
+ * Creates the SAML object from the element This method must be called
first
+ *
* @param elem
- * @throws UnmarshallingException If the token creation fails
+ * @throws UnmarshallingException
+ * If the token creation fails
*/
public void createToken(Element elem) throws UnmarshallingException {
UnmarshallerFactory unmarshallerFactory = Configuration
@@ -49,6 +50,7 @@
/**
* Issuer of the SAML token
+ *
* @return
*/
public String getIssuerName() {
@@ -57,6 +59,7 @@
/**
* Populates the attributes.
+ *
* @param attributeTable
*/
public void populateAttributeTable(Map attributeTable) {
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/TokenHolder.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/TokenHolder.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/saml/relyingparty/tokens/TokenHolder.java
Thu Feb 21 03:57:56 2008
@@ -9,10 +9,11 @@
public interface TokenHolder {
/**
- * Creates the SAML object from the element
- * This method must be called first
+ * Creates the SAML object from the element This method must be called
first
+ *
* @param elem
- * @throws UnmarshallingException If the token creation fails
+ * @throws UnmarshallingException
+ * If the token creation fails
*/
public void createToken(Element elem) throws UnmarshallingException;
@@ -23,12 +24,14 @@
/**
* Populates the attributes.
+ *
* @param attributeTable
*/
public void populateAttributeTable(Map attributeTable);
/**
* Issuer of the SAML token
+ *
* @return
*/
public String getIssuerName();
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
