OF-800: Fix handling for system properties page

Properly detect and modify encryption settings from the system properties page. Remove encryption settings for deleted properties.

OF-800: Fix handling for system properties page
Properly detect and modify encryption settings from the system properties page. Remove encryption settings for deleted properties.
593ce0be · Tom Evans · acc93e0d · 593ce0be · 593ce0be · 593ce0be
Commit 593ce0be authored May 09, 2014 by Tom Evans
Showing with 19 additions and 22 deletions

JiveGlobals.java src/java/org/jivesoftware/util/JiveGlobals.java +4 -3

XMLProperties.java src/java/org/jivesoftware/util/XMLProperties.java +1 -0

server-properties.jsp src/web/server-properties.jsp +14 -19

No files found.
--- a/src/java/org/jivesoftware/util/JiveGlobals.java
+++ b/src/java/org/jivesoftware/util/JiveGlobals.java
@@ -765,6 +765,7 @@ public class JiveGlobals {
            properties = JiveProperties.getInstance();
        }
        properties.remove(name);
+        setPropertyEncrypted(name, false);
    }

    /**
@@ -825,10 +826,10 @@ public class JiveGlobals {
    		loadSecurityProperties();
    	}
    	boolean propertyWasChanged;
-    	if (isPropertyEncrypted(name)) {
-    		propertyWasChanged = securityProperties.removeFromList(ENCRYPTED_PROPERTY_NAMES, name);
-    	} else {
+    	if (encrypt) {
    		propertyWasChanged = securityProperties.addToList(ENCRYPTED_PROPERTY_NAMES, name);
+    	} else {
+    		propertyWasChanged = securityProperties.removeFromList(ENCRYPTED_PROPERTY_NAMES, name);
    	}
    	if (propertyWasChanged) {
    		resetProperty(name);

--- a/src/java/org/jivesoftware/util/XMLProperties.java
+++ b/src/java/org/jivesoftware/util/XMLProperties.java
@@ -684,6 +684,7 @@ public class XMLProperties {
        // .. then write to disk.
        saveProperties();

+        JiveGlobals.setPropertyEncrypted(name, false);
        // Generate event.
        Map<String, Object> params = Collections.emptyMap();
        PropertyEventDispatcher.dispatchEvent(name, PropertyEventDispatcher.EventType.xml_property_deleted, params);

--- a/src/web/server-properties.jsp
+++ b/src/web/server-properties.jsp
@@ -82,16 +82,6 @@
        }
    }

-    if (encrypt) {
-        if (propName != null) {
-            JiveGlobals.setPropertyEncrypted(propName, true);
-            // Log the event
-            webManager.logEvent("encrypted server property "+propName, null);
-            response.sendRedirect("server-properties.jsp?encryptsuccess=true");
-            return;
-        }
-    }
-
    Map<String, String> errors = new HashMap<String, String>();
    if (save) {
        if (propName == null || "".equals(propName.trim()) || propName.startsWith("\"")) {
@@ -113,16 +103,26 @@
        }
    }

+    if (encrypt) {
+        if (propName != null) {
+            JiveGlobals.setPropertyEncrypted(propName, true);
+            // Log the event
+            webManager.logEvent("encrypted server property "+propName, null);
+            response.sendRedirect("server-properties.jsp?encryptsuccess=true");
+            return;
+        }
+    }
+
+    if (edit) {
+        propValue = JiveGlobals.getProperty(propName);
+    }
+
    List<String> properties = JiveGlobals.getPropertyNames();
    Collections.sort(properties, new Comparator<String>() {
        public int compare(String s1, String s2) {
            return s1.toLowerCase().compareTo(s2.toLowerCase());
        }
    });
-
-    if (edit) {
-        propValue = JiveGlobals.getProperty(propName);
-    }
 %>

 <html>
@@ -426,10 +426,5 @@ function dodelete(propName) {

 </form>

-<br><br><br><br><br><br>
-<br><br><br><br><br><br>
-<br><br><br><br><br><br>
-<br><br><br><br><br><br>
-
    </body>
 </html>