Author: rjung
Date: Sun Nov 30 15:42:08 2014
New Revision: 1642554
URL: http://svn.apache.org/r1642554
Log:
Add unit tests for RemoteAddrValve and RemoteHostValve.
Added:
tomcat/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
(with props)
Added: tomcat/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java?rev=1642554&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
(added)
+++ tomcat/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
Sun Nov 30 15:42:08 2014
@@ -0,0 +1,170 @@
+/*
+ * 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.valves;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+
+/**
+ * {@link RequestFilterValve} Tests
+ */
+public class TestRequestFilterValve {
+
+ private static final int OK = 200;
+ private static final int FORBIDDEN = 403;
+ private static final int CUSTOM = 499;
+
+ private static final String ADDR_ALLOW_PAT = "127\\..*";
+ private static final String ADDR_DENY_PAT = ".*\\.1";
+ private static final String ADDR_ONLY_ALLOW = "127.0.0.2";
+ private static final String ADDR_ONLY_DENY = "192.168.0.1";
+ private static final String ADDR_ALLOW_AND_DENY = "127.0.0.1";
+ private static final String ADDR_NO_ALLOW_NO_DENY = "192.168.0.2";
+
+ private static final String HOST_ALLOW_PAT = "www\\.example\\..*";
+ private static final String HOST_DENY_PAT = ".*\\.org";
+ private static final String HOST_ONLY_ALLOW = "www.example.com";
+ private static final String HOST_ONLY_DENY = "host.example.org";
+ private static final String HOST_ALLOW_AND_DENY = "www.example.org";
+ private static final String HOST_NO_ALLOW_NO_DENY = "host.example.com";
+
+
+ static class TerminatingValve extends ValveBase {
+ @Override
+ public void invoke(Request request, Response response) throws
IOException, ServletException {
+ }
+ }
+
+ public static class MockResponse extends Response {
+ private int status = OK;
+
+ @Override
+ public void sendError(int status) throws IOException {
+ this.status = status;
+ }
+
+ @Override
+ public int getStatus() {
+ return status;
+ }
+ }
+
+ private void oneTest(String allow, String deny, boolean denyStatus,
+ String property, String type, boolean allowed) {
+ // PREPARE
+ RequestFilterValve valve = null;
+ Request request = new Request();
+ Response response = new MockResponse();
+ StringBuilder msg = new StringBuilder();
+ int expected = allowed ? OK : FORBIDDEN;
+
+ if (type == null) {
+ fail("Invalid test with null type");
+ }
+ if (property != null) {
+ if (type.equals("Addr")) {
+ valve = new RemoteAddrValve();
+ request.setRemoteAddr(property);
+ msg.append(" ip='" + property + "'");
+ } else if (type.equals("Host")) {
+ valve = new RemoteHostValve();
+ request.setRemoteHost(property);
+ msg.append(" host='" + property + "'");
+ } else {
+ fail("Invalid test type" + type);
+ }
+ }
+ valve.setNext(new TerminatingValve());
+
+ if (allow != null) {
+ valve.setAllow(allow);
+ msg.append(" allow='" + allow + "'");
+ }
+ if (deny != null) {
+ valve.setDeny(deny);
+ msg.append(" deny='" + deny + "'");
+ }
+ if (denyStatus) {
+ valve.setDenyStatus(CUSTOM);
+ msg.append(" denyStatus='" + CUSTOM + "'");
+ if (!allowed) {
+ expected = CUSTOM;
+ }
+ }
+
+ // TEST
+ try {
+ valve.invoke(request, response);
+ } catch (IOException ex) {
+ //Ignore
+ } catch (ServletException ex) {
+ //Ignore
+ }
+
+ // VERIFY
+ assertEquals(msg.toString(), expected, response.getStatus());
+ }
+
+ private void standardTests(String allow_pat, String deny_pat,
+ String OnlyAllow, String OnlyDeny,
+ String AllowAndDeny, String NoAllowNoDeny,
+ String type) {
+ oneTest(null, null, false, AllowAndDeny, type, false);
+ oneTest(allow_pat, null, false, AllowAndDeny, type, true);
+ oneTest(allow_pat, null, false, NoAllowNoDeny, type, false);
+ oneTest(allow_pat, null, true, AllowAndDeny, type, true);
+ oneTest(allow_pat, null, true, NoAllowNoDeny, type, false);
+ oneTest(null, deny_pat, false, AllowAndDeny, type, false);
+ oneTest(null, deny_pat, false, NoAllowNoDeny, type, true);
+ oneTest(null, deny_pat, true, AllowAndDeny, type, false);
+ oneTest(null, deny_pat, true, NoAllowNoDeny, type, true);
+ oneTest(allow_pat, deny_pat, false, NoAllowNoDeny, type, false);
+ oneTest(allow_pat, deny_pat, false, OnlyAllow, type, true);
+ oneTest(allow_pat, deny_pat, false, OnlyDeny, type, false);
+ oneTest(allow_pat, deny_pat, false, AllowAndDeny, type, false);
+ oneTest(allow_pat, deny_pat, true, NoAllowNoDeny, type, false);
+ oneTest(allow_pat, deny_pat, true, OnlyAllow, type, true);
+ oneTest(allow_pat, deny_pat, true, OnlyDeny, type, false);
+ oneTest(allow_pat, deny_pat, true, AllowAndDeny, type, false);
+ }
+
+ @Test
+ public void testRemoteAddrValveIPv4() {
+ standardTests(ADDR_ALLOW_PAT, ADDR_DENY_PAT,
+ ADDR_ONLY_ALLOW, ADDR_ONLY_DENY,
+ ADDR_ALLOW_AND_DENY, ADDR_NO_ALLOW_NO_DENY,
+ "Addr");
+ }
+
+ @Test
+ public void testRemoteHostValve() {
+ standardTests(HOST_ALLOW_PAT, HOST_DENY_PAT,
+ HOST_ONLY_ALLOW, HOST_ONLY_DENY,
+ HOST_ALLOW_AND_DENY, HOST_NO_ALLOW_NO_DENY,
+ "Host");
+ }
+}
Propchange:
tomcat/trunk/test/org/apache/catalina/valves/TestRequestFilterValve.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
