QPID-6366: [Java Broker] Prevent data urls cluttering the UI and prevent potentially large data url consuming too much bandwidth during the regular REST poll

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1657900 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 63 insertions, 28 deletions

diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
index b8509ebd39..3e0f5b63f0 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java
@@ -27,6 +27,6 @@ import org.apache.qpid.server.model.ManagedObject;
 @ManagedObject( category = false, type="AclFile" )
 public interface ACLFileAccessControlProvider<X extends ACLFileAccessControlProvider<X>> extends AccessControlProvider<X>
 {
-    @ManagedAttribute( mandatory = true, description = "File location" )
+    @ManagedAttribute( mandatory = true, description = "File location", oversize = true, oversizedAltText = OVER_SIZED_ATTRIBUTE_ALTERNATIVE_TEXT)
     String getPath();
 }
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
index 9b384cd36f..b995bb442c 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
@@ -188,7 +188,10 @@ public class MetaDataServlet extends AbstractServlet
             {
                 attrDetails.put("secure",attribute.isSecure());
             }
-
+            if(attribute.isOversized())
+            {
+                attrDetails.put("oversize", attribute.isOversized());
+            }
             attributeDetails.put(attribute.getName(), attrDetails);
         }
         return attributeDetails;
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js
index 7b1663ac5d..f603c96ff3 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ResourceWidget.js
@@ -168,6 +168,10 @@ function (declare, array, lang, util, _WidgetBase, _TemplatedMixin, _WidgetsInTe
             {
                 console.log(message);
             }
+       },
+       _setPlaceHolderAttr: function(newValue)
+       {
+            this.resourceLocation.set("placeHolder", newValue);
        }
      }
    );
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
index feb7da1864..b4c45d8f99 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filekeystore/add.js
@@ -52,13 +52,15 @@ define(["dojo/dom","dojo/query", "dojo/_base/array", "dijit/registry","qpid/comm
                         var name = item.id.replace("addStore.","");
                         if (name in attributes )
                         {
-                            if  (item.type != "password")
+                            var attribute = attributes[name];
+                            if (attribute.secure || attribute.oversize)
                             {
-                                item.set("value", effectiveData[name]);
+                                 item.set("required", false);
+                                 item.set("placeHolder", effectiveData[name]);
                             }
                             else
                             {
-                                item.set("required", effectiveData?false:true);
+                                item.set("value", effectiveData[name]);
                             }
                         }
                     });
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js
index b55affb33b..e04ee1a835 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/filetruststore/add.js
@@ -53,13 +53,15 @@ define(["dojo/dom","dojo/query", "dojo/_base/array", "dijit/registry","qpid/comm
                         var name = item.id.replace("addStore.","");
                         if (name in attributes )
                         {
-                            if  (item.type != "password")
+                            var attribute = attributes[name];
+                            if (attribute.secure || attribute.oversize)
                             {
-                                item.set("value", effectiveData[name]);
+                                 item.set("required", false);
+                                 item.set("placeHolder", effectiveData[name]);
                             }
                             else
                             {
-                                item.set("required", effectiveData?false:true);
+                                item.set("value", effectiveData[name]);
                             }
                         }
                     });
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js
index 989af03832..0d74699d79 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavakeystore/add.js
@@ -43,15 +43,28 @@ define(["dojo/dom","dojo/query", "dojo/_base/array", "dijit/registry","qpid/comm
             },
             update: function(effectiveData)
             {
-                var attributes = metadata.getMetaData("KeyStore", "NonJavaKeyStore").attributes;
-                var widgets = registry.findWidgets(this.containerNode);
-                var that=this;
-                array.forEach(widgets, function(item)
-                    {
-                        var name = item.id.replace("addStore.","");
-                        var val = effectiveData[name];
-                        item.set("value", val);
-                    });
+                if (effectiveData)
+                {
+                    var attributes = metadata.getMetaData("KeyStore", "NonJavaKeyStore").attributes;
+                    var widgets = registry.findWidgets(this.containerNode);
+                    array.forEach(widgets, function(item)
+                        {
+                            var name = item.id.replace("addStore.","");
+                            if (name in attributes )
+                            {
+                                var attribute = attributes[name];
+                                if (attribute.oversize || attribute.secure)
+                                {
+                                     item.set("required", false);
+                                     item.set("placeHolder", effectiveData[name]);
+                                }
+                                else
+                                {
+                                    item.set("value", effectiveData[name]);
+                                }
+                            }
+                        });
+                }
             }
         };
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js
index 15926d1832..53e3b43082 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/store/nonjavatruststore/add.js
@@ -43,17 +43,28 @@ define(["dojo/dom","dojo/query", "dojo/_base/array", "dijit/registry","qpid/comm
             },
             update: function(effectiveData)
             {
-                var attributes = metadata.getMetaData("TrustStore", "NonJavaTrustStore").attributes;
-                var widgets = registry.findWidgets(this.containerNode);
-                var that=this;
-                array.forEach(widgets, function(item)
-                    {
-                        var name = item.id.replace("addStore.","");
-                        var val = effectiveData[name];
-                        item.set("value", val);
-
-                    });
-
+                if (effectiveData)
+                {
+                    var attributes = metadata.getMetaData("TrustStore", "NonJavaTrustStore").attributes;
+                    var widgets = registry.findWidgets(this.containerNode);
+                    array.forEach(widgets, function(item)
+                        {
+                            var name = item.id.replace("addStore.","");
+                            if (name in attributes )
+                            {
+                                var attribute = attributes[name];
+                                if (attribute.oversize || attribute.secure)
+                                {
+                                     item.set("required", false);
+                                     item.set("placeHolder", effectiveData[name]);
+                                }
+                                else
+                                {
+                                    item.set("value", effectiveData[name]);
+                                }
+                            }
+                        });
+                }
             }
         };