Author: dimuthul
Date: Thu Dec 6 02:36:06 2007
New Revision: 10616
Log:
Removing SQLFile property from the DefaultRealm in initializer
Adding proper erros
More validations
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/UIUtils.java
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/EditCardissuerConfigAction.java
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ReportSTSUsageAction.java
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/cardissueredit.jsp
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/Initializer.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/persistence/dataobject/ActionDO.java
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/resources.properties
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/LoginAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/LogoutAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/RegisterInfoCardAction.java
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UserRegistrationFormSubmitAction.java
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/UIUtils.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/UIUtils.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/UIUtils.java
Thu Dec 6 02:36:06 2007
@@ -23,11 +23,8 @@
public static final int HEIGHT = 80;
-
-
-
-
-
+
+
public static void createThumbnailImageFile(File inFile, String
outFileName) throws Exception{
int newWidth = WIDTH;
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/EditCardissuerConfigAction.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/EditCardissuerConfigAction.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/EditCardissuerConfigAction.java
Thu Dec 6 02:36:06 2007
@@ -16,20 +16,24 @@
package org.wso2.solutions.identity.admin.ui.action;
+import java.io.File;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.wso2.solutions.identity.IdentityConstants;
-import org.wso2.solutions.identity.IdentityProviderException;
import org.wso2.solutions.identity.admin.ParameterAdmin;
import org.wso2.solutions.identity.admin.ui.UIUtils;
import org.wso2.solutions.identity.cards.CardIssuerConfig;
import org.wso2.wsas.ServerConstants;
-import java.io.File;
-public class EditCardissuerConfigAction extends ManagedAction {
+public class EditCardissuerConfigAction
+ extends ManagedAction {
+
private static final long serialVersionUID = 0L;
- private int validPeriod = 0;
+ private String validPeriod = null;
private String cardName = null;
@@ -47,11 +51,12 @@
private boolean useSymmBinding = false;
- public String execute() throws Exception {
+ private static Log log = LogFactory
+ .getLog(EditCardissuerConfigAction.class);
+ public String execute() throws Exception {
ParameterAdmin admin = new ParameterAdmin();
- validPeriod = Integer.parseInt(admin
- .getParameterValue(IdentityConstants.PARAM_VALID_PERIOD));
+ validPeriod =
admin.getParameterValue(IdentityConstants.PARAM_VALID_PERIOD);
cardName = admin.getParameterValue(IdentityConstants.PARAM_CARD_NAME);
String types = admin
.getParameterValue(IdentityConstants.PARAM_SUPPORTED_TOKEN_TYPES);
@@ -73,17 +78,47 @@
public String doUpdate() {
String retString = SUCCESS;
try {
+ cardName = cardName.trim();
+ validPeriod = validPeriod.trim();
+
+ if (cardName.length() == 0 || validPeriod.length() == 0) {
+ this.addErrorMessage(getText("required_feild_missing"));
+ loadMessages();
+ return ERROR;
+ }
+
+ if (validPeriod == null) {
+ this.addErrorMessage(getText("invalid_data_for",
+ new String[] { "Valid Period" }));
+ loadMessages();
+ return ERROR;
+ }
+
+ int period = 0;
+
+ try {
+ period = Integer.parseInt(validPeriod);
+ } catch (NumberFormatException e) {
+ this.addErrorMessage(getText("invalid_data_for",
+ new String[] { "Valid Period" }));
+ loadMessages();
+ return ERROR;
+ }
+
+
ParameterAdmin admin = new ParameterAdmin();
admin.createOrUpdatearameter(IdentityConstants.PARAM_VALID_PERIOD,
- Integer.toString(validPeriod));
+ validPeriod);
admin.createOrUpdatearameter(IdentityConstants.PARAM_CARD_NAME,
cardName);
String tokValues = null;
if (samlVersion10 == false && samlVersion11 == false) {
+
this.addErrorMessage(getText("no_token_types_selected"));
this.loadMessages();
return ERROR;
+
}
if (samlVersion10) {
@@ -109,43 +144,43 @@
admin.removeParam(IdentityConstants.PARAM_USE_SYMM_BINDING);
}
- try {
- if (file.exists()) {
- String imagePath = System
- .getProperty(ServerConstants.WSO2WSAS_HOME)
- + IdentityConstants.CARD_IMAGE_PATH;
- File preFile = new File(imagePath);
-
- if (preFile.exists()) {
- if (preFile.delete() == false) {
- throw new IdentityProviderException(
- "Error replcing image. Cannot delete
previous image");
- }
+ if (file.exists()) {
+ String imagePath = System
+ .getProperty(ServerConstants.WSO2WSAS_HOME)
+ + IdentityConstants.CARD_IMAGE_PATH;
+ File preFile = new File(imagePath);
+
+ if (preFile.exists()) {
+ if (preFile.delete() == false) {
+
+ throw new Exception(
+ getText("error_removing_existing_image"));
}
- UIUtils.createThumbnailImageFile(file, imagePath);
}
- } catch (Exception e) {
- throw new IdentityProviderException("Error converting image"
- + e.getMessage(), e);
+ UIUtils.createThumbnailImageFile(file, imagePath);
}
-
CardIssuerConfig.updateConfig();
-
- } catch (IdentityProviderException e) {
- message = e.getMessage();
+
+ } catch (Exception e) {
+ String msg = getText("error_saving_card_issuer_info",
+ new String[] { e.getMessage() });
+ log.error(msg, e);
+ this.addActionError(msg + e.getMessage());
+ loadMessages();
retString = ERROR;
}
-
return retString;
}
- public int getValidPeriod() {
+
+
+ public String getValidPeriod() {
return validPeriod;
}
- public void setValidPeriod(int validPeriod) {
+ public void setValidPeriod(String validPeriod) {
this.validPeriod = validPeriod;
}
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ReportSTSUsageAction.java
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ReportSTSUsageAction.java
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/java/org/wso2/solutions/identity/admin/ui/action/ReportSTSUsageAction.java
Thu Dec 6 02:36:06 2007
@@ -65,8 +65,6 @@
this.toDate = toDate;
}
-
-
public String getDescription() {
return description;
}
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/resources/org/wso2/solutions/identity/package.properties
Thu Dec 6 02:36:06 2007
@@ -34,4 +34,10 @@
remove_rp_hostname_null = Hostname missing
required_feild_missing = Required field missing
-error_unexpected = Error : {0} !
\ No newline at end of file
+error_unexpected = Error : {0} !
+error_saving_card_issuer_info = Error updating Card Issuer Config {0}
+select_one_token_type = Please select at least one token type
+error_removing_existing_image = Error removing existing image
+successful_for = Successful for {0}
+email_verification = Email verification sent for {0}
+invalid_data_for = Invalid Data for {0}
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/cardissueredit.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/cardissueredit.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/cardissueredit.jsp
Thu Dec 6 02:36:06 2007
@@ -49,7 +49,7 @@
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowConfigureCardIssuer.action">Card Issuer
Configuration</a> |Edit Card Issuer Configuration</div>
<h1 class="headding-CardIssuer">Edit Card
Issuer Configuration</h1>
<s:property value="message" />
-
+
<s:iterator value="errorMessages">
<p><font color="#FF0000"><s:property /></font></p>
</s:iterator>
@@ -58,24 +58,18 @@
<p><font color="#00FF00"><s:property /></font></p>
</s:iterator>
- <s:form action="EditCardIssuer" method="post"
enctype="multipart/form-data" theme="simple">
+ <s:form action="EditCardIssuer" method="post" theme="simple"
enctype="multipart/form-data">
<table cellpadding="0" cellspacing="0"
border="0" class="form-table">
- <!--
- <tr>
- <td>Card Issuer Name</td>
- <td><s:textfield name="issuer"
value="%{issuer}"/></td>
- </tr>
- -->
<tr>
- <td>Card Name</td>
+ <td valign="top"
style="width:150px;">Card Name<span style="color:red">*</span></td>
<td><s:textfield
name="cardName" value="%{cardName}"/></td>
</tr>
<tr>
- <td>Valid Period</td>
+ <td valign="top"
style="width:150px;">Valid Period<span style="color:red">*</span></td>
<td><s:textfield
name="validPeriod" value="%{validPeriod}"/></td>
</tr>
<tr>
- <td>Token Types</td>
+ <td valign="top"
style="width:150px;">Token Types<span style="color:red">*</span></td>
<td>
<s:checkbox
name="samlVersion10" value="samlVersion10" fieldValue="true"/> SAML1.0
<s:checkbox
name="samlVersion11" value="samlVersion11" fieldValue="true"/> SAML1.1
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/Initializer.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/Initializer.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/Initializer.java
Thu Dec 6 02:36:06 2007
@@ -48,7 +48,6 @@
import org.wso2.usermanager.verification.email.EmailVerifierConfig;
import org.wso2.utils.ServerConfiguration;
import org.wso2.utils.ServerException;
-import org.wso2.wsas.ServerConstants;
import org.wso2.wsas.ServerInitializer;
import org.wso2.wsas.admin.service.UserAdmin;
@@ -187,14 +186,6 @@
prop.setValue(IdentityProviderConstants.Default.DRIVER);
db.create(prop);
- prop = new RealmConfigurationPropertyDO();
- prop.setConfig(realmConfig);
- prop.setName("SqlFile");
- prop.setValue(System.getProperty(ServerConstants.WSO2WSAS_HOME)
- + "/conf/"
- + IdentityProviderConstants.Default.SQL_STATEMENTS_FILE_PATH);
- db.create(prop);
-
this.setupSampleRealmConfig(db, jdbcRealm);
// Enable user registration
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
Thu Dec 6 02:36:06 2007
@@ -144,7 +144,7 @@
String cardId = infoCard.getInformationCardReference().getCardId();
ReportAdmin.record(primaryUserId,
- ActionDO.ACTION_USER_DOWNLOAD_CARD, "CardId ::" + cardId);
+ ActionDO.ACTION_USER_DOWNLOAD_CARD, "CardId=" + cardId);
return elem;
} catch (CardModelException e) {
Modified:
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ActionDO.java
==============================================================================
---
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ActionDO.java
(original)
+++
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/persistence/dataobject/ActionDO.java
Thu Dec 6 02:36:06 2007
@@ -28,7 +28,7 @@
public final static String ACTION_USER_LOG_IN_CARD = "User Login - Info
Card";
public final static String ACTION_USER_LOG_OUT = "User Logged out";
public final static String ACTION_USER_INFOCARD_SUBMIT = "Register
InfoCard";
- public final static String ACTION_USER_REGISTER = "User register";
+ public final static String ACTION_USER_REGISTER = "User registration";
public final static String ACTION_USER_DOWNLOAD_CARD = "Downloaded Card";
public final static String ACTION_USER_ADD_RP = "Add trusted Relying
Party";
public final static String ACTION_CARD_ISSUE_FAILURE = "Issue Card
Failure";
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 Dec 6 02:36:06 2007
@@ -50,6 +50,7 @@
relyingPartyExists = Relying party {0} already exists
errorInKeystoreAccess = Error accessing keystore
emailNotActivated = Email Verification not activted now, but all parameters
are saved. It will be activated when DefaultRealm is selected.
+
#db errors
createDuplicateEntity = Duplcate entity exist
errorCreatingEntity = Error creating entity in the database
@@ -71,3 +72,5 @@
errorQuerryingUserAction = Error reading UserAction from database
errorQuerryingVerifierServiceData = Error reading VerifierService data from
database
errorAccessActions = Error in accessing user actions from database
+
+
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/LoginAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/LoginAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/LoginAction.java
Thu Dec 6 02:36:06 2007
@@ -44,12 +44,14 @@
if (this.doLogin()) {
Map session = ActionContext.getContext().getSession();
session.put(UIConstants.USER, username);
- ReportAdmin.record(username, ActionDO.ACTION_USER_LOG_IN_UT, "");
- this.addInfoMessage(getText("login_successful", new String[]
{username}));
+ String msg = getText("successful_for", new String[] {username});
+ ReportAdmin.record(username, ActionDO.ACTION_USER_LOG_IN_UT, msg);
+ this.addInfoMessage(msg);
return SUCCESS;
} else {
- this.addErrorMessage(getText("invalid_user_password"));
- ReportAdmin.record(username, ActionDO.ACTION_USER_FAILURE,
"Login");
+ String msg = getText("invalid_user_password");
+ addActionError(msg);
+ ReportAdmin.record(username, ActionDO.ACTION_USER_FAILURE, msg);
return ERROR;
}
}
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/LogoutAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/LogoutAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/LogoutAction.java
Thu Dec 6 02:36:06 2007
@@ -34,7 +34,8 @@
String username = (String)session.get(UIConstants.USER);
session.remove(UIConstants.USER);
session.remove(UIConstants.PPID);
- ReportAdmin.record(username, ActionDO.ACTION_USER_LOG_OUT, "");
+ String msg = getText("successful_for", new String[] {username});
+ ReportAdmin.record(username, ActionDO.ACTION_USER_LOG_OUT, msg);
return SUCCESS;
}
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/RegisterInfoCardAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/RegisterInfoCardAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/RegisterInfoCardAction.java
Thu Dec 6 02:36:06 2007
@@ -73,10 +73,11 @@
* he/she will not see anything and it is good to leave that user
* confused :P :-)
*/
- addErrorMessage(getText("register-card-already-exists",
+ String msg = getText("register-card-already-exists",
new String[] { IdentityProviderUtil
- .getPPIDDisplayValue(ppid) }));
- ReportAdmin.record(user, ActionDO.ACTION_USER_FAILURE,
"RegisterCard");
+ .getPPIDDisplayValue(ppid) });
+ addErrorMessage(msg);
+ ReportAdmin.record(user, ActionDO.ACTION_USER_FAILURE, msg);
return ERROR;
}
return SUCCESS;
Modified:
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UserRegistrationFormSubmitAction.java
==============================================================================
---
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UserRegistrationFormSubmitAction.java
(original)
+++
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/UserRegistrationFormSubmitAction.java
Thu Dec 6 02:36:06 2007
@@ -72,7 +72,8 @@
if (emailVerification && emailAddress != null) {
EmailVerifier verifier = new EmailVerifier();
verifier.requestUserVerification(username, emailAddress, password,
props);
- ReportAdmin.record(username, ActionDO.ACTION_USER_REGISTER, "Email
Verification Sent");
+ String msg = getText("email_verification", new String[]
{username});
+ ReportAdmin.record(username, ActionDO.ACTION_USER_REGISTER, msg);
this.addInfoMessage(getText("please_check_mail",
new String[] { emailAddress }));
} else {
@@ -90,7 +91,8 @@
}
store.getRealm().getUserStoreAdmin().setUserProperties(
this.username, props);
- ReportAdmin.record(username, ActionDO.ACTION_USER_REGISTER, "");
+ String msg = getText("successful_for", new String[]{username});
+ ReportAdmin.record(username, ActionDO.ACTION_USER_REGISTER, msg);
this.addInfoMessage(getText("user_successfully_added",
new String[] { username }));
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
