[Carbon-commits] [Carbon] svn commit r91889 - in trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources: org/wso2/carbon/roles/mgt/ui/i18n web/roles-mgt

[supunm at wso2.com]

Author: supunm
Date: Mon Apr 18 01:30:21 2011
New Revision: 91889
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=91889

Log:
fix for CARBON-9215

Modified:
   trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/org/wso2/carbon/roles/mgt/ui/i18n/Resources.properties
   trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/add-server-role.jsp
   trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/server-roles-mgt.jsp

Modified: trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/org/wso2/carbon/roles/mgt/ui/i18n/Resources.properties
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/org/wso2/carbon/roles/mgt/ui/i18n/Resources.properties?rev=91889&r1=91888&r2=91889&view=diff
==============================================================================
--- trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/org/wso2/carbon/roles/mgt/ui/i18n/Resources.properties	(original)
+++ trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/org/wso2/carbon/roles/mgt/ui/i18n/Resources.properties	Mon Apr 18 01:30:21 2011
@@ -11,6 +11,7 @@
 confirm.delete.server-role=Do you wish to delete the Server Role
 warn.empty.server-role.name=Server Role is empty. Please enter a valid Server Role.
 warn.existing.server-role.name=Entered Server Role already exists. Please enter a different Server Role.
+warn.wrong.server-role.name.format=Wrong format in ServerRole name. Please enter a valid name.
 server-role.add=Server Role {0} added successfully.
 server-role.cannot.add=Could not add Server Role {0}. Error is: {1}
 server-role.read=Server Role {0} read successfully.

Modified: trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/add-server-role.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/add-server-role.jsp?rev=91889&r1=91888&r2=91889&view=diff
==============================================================================
--- trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/add-server-role.jsp	(original)
+++ trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/add-server-role.jsp	Mon Apr 18 01:30:21 2011
@@ -23,14 +23,15 @@
 <%@page import="org.wso2.carbon.utils.ServerConstants" %>
 <%@ page import="java.text.MessageFormat" %>
 <%@page import="java.util.ResourceBundle" %>
+<%@ page import="org.wso2.carbon.ui.util.CharacterEncoder" %>
 
 <%
     String forwardTo;
     String BUNDLE = "org.wso2.carbon.roles.mgt.ui.i18n.Resources";
     ResourceBundle resourceBundle = ResourceBundle.getBundle(BUNDLE, request.getLocale());
     ServerRoleManagerClient client;
-    String serverRoleName = request.getParameter("serverRoleName");
-    String serverRoleType = request.getParameter("serverRoleType");
+    String serverRoleName = CharacterEncoder.getSafeText(request.getParameter("serverRoleName"));
+    String serverRoleType = CharacterEncoder.getSafeText(request.getParameter("serverRoleType"));
 
     try {
         String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);

Modified: trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/server-roles-mgt.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/server-roles-mgt.jsp?rev=91889&r1=91888&r2=91889&view=diff
==============================================================================
--- trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/server-roles-mgt.jsp	(original)
+++ trunk/carbon/core/server-role-manager/org.wso2.carbon.roles.mgt.ui/src/main/resources/web/roles-mgt/server-roles-mgt.jsp	Mon Apr 18 01:30:21 2011
@@ -67,19 +67,36 @@
 
     function addServerRole() {
         var serverRoleName = document.getElementById('_serverRoleName');
-        if (serverRoleName == null || serverRoleName.value == "") {
+        var serverRoleType = '<fmt:message key="server-role.type.custom"/>';
+
+        if (validateInput(serverRoleName.value, serverRoleType)) {
+            location.href = 'add-server-role.jsp?serverRoleName=' + serverRoleName.value + "&serverRoleType="
+                    + serverRoleType;
+        } else {
+
+        }
+        return true;
+    }
+
+    function validateInput(serverRoleName, serverRolesType) {
+//        serverRoleName = stripWhitespace(serverRoleName);
+        if (!(serverRoleName.search(/^[A-Za-z0-9_]{1,20}$/) != -1)){
+            CARBON.showWarningDialog('<fmt:message key="warn.wrong.server-role.name.format"/>', null, null);
+            return false;
+        }
+
+        if (serverRoleName == null || serverRoleName == "") {
             CARBON.showWarningDialog('<fmt:message key="warn.empty.server-role.name"/> ', null, null);
             return false;
         }
-        var isExistingBool = isExisting(serverRoleName.value, '<fmt:message key = "server-role.type.default"/>');
-        var isExistingBool2 = isExisting(serverRoleName.value, '<fmt:message key="server-role.type.custom"/>');
 
-        if (isExistingBool || isExistingBool2) {
+        var isExistingBool1 = isExisting(serverRoleName, '<fmt:message key = "server-role.type.default"/>');
+        var isExistingBool2 = isExisting(serverRoleName, '<fmt:message key="server-role.type.custom"/>');
+        if (isExistingBool1 || isExistingBool2) {
             CARBON.showWarningDialog('<fmt:message key="warn.existing.server-role.name"/>', null, null, null);
             return false;
         }
-        location.href = 'add-server-role.jsp?serverRoleName=' + serverRoleName.value + "&serverRoleType="
-                + '<fmt:message key="server-role.type.custom"/>';
+
         return true;
     }
 
@@ -126,6 +143,18 @@
         }
     }
 
+    // removes any whitespace from the string and returns the result
+    // the value of "replacement" will be used to replace the whitespace (optional)
+    function stripWhitespace(str, replacement) {
+        if (replacement == null) replacement = '';
+        var result = str;
+        var re = new RegExp(/\s/g);
+        if (str.search(re) != -1) {
+            result = str.replace(re, replacement);
+        }
+        return result;
+    }
+
     function showHideCommon(divId) {
         var theDiv = document.getElementById(divId);
         if (theDiv.style.display == "none") {