This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 45caced2a5 Test manager webapp Servlets
45caced2a5 is described below
commit 45caced2a59e9adc995d617ebbe57050e756b04e
Author: remm <r...@apache.org>
AuthorDate: Mon Sep 23 13:28:52 2024 +0200
Test manager webapp Servlets
To be expanded with operations (deploy, store config, SSL are
possibilities).
---
.../authenticator/TestBasicAuthParser.java | 6 +-
.../apache/catalina/manager/TestManagerWebapp.java | 199 +++++++++++++++++++++
2 files changed, 202 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
b/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
index 0e0d9cac4d..b11e23774e 100644
--- a/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
+++ b/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
@@ -438,7 +438,7 @@ public class TestBasicAuthParser {
* for BASIC Authentication.
* Note: only used internally, so no need to validate arguments.
*/
- private static final class BasicAuthHeader {
+ public static final class BasicAuthHeader {
private static final byte[] HEADER =
"authorization: ".getBytes(StandardCharsets.ISO_8859_1);
@@ -448,7 +448,7 @@ public class TestBasicAuthParser {
/*
* This method creates a valid base64 blob
*/
- private BasicAuthHeader(String method, String username,
+ public BasicAuthHeader(String method, String username,
String password) {
this(method, username, password, null);
}
@@ -529,7 +529,7 @@ public class TestBasicAuthParser {
}
}
- private ByteChunk getHeader() {
+ public ByteChunk getHeader() {
return authHeader;
}
}
diff --git a/test/org/apache/catalina/manager/TestManagerWebapp.java
b/test/org/apache/catalina/manager/TestManagerWebapp.java
new file mode 100644
index 0000000000..f450f459f7
--- /dev/null
+++ b/test/org/apache/catalina/manager/TestManagerWebapp.java
@@ -0,0 +1,199 @@
+/*
+ * 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.catalina.manager;
+
+import java.io.File;
+import java.io.PrintWriter;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.apache.catalina.startup.SimpleHttpClient.CRLF;
+import org.apache.catalina.Context;
+import org.apache.catalina.authenticator.TestBasicAuthParser.BasicAuthHeader;
+import org.apache.catalina.realm.MemoryRealm;
+import org.apache.catalina.realm.MessageDigestCredentialHandler;
+import org.apache.catalina.startup.SimpleHttpClient;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+
+public class TestManagerWebapp extends TomcatBaseTest {
+
+ public static final String CONFIG = "<?xml version=\"1.0\" ?>"
+ + "<tomcat-users xmlns=\"http://tomcat.apache.org/xml\"";
+ + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
+ + "
xsi:schemaLocation=\"http://tomcat.apache.org/xml/tomcat-users.xsd\"";
+ + " version=\"1.0\">"
+ + "<role rolename=\"admin\" />"
+ + "<user username=\"admin\" password=\"sekr3t\"
roles=\"manager-gui,manager-script,manager-jmx,manager-status\" />"
+ + "</tomcat-users>";
+
+ /**
+ * Integration test for the manager webapp (verify all main Servlets are
working).
+ * @throws Exception if an error occurs
+ */
+ @Test
+ public void testServlets() throws Exception {
+ Tomcat tomcat = getTomcatInstance();
+
+ File configFile = new File(getTemporaryDirectory(),
"tomcat-users-manager.xml");
+ try (PrintWriter writer = new PrintWriter(configFile)) {
+ writer.write(CONFIG);
+ }
+ addDeleteOnTearDown(configFile);
+
+ MemoryRealm memoryRealm = new MemoryRealm();
+ memoryRealm.setCredentialHandler(new MessageDigestCredentialHandler());
+ memoryRealm.setPathname(configFile.getAbsolutePath());
+
+ // Add manager webapp
+ File appDir = new File(System.getProperty("tomcat.test.basedir"),
"webapps/manager");
+ Context ctx = tomcat.addWebapp(null, "/manager",
appDir.getAbsolutePath());
+ ctx.setRealm(memoryRealm);
+
+ tomcat.start();
+
+ SimpleHttpClient client = new SimpleHttpClient() {
+ @Override
+ public boolean isResponseBodyOK() {
+ return true;
+ }
+ };
+ client.setPort(getPort());
+ String basicHeader = (new BasicAuthHeader("Basic", "admin",
"sekr3t")).getHeader().toString();
+
+ client.setRequest(new String[] {
+ "GET /manager/ HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_FOUND,
client.getStatusCode());
+
+ client.setRequest(new String[] {
+ "GET /manager/html HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_UNAUTHORIZED,
client.getStatusCode());
+
+ client.setRequest(new String[] {
+ "GET /manager/html HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+
Assert.assertTrue(client.getResponseBody().contains("/manager/css/manager.css"));
+
+ client.setRequest(new String[] {
+ "GET /manager/status HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+ Assert.assertTrue(client.getResponseBody().contains("MiB"));
+
+ client.setRequest(new String[] {
+ "GET /manager/jmxproxy HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+
Assert.assertTrue(client.getResponseBody().contains("Tomcat:type=ThreadPool,name="));
+
+ client.setRequest(new String[] {
+ "GET /manager/text HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+ Assert.assertTrue(client.getResponseBody().contains(" - "));
+
+ client.setRequest(new String[] {
+ "GET /manager/text/sessions?path=/manager HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+ Assert.assertTrue(client.getResponseBody().contains("[1]"));
+
+ client.setRequest(new String[] {
+ "GET /manager/text/resources HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+ Assert.assertTrue(client.getResponseBody().contains(" - "));
+
+ client.setRequest(new String[] {
+ "GET /manager/text/serverinfo HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+ Assert.assertTrue(client.getResponseBody().contains("[Apache Tomcat"));
+
+ client.setRequest(new String[] {
+ "GET /manager/text/vminfo HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+ Assert.assertTrue(client.getResponseBody().contains("vmName: "));
+
+ client.setRequest(new String[] {
+ "GET /manager/text/threaddump HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+
Assert.assertTrue(client.getResponseBody().contains("-auto-1-Acceptor"));
+
+ client.setRequest(new String[] {
+ "GET /manager/text/list HTTP/1.1" + CRLF +
+ "Host: localhost" + CRLF +
+ "Authorization: " + basicHeader + CRLF +
+ "Connection: Close" + CRLF + CRLF });
+ client.connect();
+ client.processRequest(true);
+ Assert.assertEquals(HttpServletResponse.SC_OK, client.getStatusCode());
+
Assert.assertTrue(client.getResponseBody().contains("/manager:running"));
+
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
