QPID-5946 : [Java Broker] Add alternative KeyStore implementation that can use standard crt/pem rather than jks files

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

3 files changed, 78 insertions, 27 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 86a054ef31..ece4ccca4f 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -34,6 +34,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import javax.servlet.DispatcherType;
+import javax.servlet.MultipartConfigElement;
 
 import org.apache.log4j.Logger;
 import org.eclipse.jetty.server.Connector;
@@ -385,8 +386,14 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
 
     private void addRestServlet(ServletContextHandler root, String name, Class<? extends ConfiguredObject>... hierarchy)
     {
-        root.addServlet(new ServletHolder(name, new RestServlet(hierarchy)), "/api/latest/" + name + "/*");
-        root.addServlet(new ServletHolder(name, new RestServlet(hierarchy)), "/api/v" + BrokerModel.MODEL_MAJOR_VERSION + "/" + name + "/*");
+        ServletHolder servletHolder = new ServletHolder(name, new RestServlet(hierarchy));
+        servletHolder.getRegistration().setMultipartConfig(
+                new MultipartConfigElement("",
+                                           getContextValue(Long.class, MAX_HTTP_FILE_UPLOAD_SIZE_CONTEXT_NAME),
+                                           -1l,
+                                           getContextValue(Integer.class, MAX_HTTP_FILE_UPLOAD_SIZE_CONTEXT_NAME)));
+        root.addServlet(servletHolder, "/api/latest/" + name + "/*");
+        root.addServlet(servletHolder, "/api/v" + BrokerModel.MODEL_MAJOR_VERSION + "/" + name + "/*");
     }
 
     private void logOperationalListenMessages(Server server)
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
index c054ffe405..aff9f3a7e2 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java
@@ -24,6 +24,7 @@ import java.net.SocketAddress;
 
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.ManagedAttribute;
+import org.apache.qpid.server.model.ManagedContextDefault;
 import org.apache.qpid.server.model.Plugin;
 
 public interface HttpManagementConfiguration<X extends HttpManagementConfiguration<X>> extends Plugin<X>
@@ -43,5 +44,9 @@ public interface HttpManagementConfiguration<X extends HttpManagementConfigurati
     @ManagedAttribute( defaultValue = "600" )
     public int getSessionTimeout();
 
+    String MAX_HTTP_FILE_UPLOAD_SIZE_CONTEXT_NAME = "maxHttpFileUploadSize";
+    @ManagedContextDefault( name = MAX_HTTP_FILE_UPLOAD_SIZE_CONTEXT_NAME)
+    static final long DEFAULT_MAX_UPLOAD_SIZE = 100 * 1024;
+
     AuthenticationProvider getAuthenticationProvider(SocketAddress localAddress);
 }
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
index 87a4b6fb1a..8df234d24d 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
@@ -36,6 +36,8 @@ import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
+import javax.xml.bind.DatatypeConverter;
 
 import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -43,6 +45,7 @@ import org.codehaus.jackson.map.SerializationConfig;
 
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
 
 public class RestServlet extends AbstractServlet
 {
@@ -85,6 +88,7 @@ public class RestServlet extends AbstractServlet
         {
             doInitialization();
         }
+        Handler.register();
     }
 
     @SuppressWarnings("unchecked")
@@ -342,23 +346,56 @@ public class RestServlet extends AbstractServlet
     {
         response.setContentType("application/json");
 
-        ObjectMapper mapper = new ObjectMapper();
-        @SuppressWarnings("unchecked")
-        Map<String,Object> providedObject = mapper.readValue(request.getInputStream(), LinkedHashMap.class);
-
-
         List<String> names = new ArrayList<String>();
         String[] pathInfoElements = getPathInfoElements(request);
-        if(pathInfoElements != null )
+        if (pathInfoElements != null)
         {
-            if(pathInfoElements.length != _hierarchy.length)
+            if (pathInfoElements.length != _hierarchy.length)
             {
                 throw new IllegalArgumentException("Path to object to create must be fully specified. "
-                       + "Found " + names + " of size " + names.size() + " expecting " + _hierarchy.length);
+                                                   + "Found "
+                                                   + names
+                                                   + " of size "
+                                                   + names.size()
+                                                   + " expecting "
+                                                   + _hierarchy.length);
             }
             names.addAll(Arrays.asList(pathInfoElements));
         }
 
