Fixes #21223 : Fixed realm create and edit operations (#21973)

sumauppa · yaminikb · commit 5f201bffd6f1 · 2017-07-05T10:20:59.000+05:30
diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/SecurityHandler.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/SecurityHandler.java
@@ -253,13 +253,6 @@ public static void saveRealm(HandlerContext handlerCtx) {
                 putOptional(attrMap, propList, "assign-groups", "fileAsGroups");
             }else
             if(classname.indexOf("LDAPRealm")!= -1){
-                if (!edit) {
-                    attrMap.put("baseDn", "\"" + attrMap.get("baseDn") + "\"");
-                    attrMap.put("directory", "\"" + attrMap.get("directory") + "\"");
-                    for (Map<String,String> m : propList) {
-                        m.put("value", "\"" + m.get("value") + "\"");
-                    }
-                }
                 putOptional(attrMap, propList, "jaas-context", "ldapJaax");
                 putOptional(attrMap, propList, "base-dn", "baseDn");
                 putOptional(attrMap, propList, "directory", "directory");
diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
@@ -1116,6 +1116,7 @@ public static String escapePropertyValue(String str){
                 case '\\':
                 case '\'':
                 case '"':
+                case '=':
                     builder.append("\\");
                     builder.append(ch);
                     break;
diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/JSONUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/JSONUtil.java
@@ -142,6 +142,7 @@ public static String javaToJSON(Object obj, int depth) {
 		    case '\\':
 		    case '\'':
 		    case '"':
+                    case '=':
 			builder.append("\\");
 			builder.append(ch);
 			break;
diff --git a/appserver/admingui/common/src/main/resources/security/realms/realmEdit.jsf b/appserver/admingui/common/src/main/resources/security/realms/realmEdit.jsf
@@ -59,14 +59,14 @@
         urlencode(value="#{pageSession.configName}" encoding="UTF-8" result="#{pageSession.encodedConfigName}");
         setPageSessionAttribute(key="parentPage" value="#{request.contextPath}/common/security/realms/realms.jsf");
         setPageSessionAttribute(key="selfPage" value="#{request.contextPath}/common/security/realms/realmEdit.jsf?name=#{pageSession.encodedName}&configName=#{pageSession.encodedConfigName}");
-        setPageSessionAttribute(key="parentUrl", value="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/security-service/auth-realm/#{pageSession.encodedName}");
+        setPageSessionAttribute(key="parentUrl", value="#{sessionScope.REST_URL}/configs/config/#{pageSession.encodedConfigName}/security-service/auth-realm/#{pageSession.encodedName}");
         setPageSessionAttribute(key="rest-api" value="true");
         getRealmAttrForEdit(endpoint="#{parentUrl}" attrMap=>$page{attrMap}, classnameOption=>$page{classnameOption}, realmClasses=>$page{realmClasses}, properties="#{pageSession.tableList}" );
         createMap(result="#{pageSession.valueMap}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
         mapPut(map="#{pageSession.attrMap}" key="target" value="#{pageSession.valueMap['target']}");
         setPageSessionAttribute(key="myOption" value="$pageSession{classnameOption}");
-        gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/security-service/auth-realm/#{pageSession.Name}/supports-user-management.json?target=#{pageSession.configName}", method="get", result="#{requestScope.result}");
+        gf.restRequest(endpoint="#{sessionScope.REST_URL}/configs/config/#{pageSession.encodedConfigName}/security-service/auth-realm/#{pageSession.encodedName}/supports-user-management.json?target=#{pageSession.encodedConfigName}", method="get", result="#{requestScope.result}");
         setPageSessionAttribute(key="showUserButton" value="#{false}");
         if ("#{requestScope.result.data['message']}=true") {
             setPageSessionAttribute(key="showUserButton" value="#{true}");
diff --git a/appserver/admingui/common/src/main/resources/security/realms/realmNew.jsf b/appserver/admingui/common/src/main/resources/security/realms/realmNew.jsf
@@ -77,8 +77,9 @@
         setPageSessionAttribute(key="edit" value="#{false}" );
         setPageSessionAttribute(key="showUserButton" value="#{false}" )
         getRequestValue(key="configName" value=>$page{configName}  default="server-config");
+        urlencode(value="#{pageSession.configName}" encoding="UTF-8" result="#{pageSession.encodedConfigName}");
         setPageSessionAttribute(key="parentPage" value="#{request.contextPath}/common/security/realms/realms.jsf");
-        setPageSessionAttribute(key="parentUrl", value="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/security-service");
+        setPageSessionAttribute(key="parentUrl", value="#{sessionScope.REST_URL}/configs/config/#{pageSession.encodedConfigName}/security-service");
         setPageSessionAttribute(key="rest-api" value="true");
         getRealmAttrForCreate(attrMap=>$page{attrMap}, classnameOption=>$page{classnameOption}, realmClasses=>$page{realmClasses}, properties=>$page{props}  );
         createMap(result="#{pageSession.valueMap}");
diff --git a/appserver/admingui/common/src/main/resources/security/realms/realms.jsf b/appserver/admingui/common/src/main/resources/security/realms/realms.jsf
@@ -52,18 +52,18 @@
     <event>
     <!beforeCreate
         getRequestValue(key="configName" value=>$page{configName});
-        urlencode(value="#{pageSession.name}" encoding="UTF-8" result=>$page{encodedConfigName});
+        urlencode(value="#{pageSession.configName}" encoding="UTF-8" result="#{pageSession.encodedConfigName}");
         setPageSessionAttribute(key="childType" value="auth-realm");
-        setPageSessionAttribute(key="parentUrl", value="#{sessionScope.REST_URL}/configs/config/#{pageSession.configName}/security-service");
+        setPageSessionAttribute(key="parentUrl", value="#{sessionScope.REST_URL}/configs/config/#{pageSession.encodedConfigName}/security-service");
         setPageSessionAttribute(key="selfUrl", value="#{pageSession.parentUrl}/#{pageSession.childType}");
         setPageSessionAttribute(key="rest-api" value="true");
         gf.getChildList(parentEndpoint="#{pageSession.parentUrl}", childType="#{pageSession.childType}", result="#{requestScope.listOfRows}");
         createMap(result="#{pageSession.valueMap}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
         setPageSessionAttribute(key="confirmDeleteMsg" value="$resource{i18nc.msg.JS.confirmDeleteRealms}");
-        setPageSessionAttribute(key="createLink" value="#{request.contextPath}/common/security/realms/realmNew.jsf?configName=#{pageSession.configName}");
-        setPageSessionAttribute(key="listLink" value="#{request.contextPath}/common/security/realms/realms.jsf?configName=#{pageSession.configName}");
-        setPageSessionAttribute(key="editLink" value="#{request.contextPath}/common/security/realms/realmEdit.jsf?configName=#{pageSession.configName}");
+        setPageSessionAttribute(key="createLink" value="#{request.contextPath}/common/security/realms/realmNew.jsf?configName=#{pageSession.encodedConfigName}");
+        setPageSessionAttribute(key="listLink" value="#{request.contextPath}/common/security/realms/realms.jsf?configName=#{pageSession.encodedConfigName}");
+        setPageSessionAttribute(key="editLink" value="#{request.contextPath}/common/security/realms/realmEdit.jsf?configName=#{pageSession.encodedConfigName}");
         setPageSessionAttribute(key="tableTitle" value="$resource{i18nc.realm.TableTitle}");
     />
     </event>
diff --git a/appserver/admingui/common/src/main/resources/shared/listTableConfigButtons.inc b/appserver/admingui/common/src/main/resources/shared/listTableConfigButtons.inc
@@ -61,7 +61,8 @@
             getSelectedSingleMapRows(TableRowGroup="${tableRowGroup}" selectedRows=>$attribute{selectedRows});
 
             if (#{pageSession['rest-api']}){
-                gf.deleteConfigCascade(endpoint="#{pageSession.parentUrl}/#{pageSession.childType}", target="#{pageSession.valueMap['target']}", selectedRows="${selectedRows}");
+                urlencode(value="#{pageSession.valueMap['target']}" encoding="UTF-8" result="#{encodedTargetName}");
+                gf.deleteConfigCascade(endpoint="#{pageSession.parentUrl}/#{pageSession.childType}", target="#{encodedTargetName}", selectedRows="${selectedRows}");
             }
             //REST-TODO: need to ensure page that has additionalDeleteHandler to change to use rest-api
             if (#{pageSession.additionalDeleteHandler}){

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@`
`61`	`61`	`getSelectedSingleMapRows(TableRowGroup="${tableRowGroup}" selectedRows=>$attribute{selectedRows});`
`62`	`62`
`63`	`63`	`if (#{pageSession['rest-api']}){`
`64`		`- gf.deleteConfigCascade(endpoint="#{pageSession.parentUrl}/#{pageSession.childType}", target="#{pageSession.valueMap['target']}", selectedRows="${selectedRows}");`
	`64`	`+ urlencode(value="#{pageSession.valueMap['target']}" encoding="UTF-8" result="#{encodedTargetName}");`
	`65`	`+ gf.deleteConfigCascade(endpoint="#{pageSession.parentUrl}/#{pageSession.childType}", target="#{encodedTargetName}", selectedRows="${selectedRows}");`
`65`	`66`	`}`
`66`	`67`	`//REST-TODO: need to ensure page that has additionalDeleteHandler to change to use rest-api`
`67`	`68`	`if (#{pageSession.additionalDeleteHandler}){`