Author: ruchith
Date: Thu Feb 21 20:22:23 2008
New Revision: 14014
Log:
minor cleanup ... trying to get rid of e.printStackTrace()
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/Generator.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/resources.properties
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IPPasswordCallback.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/KeyUtil.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
trunk/solutions/identity/modules/identity-provider/src/test/java/org/wso2/solutions/identity/sts/saml/SAML1TokenBuilderSimulator.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/resources.properties
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenConsumer.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenVerifier.java
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/X509CredentialUtil.java
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/Generator.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/Generator.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/Generator.java
Thu Feb 21 20:22:23 2008
@@ -98,7 +98,6 @@
return sig.getElement();
} catch (Exception e) {
- e.printStackTrace();
throw new CardModelException(CardModelException.DEFAULT, e);
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/resources.properties
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/resources.properties
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/resources.properties
Thu Feb 21 20:22:23 2008
@@ -54,6 +54,9 @@
emailNotActivated = Email Verification not activted now, but all parameters
are saved. It will be activated when DefaultRealm is selected.
noValueForRequestedAttribute = Value of attribute "{0}" missing
SAMLTokenDirectorBootstrapError = SAMLTokenDirector bootstrap error
+errorObtainingCertForService = Error obtaining certificate for service : {0}
+noCertInKeystore = Cannot find certificate for alias "{0}" in keystore : {1}
+errorInPasswordCallbackHandler = Error in password callback handler
#db errors
createDuplicateEntity = Duplcate entity exist
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IPPasswordCallback.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IPPasswordCallback.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IPPasswordCallback.java
Thu Feb 21 20:22:23 2008
@@ -16,9 +16,13 @@
package org.wso2.solutions.identity.sts;
import org.apache.axis2.AxisFault;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.WSPasswordCallback;
+import org.wso2.solutions.identity.IdentityProviderConstants;
import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.solutions.identity.UserStore;
+import org.wso2.solutions.identity.i18n.Messages;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -28,6 +32,9 @@
public class IPPasswordCallback implements CallbackHandler {
+ private static Log log = LogFactory.getLog(IPPasswordCallback.class);
+ private static Messages messages =
Messages.getInstance(IdentityProviderConstants.RESOURCES);
+
private CallbackHandler wsasCallbackHandler;
/**
@@ -52,18 +59,18 @@
if (connector.authenticate(username, passwd) == true) {
continue;
} else {
- throw new AxisFault("User not authenticated");
+ throw new IOException("User not authenticated");
}
} else {
- throw new AxisFault("User not authenticated");
+ throw new IOException("User not authenticated");
}
} else {
wsasCallbackHandler.handle(new Callback[] {callbacks[i]});
}
}
} catch (IdentityProviderException e) {
- e.printStackTrace();
+ log.error(messages.getMessage("errorInPasswordCallbackHandler"),
e);
}
}
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/KeyUtil.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/KeyUtil.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/KeyUtil.java
Thu Feb 21 20:22:23 2008
@@ -62,7 +62,7 @@
}
public static X509Certificate getCertificateToIncludeInMex(
- String serviceName) throws AxisFault {
+ String serviceName) throws IdentityProviderException {
X509Certificate cert = null;
try {
CryptoAdmin admin = new CryptoAdmin();
@@ -109,8 +109,8 @@
}
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new IdentityProviderException("errorObtainingCertForService",
+ new String[] { serviceName });
}
return cert;
@@ -153,15 +153,9 @@
try {
KeyStore store = KeyStoreUtil.getKeyStore(keyStoreName);
cert = (X509Certificate) store.getCertificate(alais);
- } catch (AxisFault e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (KeyStoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new IdentityProviderException("noCertInKeystore",
+ new String[] { alais, keyStoreName }, e);
}
return cert;
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/mex/MexGetService.java
Thu Feb 21 20:22:23 2008
@@ -41,6 +41,7 @@
import org.apache.rahas.RahasConstants;
import org.wso2.solutions.identity.IdentityConstants;
import org.wso2.solutions.identity.IdentityProviderConstants;
+import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.solutions.identity.sts.KeyUtil;
import org.wso2.wsas.admin.service.ServiceAdmin;
@@ -137,7 +138,12 @@
definitionElement.declareNamespace(wsaNs);
String value = IdentityProviderConstants.SERVICE_NAME_STS_UT;
- X509Certificate cert = KeyUtil.getCertificateToIncludeInMex(value);
+ X509Certificate cert;
+ try {
+ cert = KeyUtil.getCertificateToIncludeInMex(value);
+ } catch (IdentityProviderException e) {
+ throw new AxisFault(e.getMessage(), e);
+ }
if (cert == null) {
throw new AxisFault("STS's certificate is null");
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 20:22:23 2008
@@ -18,8 +18,7 @@
* This simulator is written so that
*
*/
-public class SAML1TokenBuilderSimulator
- extends SAML1TokenBuilder {
+public class SAML1TokenBuilderSimulator extends SAML1TokenBuilder {
public void createStatement(IdentityProviderData ipData, RahasData
rahasData)
throws IdentityProviderException {
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/resources.properties
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/resources.properties
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/resources.properties
Thu Feb 21 20:22:23 2008
@@ -47,4 +47,6 @@
dbConnectionFailure=Database connection error
noOpenIDFound=No OpenID found for the given ppid
cardIssuerInitializationFailure=Card issuer initialization failed
-profileRetrievalError=Error occurred while retrieving user profiles
\ No newline at end of file
+profileRetrievalError=Error occurred while retrieving user profiles
+errorExtractingCertFromTrustStore = Error extracting certificate : {0} from
trust store
+SAMLTokenConsumerBootstrapFailure = SAMLTokenConsumer bootstrap failure
\ No newline at end of file
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenConsumer.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenConsumer.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenConsumer.java
Thu Feb 21 20:22:23 2008
@@ -17,16 +17,23 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.Base64;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ws.security.util.DOM2Writer;
import org.opensaml.DefaultBootstrap;
import org.opensaml.xml.ConfigurationException;
import org.w3c.dom.Element;
import org.wso2.solutions.identity.IdentityConstants;
+import org.wso2.solutions.identity.i18n.Messages;
import org.wso2.solutions.identity.relyingparty.RelyingPartyException;
import org.wso2.solutions.identity.relyingparty.TokenVerifierConstants;
import org.wso2.solutions.identity.relyingparty.servletfilter.RelyingPartyData;
public class SAMLTokenConsumer {
+
+ private static Log log = LogFactory.getLog(SAMLTokenConsumer.class);
+ private static Messages messages =
Messages.getInstance(TokenVerifierConstants.RESOURCES);
+
private static SAMLTokenConsumer consumer = null;
@@ -34,7 +41,8 @@
try {
DefaultBootstrap.bootstrap();
} catch (ConfigurationException e) {
- e.printStackTrace();
+ log.error(messages.getMessage("SAMLTokenConsumerBootstrapFailure"),
+ e);
throw new RuntimeException(e);
}
}
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenVerifier.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenVerifier.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/SAMLTokenVerifier.java
Thu Feb 21 20:22:23 2008
@@ -142,7 +142,7 @@
writer.flush();
writer.close();
} catch (IOException e) {
- e.printStackTrace();
+ log.error(e.getMessage(), e);
}
}
Modified:
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/X509CredentialUtil.java
==============================================================================
---
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/X509CredentialUtil.java
(original)
+++
trunk/solutions/identity/modules/token-verifier-core/src/main/java/org/wso2/solutions/identity/relyingparty/saml/X509CredentialUtil.java
Thu Feb 21 20:22:23 2008
@@ -44,8 +44,7 @@
credential = new X509CredentialImpl(cert);
}
} catch (KeyStoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ throw new
RelyingPartyException("errorExtractingCertFromTrustStore", new String[] { alias
}, e);
}
return credential;
}
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
