You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/07/19 18:22:02 UTC
svn commit: r1363413 - in /qpid/trunk/qpid/java:
broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/
test-profiles/test_resources/ssl/
Author: robbie
Date: Thu Jul 19 16:22:02 2012
New Revision: 1363413
URL: http://svn.apache.org/viewvc?rev=1363413&view=rev
Log:
QPID-3998: Add HTTPS test for REST interfaces
Applied patch from Oleksandr Rudyy <or...@gmail.com>
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/QpidRestTestCase.java
qpid/trunk/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
Added: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java?rev=1363413&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java (added)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java Thu Jul 19 16:22:02 2012
@@ -0,0 +1,86 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.management.plugin.servlet.rest;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Map;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSocketFactory;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.qpid.server.model.Broker;
+
+public class BrokerRestHttpsTest extends QpidRestTestCase
+{
+ private static final String TRUSTSTORE = "test-profiles/test_resources/ssl/java_client_truststore.jks";
+ private static final String TRUSTSTORE_PASSWORD = "password";
+
+ @Override
+ public void setUp() throws Exception
+ {
+ setSystemProperty("javax.net.debug", "ssl");
+ super.setUp();
+ setSystemProperty("javax.net.ssl.trustStore", TRUSTSTORE);
+ setSystemProperty("javax.net.ssl.trustStorePassword", TRUSTSTORE_PASSWORD);
+ }
+
+ @Override
+ protected void customizeConfiguration() throws ConfigurationException, IOException
+ {
+ setConfigurationProperty("management.enabled", "true");
+ setConfigurationProperty("management.http.enabled", "false");
+ setConfigurationProperty("management.https.enabled", "true");
+ setConfigurationProperty("management.https.port", Integer.toString(getHttpPort()));
+ }
+
+ @Override
+ protected String getHostName()
+ {
+ return "localhost";
+ }
+
+ @Override
+ protected String getProtocol()
+ {
+ return "https";
+ }
+
+ @Override
+ protected HttpURLConnection openManagementConection(String path) throws IOException
+ {
+ URL url = getManagementURL(path);
+ HttpURLConnection httpCon = (HttpURLConnection) url.openConnection();
+ ((HttpsURLConnection) httpCon).setSSLSocketFactory((SSLSocketFactory) SSLSocketFactory.getDefault());
+ httpCon.setDoOutput(true);
+ return httpCon;
+ }
+
+ public void testGetWithHttps() throws Exception
+ {
+ Map<String, Object> brokerDetails = getJsonAsSingletonList("/rest/broker");
+
+ Asserts.assertAttributesPresent(brokerDetails, Broker.AVAILABLE_ATTRIBUTES, Broker.BYTES_RETAINED,
+ Broker.PROCESS_PID, Broker.SUPPORTED_STORE_TYPES, Broker.CREATED, Broker.TIME_TO_LIVE, Broker.UPDATED);
+ }
+}
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/QpidRestTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/QpidRestTestCase.java?rev=1363413&r1=1363412&r2=1363413&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/QpidRestTestCase.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/QpidRestTestCase.java Thu Jul 19 16:22:02 2012
@@ -33,6 +33,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import org.apache.commons.configuration.ConfigurationException;
import org.apache.log4j.Logger;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.codehaus.jackson.JsonGenerationException;
@@ -54,16 +55,23 @@ public class QpidRestTestCase extends Qp
private String _hostName;
private List<HttpURLConnection> _httpConnections;
+ @Override
public void setUp() throws Exception
{
_httpConnections = new ArrayList<HttpURLConnection>();
_hostName = InetAddress.getLocalHost().getHostName();
_httpPort = findFreePort();
- setConfigurationProperty("management.enabled", "true");
+ customizeConfiguration();
+ super.setUp();
+
+ }
+
+ protected void customizeConfiguration() throws ConfigurationException, IOException
+ {
+ setConfigurationProperty("management.enabled", "false");
setConfigurationProperty("management.http.enabled", "true");
+ setConfigurationProperty("management.https.enabled", "false");
setConfigurationProperty("management.http.port", Integer.toString(_httpPort));
- setConfigurationProperty("management.jmx.enabled", "false");
- super.setUp();
}
public void teearDown() throws Exception
@@ -92,9 +100,14 @@ public class QpidRestTestCase extends Qp
return _hostName;
}
+ protected String getProtocol()
+ {
+ return "http";
+ }
+
protected String getManagementURL()
{
- return "http://" + _hostName + ":" + _httpPort;
+ return getProtocol() + "://" + getHostName() + ":" + getHttpPort();
}
protected URL getManagementURL(String path) throws MalformedURLException
Modified: qpid/trunk/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks?rev=1363413&r1=1363412&r2=1363413&view=diff
==============================================================================
Files qpid/trunk/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks (original) and qpid/trunk/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks Thu Jul 19 16:22:02 2012 differ
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org