Author: ruchith
Date: Sun Mar 2 05:40:08 2008
New Revision: 14410
Log:
More fixes using findbugs
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowUserStoreEditAction.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/model/InformationCard.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.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/saml/SignKeyDataHolder.java
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/servletfilter/RelyingPartyData.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/ShowUserVerificationAction.java
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowUserStoreEditAction.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowUserStoreEditAction.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ShowUserStoreEditAction.java
Sun Mar 2 05:40:08 2008
@@ -73,7 +73,6 @@
try {
HttpServletRequest request = (HttpServletRequest) ActionContext
.getContext().get(StrutsStatics.HTTP_REQUEST);
- HttpSession session = request.getSession();
String[] values = request.getParameterValues("configName");
configName = values[0];
RealmConfigAdmin admin = new RealmConfigAdmin();
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/CardIssuer.java
Sun Mar 2 05:40:08 2008
@@ -16,19 +16,6 @@
package org.wso2.solutions.identity.cards;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.TimeZone;
-
import org.apache.axiom.om.util.Base64;
import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axis2.addressing.EndpointReference;
@@ -38,7 +25,6 @@
import org.wso2.solutions.identity.IdentityConstants;
import org.wso2.solutions.identity.IdentityProviderConstants;
import org.wso2.solutions.identity.IdentityProviderException;
-import org.wso2.solutions.identity.admin.ParameterAdmin;
import org.wso2.solutions.identity.admin.RegisteredInfoCardInfoAdmin;
import org.wso2.solutions.identity.admin.ReportAdmin;
import org.wso2.solutions.identity.cards.model.CardImage;
@@ -63,6 +49,19 @@
import org.wso2.utils.ServerConfiguration;
import org.wso2.wsas.ServerConstants;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
/**
* Issues information cards according to the given configuration.
*/
@@ -80,12 +79,11 @@
// an InfoCard based on SAML token type.
private boolean isOpenIdInfoCard = false;
- private boolean isCardLogDebug = false;
+ private boolean isCardLogDebug = cardIssuerLog.isDebugEnabled();
private static CardIssuerConfig issuerConfig = null;
public CardIssuer() throws IdentityProviderException {
issuerConfig = CardIssuerConfig.getInstance();
- isCardLogDebug = cardIssuerLog.isDebugEnabled();
}
public Element issueCardForUsername(String username,
@@ -333,7 +331,6 @@
private byte[] getCardImageBytes() throws CardModelException {
try {
- ParameterAdmin admin = new ParameterAdmin();
FileInputStream is = new FileInputStream(System
.getProperty(ServerConstants.WSO2WSAS_HOME)
+ IdentityConstants.CARD_IMAGE_PATH);
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/model/InformationCard.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/model/InformationCard.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/cards/model/InformationCard.java
Sun Mar 2 05:40:08 2008
@@ -20,7 +20,6 @@
import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.ws.security.util.XmlSchemaDateFormat;
import org.wso2.solutions.identity.IdentityConstants;
import javax.xml.namespace.QName;
@@ -134,8 +133,7 @@
OMElement issuerElem = fac.createOMElement(ISSUER, elem);
issuerElem.setText(this.issuer);
- DateFormat zulu = new XmlSchemaDateFormat();
- zulu = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+ DateFormat zulu = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
zulu.setTimeZone(TimeZone.getTimeZone("UTC"));
OMElement timeIssuedElem = fac.createOMElement(TIME_ISSUED, elem);
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/IdentityProviderData.java
Sun Mar 2 05:40:08 2008
@@ -159,6 +159,7 @@
.getDefaultType());
cacerts.load(cacertsIs, "changeit"
.toCharArray());
+ cacertsIs.close();
}
// Check whether the issuer of the RP cert is
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
Sun Mar 2 05:40:08 2008
@@ -15,7 +15,6 @@
*/
package org.wso2.solutions.identity.sts;
-import org.apache.axis2.AxisFault;
import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.utils.ServerConfiguration;
import org.wso2.utils.security.CryptoUtil;
@@ -30,7 +29,6 @@
import java.io.FileInputStream;
import java.security.Key;
import java.security.KeyStore;
-import java.security.KeyStoreException;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SignKeyDataHolder.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SignKeyDataHolder.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/sts/saml/SignKeyDataHolder.java
Sun Mar 2 05:40:08 2008
@@ -38,8 +38,6 @@
private SignKeyDataHolder() throws IdentityProviderException {
//do once - because this is a expensive operation
- ServerConfiguration config = ServerConfiguration.getInstance();
- String host = "http://"; + config.getFirstProperty("HostName");
String keyAlias = ServerConfiguration.getInstance().getFirstProperty(
"Security.KeyStore.KeyAlias");
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
Sun Mar 2 05:40:08 2008
@@ -112,7 +112,6 @@
boolean validated = false;
String issuerName = verifier.getIssuerName();
String issuerPolicy = data.getIssuerPolicy();
- String validatePolicy = data.getValidatePolicy();
try {
if (IdentityConstants.SELF_ISSUED_ISSUER.equals(issuerName)) {
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
Sun Mar 2 05:40:08 2008
@@ -71,9 +71,11 @@
KeyStore store = KeyStore.getInstance(storeType);
String realPath = filterConfig.getServletContext().getRealPath(
keyStore);
- store.load(new FileInputStream(realPath), storePass.toCharArray());
+ FileInputStream fis = new FileInputStream(realPath);
+ store.load(fis, storePass.toCharArray());
privateKey = (PrivateKey) store.getKey(keyAlias, keyPass
.toCharArray());
+ fis.close();
} catch (Exception e) {
throw new ServletException("Cannot load the private key", e);
}
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/ShowUserVerificationAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/ShowUserVerificationAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/ShowUserVerificationAction.java
Sun Mar 2 05:40:08 2008
@@ -7,8 +7,9 @@
import com.opensymphony.xwork2.ActionContext;
-public class ShowUserVerificationAction
- extends ManagedAction {
+public class ShowUserVerificationAction extends ManagedAction {
+
+ private static final long serialVersionUID = 8826372963551956876L;
public String execute() throws Exception {
String result = ERROR;
@@ -18,9 +19,6 @@
String[] values = request
.getParameterValues(EmailVerifier.CONF_STRING);
- String stuff = request
- .getParameter(EmailVerifier.CONF_STRING);
-
if (values != null && values.length > 0) {
EmailVerifier verifier = new EmailVerifier();
boolean value = verifier.confirmUser(values[0]);
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