+        Map<String, Object> providedObject;
+
+        ArrayList<String> headers = Collections.list(request.getHeaderNames());
+        ObjectMapper mapper = new ObjectMapper();
+
+        if(headers.contains("Content-Type") && request.getHeader("Content-Type").startsWith("multipart/form-data"))
+        {
+            providedObject = new HashMap<>();
+            Map<String,String> fileUploads = new HashMap<>();
+            Collection<Part> parts = request.getParts();
+            for(Part part : parts)
+            {
+                if("data".equals(part.getName()) && "application/json".equals(part.getContentType()))
+                {
+                    providedObject = mapper.readValue(part.getInputStream(), LinkedHashMap.class);
+                }
+                else
+                {
+                    byte[] data = new byte[(int) part.getSize()];
+                    part.getInputStream().read(data);
+                    StringBuilder inlineURL = new StringBuilder("data:;base64,");
+                    inlineURL.append(DatatypeConverter.printBase64Binary(data));
+                    fileUploads.put(part.getName(),inlineURL.toString());
+                }
+            }
+            providedObject.putAll(fileUploads);
+        }
+        else
+        {
+
+            providedObject = mapper.readValue(request.getInputStream(), LinkedHashMap.class);
+        }
+
         if (names.isEmpty())
         {
             if (_hierarchy.length == 0)
@@ -368,7 +405,7 @@ public class RestServlet extends AbstractServlet
                     doUpdate(getBroker(), providedObject);
                     response.setStatus(HttpServletResponse.SC_OK);
                 }
-                catch(RuntimeException e)
+                catch (RuntimeException e)
                 {
                     setResponseStatus(response, e);
                 }
@@ -380,24 +417,24 @@ public class RestServlet extends AbstractServlet
             }
         }
 
-        providedObject.put("name", names.get(names.size()-1));
+        providedObject.put("name", names.get(names.size() - 1));
 
         @SuppressWarnings("unchecked")
         Collection<ConfiguredObject>[] objects = new Collection[_hierarchy.length];
-        if(_hierarchy.length == 1)
+        if (_hierarchy.length == 1)
         {
             createOrUpdate(providedObject, _hierarchy[0], getBroker(), null, response);
         }
         else
         {
-            for(int i = 0; i < _hierarchy.length-1; i++)
+            for (int i = 0; i < _hierarchy.length - 1; i++)
             {
                 objects[i] = new HashSet<ConfiguredObject>();
-                if(i == 0)
+                if (i == 0)
                 {
-                    for(ConfiguredObject object : getBroker().getChildren(_hierarchy[0]))
+                    for (ConfiguredObject object : getBroker().getChildren(_hierarchy[0]))
                     {
-                        if(object.getName().equals(names.get(0)))
+                        if (object.getName().equals(names.get(0)))
                         {
                             objects[0].add(object);
                             break;
@@ -406,15 +443,15 @@ public class RestServlet extends AbstractServlet
                 }
                 else
                 {
-                    for(int j = i-1; j >=0; j--)
+                    for (int j = i - 1; j >= 0; j--)
                     {
-                        if(getBroker().getModel().getChildTypes(_hierarchy[j]).contains(_hierarchy[i]))
+                        if (getBroker().getModel().getChildTypes(_hierarchy[j]).contains(_hierarchy[i]))
                         {
-                            for(ConfiguredObject<?> parent : objects[j])
+                            for (ConfiguredObject<?> parent : objects[j])
                             {
-                                for(ConfiguredObject<?> object : parent.getChildren(_hierarchy[i]))
+                                for (ConfiguredObject<?> object : parent.getChildren(_hierarchy[i]))
                                 {
-                                    if(object.getName().equals(names.get(i)))
+                                    if (object.getName().equals(names.get(i)))
                                     {
                                         objects[i].add(object);
                                     }
@@ -428,19 +465,20 @@ public class RestServlet extends AbstractServlet
             }
             List<ConfiguredObject> parents = new ArrayList<ConfiguredObject>();
             Class<? extends ConfiguredObject> objClass = getConfiguredClass();
-            Collection<Class<? extends ConfiguredObject>> parentClasses = getBroker().getModel().getParentTypes(objClass);
-            for(int i = _hierarchy.length-2; i >=0 ; i--)
+            Collection<Class<? extends ConfiguredObject>> parentClasses =
+                    getBroker().getModel().getParentTypes(objClass);
+            for (int i = _hierarchy.length - 2; i >= 0; i--)
             {
-                if(parentClasses.contains(_hierarchy[i]))
+                if (parentClasses.contains(_hierarchy[i]))
                 {
-                    if(objects[i].size() == 1)
+                    if (objects[i].size() == 1)
                     {
                         parents.add(objects[i].iterator().next());
                     }
                     else
                     {
                         throw new IllegalArgumentException("Cannot deduce parent of class "
-                                + _hierarchy[i].getSimpleName());
+                                                           + _hierarchy[i].getSimpleName());
                     }
                 }
 
@@ -450,6 +488,7 @@ public class RestServlet extends AbstractServlet
 
             createOrUpdate(providedObject, objClass, theParent, otherParents, response);
         }
+
     }
 
     private void createOrUpdate(Map<String, Object> providedObject, Class<? extends ConfiguredObject> objClass,