Merge branch 'master' of https://github.com/yacy/yacy_search_server.git
Michael Peter Christen
7 years ago
commit
b907819cb4
@ -0,0 +1,173 @@
|
|||||||
|
// InetPathAccessHandler.java
|
||||||
|
// Copyright 2017 by luccioman; https://github.com/luccioman
|
||||||
|
//
|
||||||
|
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||||
|
//
|
||||||
|
// LICENSE
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
package net.yacy.http;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
|
||||||
|
import org.eclipse.jetty.http.pathmap.MappedResource;
|
||||||
|
import org.eclipse.jetty.http.pathmap.PathMappings;
|
||||||
|
import org.eclipse.jetty.http.pathmap.PathSpec;
|
||||||
|
import org.eclipse.jetty.server.handler.InetAccessHandler;
|
||||||
|
import org.eclipse.jetty.util.InetAddressSet;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* InetPathAccessHandler Access Handler
|
||||||
|
* <p>
|
||||||
|
* Extends {@link InetAccessHandler} by adding path patterns capabilities as
|
||||||
|
* previously available in the deprecated IPAccessHandler.
|
||||||
|
* </p>
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class InetPathAccessHandler extends InetAccessHandler {
|
||||||
|
|
||||||
|
/** List of white listed paths mapped to adresses sets */
|
||||||
|
private final PathMappings<InetAddressSet> white = new PathMappings<>();
|
||||||
|
|
||||||
|
/** List of black listed paths mapped to adresses sets */
|
||||||
|
private final PathMappings<InetAddressSet> black = new PathMappings<>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws IllegalArgumentException when the pattern is malformed
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void include(final String pattern) throws IllegalArgumentException {
|
||||||
|
addPattern(pattern, this.white);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws IllegalArgumentException when a pattern is malformed
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void include(final String... patterns) throws IllegalArgumentException {
|
||||||
|
for (final String pattern : patterns) {
|
||||||
|
include(pattern);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws IllegalArgumentException when the pattern is malformed
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void exclude(final String pattern) throws IllegalArgumentException {
|
||||||
|
addPattern(pattern, this.black);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @throws IllegalArgumentException when a pattern is malformed
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void exclude(final String... patterns) throws IllegalArgumentException {
|
||||||
|
for (final String pattern : patterns) {
|
||||||
|
exclude(pattern);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper method to parse the new pattern and add it to the specified mapping.
|
||||||
|
*
|
||||||
|
* @param pattern
|
||||||
|
* a new pattern to process
|
||||||
|
* @param pathMappings
|
||||||
|
* target mapping from paths to addresses sets. Must not be null.
|
||||||
|
* @throws IllegalArgumentException
|
||||||
|
* when the pattern is malformed
|
||||||
|
*/
|
||||||
|
protected void addPattern(final String pattern, final PathMappings<InetAddressSet> pathMappings)
|
||||||
|
throws IllegalArgumentException {
|
||||||
|
if (pattern != null && !pattern.isEmpty()) {
|
||||||
|
final int idx = pattern.indexOf('|');
|
||||||
|
|
||||||
|
final String addr = idx > 0 ? pattern.substring(0, idx) : pattern;
|
||||||
|
final String path = (idx > 0 && (pattern.length() > idx + 1)) ? pattern.substring(idx + 1) : "/*";
|
||||||
|
|
||||||
|
if (!addr.isEmpty()) {
|
||||||
|
final PathSpec pathSpec = PathMappings.asPathSpec(path);
|
||||||
|
InetAddressSet addresses = pathMappings.get(pathSpec);
|
||||||
|
if (addresses == null) {
|
||||||
|
addresses = new InetAddressSet();
|
||||||
|
pathMappings.put(pathSpec, addresses);
|
||||||
|
}
|
||||||
|
addresses.add(addr);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper method to check pattern syntax.
|
||||||
|
*
|
||||||
|
* @param pattern pattern to check for syntax errors
|
||||||
|
* @throws IllegalArgumentException
|
||||||
|
* when the pattern is malformed
|
||||||
|
*/
|
||||||
|
public static void checkPattern(final String pattern) throws IllegalArgumentException {
|
||||||
|
new InetPathAccessHandler().include(pattern);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean isAllowed(final InetAddress address, final HttpServletRequest request) {
|
||||||
|
return isAllowed(address, request.getPathInfo());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check whether the given address and path are allowed by current rules.
|
||||||
|
*
|
||||||
|
* @param address
|
||||||
|
* the address to check
|
||||||
|
* @param path
|
||||||
|
* an eventual path string starting with "/"
|
||||||
|
* @return true when allowed
|
||||||
|
*/
|
||||||
|
protected boolean isAllowed(final InetAddress address, final String path) {
|
||||||
|
boolean allowed = true;
|
||||||
|
final String nonNullPath = path != null ? path : "/";
|
||||||
|
if (this.white.size() > 0) {
|
||||||
|
/* Non empty white list patterns : MUST match at least one of it */
|
||||||
|
allowed = false;
|
||||||
|
for (final MappedResource<InetAddressSet> mapping : this.white.getMatches(nonNullPath)) {
|
||||||
|
if (mapping.getResource().test(address)) {
|
||||||
|
allowed = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (allowed) {
|
||||||
|
/* Finally check against black list patterns even when the first step passed */
|
||||||
|
for (final MappedResource<InetAddressSet> mapping : this.black.getMatches(nonNullPath)) {
|
||||||
|
if (mapping.getResource().test(address)) {
|
||||||
|
allowed = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void dump(final Appendable out, final String indent) throws IOException {
|
||||||
|
this.dumpBeans(out, indent, this.white.getMappings(), this.black.getMappings());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,343 @@
|
|||||||
|
// InetPathAccessHandlerTest.java
|
||||||
|
// Copyright 2017 by luccioman; https://github.com/luccioman
|
||||||
|
//
|
||||||
|
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||||
|
//
|
||||||
|
// LICENSE
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
package net.yacy.http;
|
||||||
|
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.UnknownHostException;
|
||||||
|
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unit tests for the {@link InetPathAccessHandler} class.
|
||||||
|
*/
|
||||||
|
public class InetPathAccessHandlerTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check the handler allow the given ip/path pairs.
|
||||||
|
*
|
||||||
|
* @param handler
|
||||||
|
* the handler to test. Must not be null.
|
||||||
|
* @param ipAndPaths
|
||||||
|
* array of ip address and path pairs. Must not be null.
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect.
|
||||||
|
*/
|
||||||
|
private void assertAllowed(final InetPathAccessHandler handler, final String[][] ipAndPaths)
|
||||||
|
throws UnknownHostException {
|
||||||
|
for (final String[] ipAndPath : ipAndPaths) {
|
||||||
|
final String ip = ipAndPath[0];
|
||||||
|
final String path = ipAndPath[1];
|
||||||
|
Assert.assertTrue("Should allow " + ip + path, handler.isAllowed(InetAddress.getByName(ip), path));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check the handler dos not allow the given ip/path pairs.
|
||||||
|
*
|
||||||
|
* @param handler
|
||||||
|
* the handler to test. Must not be null.
|
||||||
|
* @param ipAndPaths
|
||||||
|
* array of ip address and path pairs. Must not be null.
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect.
|
||||||
|
*/
|
||||||
|
private void assertRejected(final InetPathAccessHandler handler, final String[][] ipAndPaths)
|
||||||
|
throws UnknownHostException {
|
||||||
|
for (final String[] ipAndPath : ipAndPaths) {
|
||||||
|
final String ip = ipAndPath[0];
|
||||||
|
final String path = ipAndPath[1];
|
||||||
|
Assert.assertFalse("Should not allow " + ip + path, handler.isAllowed(InetAddress.getByName(ip), path));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test inclusion with a single white listed IPv4 address.
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIncludeSingleIPv4() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.include("10.10.1.2");
|
||||||
|
|
||||||
|
final String[][] allowed = { { "10.10.1.2", "/" }, // matching address, root path
|
||||||
|
{ "10.10.1.2", "/foo/bar" }, // matching address, non root path
|
||||||
|
{ "10.10.1.2", null } // matching address, no path information provided
|
||||||
|
};
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "10.10.1.3", "/" }, // non matching address, root path
|
||||||
|
{ null, null } // no address nor path information provided
|
||||||
|
};
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test inclusion with a single white listed IPv6 address.
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIncludeSingleIPv6() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.include("2001:db8::ff00:42:8329");
|
||||||
|
|
||||||
|
final String[][] allowed = { { "2001:db8::ff00:42:8329", "/" }, // matching address, root path
|
||||||
|
{ "2001:0db8:0000:0000:0000:ff00:0042:8329", "/" }, // matching address in long representation, root
|
||||||
|
// path
|
||||||
|
{ "2001:db8::ff00:42:8329", "/foo/bar" }, // matching address, non root path
|
||||||
|
{ "2001:db8::ff00:42:8329", null } // matching address, no path information provided
|
||||||
|
};
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "2001:db8::ff00:42:8539", "/" }, // non matching address, root path
|
||||||
|
{ null, null } // no address nor path information provided
|
||||||
|
};
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test inclusion with a single white listed IPV4 address and path.
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIncludeSingleAddressAndPath() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.include("10.10.1.2|/foo/bar");
|
||||||
|
|
||||||
|
final String[][] allowed = { { "10.10.1.2", "/foo/bar" } // matching address, matching path
|
||||||
|
};
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "10.10.1.3", "/" }, // non matching address, non matching path
|
||||||
|
{ "10.10.1.3", "/foo/bar" }, // non matching address, even if matching path
|
||||||
|
{ "10.10.1.2", "/" }, // matching address, but non matching root path
|
||||||
|
{ "10.10.1.2", "/foo" }, // matching address, but non matching parent path
|
||||||
|
{ "10.10.1.2", "/foo/" }, // matching address, but non matching parent path
|
||||||
|
{ "10.10.1.2", "/foo/wrong" }, // matching address, but non matching sub path
|
||||||
|
{ "10.10.1.2", "/foo/bar/file.txt" } // matching address, but non matching sub path with file
|
||||||
|
};
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test inclusion with a single white listed IPV4 address and wildcard path.
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIncludeSingleAddressAndWildcardPath() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.include("10.10.1.2|/foo/*");
|
||||||
|
|
||||||
|
final String[][] allowed = { { "10.10.1.2", "/foo/bar" }, // matching address, matching sub path
|
||||||
|
{ "10.10.1.2", "/foo/bar/sub" }, // matching address, matching sub path
|
||||||
|
{ "10.10.1.2", "/foo/file.txt" }, // matching address, matching sub path with file
|
||||||
|
{ "10.10.1.2", "/foo" }, // matching address, matching path
|
||||||
|
};
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "10.10.1.3", "/" }, // non matching address, non matching path
|
||||||
|
{ "10.10.1.3", "/foo/bar" }, // non matching address, event if matching path
|
||||||
|
{ "10.10.1.2", "/" }, // matching address, but non matching root path
|
||||||
|
{ "10.10.1.2", null }, // matching address, but no path information provided
|
||||||
|
{ null, "/foo/bar" } // no address provided, event if matching path
|
||||||
|
};
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test inclusion with a single white listed IPV4 address and wildcard path
|
||||||
|
* suffix.
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIncludeSingleAddressAndWildcardSuffix() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.include("10.10.1.2|*.html");
|
||||||
|
|
||||||
|
final String[][] allowed = { { "10.10.1.2", "/index.html" }, // matching address, matching file path
|
||||||
|
{ "10.10.1.2", "/foo/bar/index.html" }, // matching address, matching file with parent path
|
||||||
|
};
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "10.10.1.3", "/" }, // non matching address, non matching path
|
||||||
|
{ "10.10.1.3", "/index.html" }, // non matching address, event if matching file path
|
||||||
|
{ "10.10.1.2", "/" }, // matching address, but non matching root path
|
||||||
|
{ "10.10.1.2", "/index.txt" }, // matching address, but non matching file path
|
||||||
|
{ "10.10.1.2", null }, // matching address, but no path information provided
|
||||||
|
{ null, "/index.html" } // no address provided, event if matching path
|
||||||
|
};
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test inclusion with ranges of white listed addresses.
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIncludeRanges() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.include("10.10.1.1-255"); // legacy IPv4 range format used by IPAddressMap
|
||||||
|
handler.include("192.168.128.0-192.168.128.255"); // inclusive range of IPv4 addresses
|
||||||
|
handler.include("2001:db8::ff00:42:8329-2001:db8::ff00:42:ffff"); // inclusive range of IPv6 addresses
|
||||||
|
handler.include("192.168.1.0/24"); // CIDR notation on IPv4
|
||||||
|
handler.include("2001:db8::aaaa:0:0/96"); // CIDR notation on IPv6
|
||||||
|
|
||||||
|
final String[][] allowed = { { "10.10.1.1", "/" }, // matching legacy IPv4 range
|
||||||
|
{ "10.10.1.255", "/" }, // matching legacy IPv4 range
|
||||||
|
{ "192.168.128.0", "/" }, // matching second range of IPv4 addresses
|
||||||
|
{ "192.168.128.255", "/" }, // matching second range of IPv4 addresses
|
||||||
|
{ "2001:db8::ff00:42:8329", "/" }, // matching IPv6 range
|
||||||
|
{ "2001:db8::ff00:42:99ff", "/" }, // matching IPv6 range
|
||||||
|
{ "192.168.1.0", "/" }, // matching IPv4 CIDR notation range
|
||||||
|
{ "192.168.1.255", "/" }, // matching IPv4 CIDR notation range
|
||||||
|
{ "2001:db8::aaaa:1:1", "/" }, // matching IPv6 CIDR notation range
|
||||||
|
{ "2001:db8::aaaa:ffff:ffff", "/" } // matching IPv6 CIDR notation range
|
||||||
|
};
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "10.9.1.1", "/" }, { "10.10.2.1", "/" }, { "192.168.127.1", "/" },
|
||||||
|
{ "2001:db8::ff00:43:1234", "/" }, { "192.168.2.1", "/" }, { "2001:db8::aabb:ffff:ffff", "/" } };
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test inclusion with ranges of white listed addresses associated with wildcard
|
||||||
|
* paths.
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIncludeRangesAndWildcardPaths() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.include("10.10.1.1-255|/foo/*"); // legacy IPv4 range format used by IPAddressMap
|
||||||
|
handler.include("192.168.128.0-192.168.128.255|/path/*"); // inclusive range of IPv4 adresses
|
||||||
|
handler.include("2001:db8::ff00:42:8329-2001:db8::ff00:42:ffff|/root/*"); // inclusive range of IPv6 adresses
|
||||||
|
handler.include("192.168.1.0/24|/www/*"); // CIDR notation
|
||||||
|
|
||||||
|
final String[][] allowed = { { "10.10.1.1", "/foo/bar" }, // matching legacy IPv4 range and path
|
||||||
|
{ "10.10.1.255", "/foo/bar" }, // matching legacy IPv4 range and path
|
||||||
|
{ "192.168.128.0", "/path/index.html" }, // matching second range of IPv4 addresses and path
|
||||||
|
{ "192.168.128.255", "/path/file.txt" }, // matching second range of IPv4 addresses and path
|
||||||
|
{ "2001:db8::ff00:42:8329", "/root/index.txt" }, // matching IPv6 range and path
|
||||||
|
{ "2001:db8::ff00:42:99ff", "/root/image.jpg" }, // matching IPv6 range and path
|
||||||
|
{ "192.168.1.0", "/www/resource" }, // matching IPv4 CIDR notation range and path
|
||||||
|
{ "192.168.1.255", "/www/home" } }; // matching IPv4 CIDR notation range and path
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "10.9.1.1", "/" }, { "10.9.1.1", "/foo/bar" }, { "10.10.2.1", "/" },
|
||||||
|
{ "10.10.2.1", "/foo/bar" }, { "192.168.127.1", "/" }, { "192.168.127.1", "/path/index.html" },
|
||||||
|
{ "2001:db8::ff00:43:1234", "/" }, { "2001:db8::ff00:43:1234", "/root/index.txt" },
|
||||||
|
{ "192.168.2.1", "/" }, { "192.168.2.1", "/www/content" } };
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test inclusion with multiple patterns using the same path
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIncludeMultiplePatternsOnSamePath() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.include("10.10.1.1|/foo/bar"); // a single address pattern
|
||||||
|
handler.include("192.168.128.0-192.168.128.255|/foo/bar"); // inclusive range of IPv4 adresses
|
||||||
|
|
||||||
|
final String[][] allowed = { { "10.10.1.1", "/foo/bar" }, // matching single address pattern
|
||||||
|
{ "192.168.128.0", "/foo/bar" }, { "192.168.128.255", "/foo/bar" } // matching range pattern
|
||||||
|
};
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "10.10.1.1", "/" }, // matching single address pattern bu root path
|
||||||
|
{ "127.0.0.1", "/" }, // non matching address
|
||||||
|
};
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test exclusion with a single white listed IPV4 address and path.
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testExcludeSingleAddressAndPath() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.exclude("10.10.1.2|/foo/bar");
|
||||||
|
|
||||||
|
final String[][] allowed = { { "10.10.1.3", "/" }, // non matching address, non matching path
|
||||||
|
{ "10.10.1.3", "/foo/bar" }, // non matching address, even if matching path
|
||||||
|
{ "10.10.1.2", "/" }, // matching address, but non matching root path
|
||||||
|
{ "10.10.1.2", "/foo" }, // matching address, but non matching parent path
|
||||||
|
{ "10.10.1.2", "/foo/" }, // matching address, but non matching parent path
|
||||||
|
{ "10.10.1.2", "/foo/wrong" }, // matching address, but non matching sub path
|
||||||
|
{ "10.10.1.2", "/foo/bar/file.txt" } // matching address, but non matching sub path with file
|
||||||
|
};
|
||||||
|
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "10.10.1.2", "/foo/bar" } // matching address, matching path
|
||||||
|
};
|
||||||
|
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test inclusion and exclusion rules applied on the same address
|
||||||
|
*
|
||||||
|
* @throws UnknownHostException
|
||||||
|
* when a test address is incorrect. Should not happen.
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testIncludeExcludeOnSameAddress() throws UnknownHostException {
|
||||||
|
final InetPathAccessHandler handler = new InetPathAccessHandler();
|
||||||
|
handler.include("10.10.1.1-10.10.1.255"); // include a range of addresses without path restrictions
|
||||||
|
handler.exclude("10.10.1.2|/foo/bar"); // exclude a specific address and path
|
||||||
|
|
||||||
|
final String[][] allowed = { { "10.10.1.3", "/" }, // matching included addresses range
|
||||||
|
{ "10.10.1.2", "/" }, // matching excluded address, but non matching root path
|
||||||
|
{ "10.10.1.2", "/foo" }, // matching excluded address, but non matching parent path
|
||||||
|
{ "10.10.1.2", "/foo/wrong" }, // matching excluded address, but non matching sub path
|
||||||
|
{ "10.10.1.2", "/foo/bar/file.txt" } // matching excluded address, but non matching sub path with file
|
||||||
|
};
|
||||||
|
|
||||||
|
this.assertAllowed(handler, allowed);
|
||||||
|
|
||||||
|
final String[][] rejected = { { "10.10.1.2", "/foo/bar" } // matching excluded address and path
|
||||||
|
};
|
||||||
|
|
||||||
|
this.assertRejected(handler, rejected);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,92 @@
|
|||||||
|
// migrationTest.java
|
||||||
|
// Copyright 2017 by luccioman; https://github.com/luccioman
|
||||||
|
//
|
||||||
|
// This is a part of YaCy, a peer-to-peer based web search engine
|
||||||
|
//
|
||||||
|
// LICENSE
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with this program; if not, write to the Free Software
|
||||||
|
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
|
package net.yacy;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unit tests for the {@link migration} class.
|
||||||
|
*/
|
||||||
|
public class migrationTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Testing the conversion of IP addresses patterns
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
public void testMigrateIPAddressPatterns() {
|
||||||
|
final String patternSeparator = ",";
|
||||||
|
final String[] nonDeprecatedPatterns = { "*", // match all (default)
|
||||||
|
"10.10.1.2,2001:db8::ff00:42:8329", // single IPv4 and IPv6 addresses
|
||||||
|
"10.10.1.2|/foo/bar,2001:db8::ff00:42:8329|/foo/bar", // single IPv4 and IPv6 addresses with path
|
||||||
|
"192.168.1.1-192.168.1.10,2001:db8::ff00:42:8330-2001:db8::ff00:42:83ff", // IPv4 and IPv6 addresses
|
||||||
|
// ranges
|
||||||
|
"192.168.1.1-192.168.1.10|/path,2001:db8::ff00:42:8330-2001:db8::ff00:42:83ff|/path", // IPv4 and IPv6 addresses ranges with path
|
||||||
|
"127.0.0.1/8,192.168.1.0/24,2001:db8::aaaa:0:0/96,::1/128", // IPv4 and IPv6 addresses ranges defined using CIDR notation
|
||||||
|
"127.0.0.1/8|*.html,192.168.1.0/24|/foo/bar,2001:db8::aaaa:0:0/96|/foo/bar,::1/128|*.html", // IPv4 and IPv6 addresses ranges defined using CIDR notation with path
|
||||||
|
"192.168.3.0-255", // legacy IPv4 addresses range format
|
||||||
|
"192.168.3.0-255|/foo/bar,192.168.1.0-255|*.html", // legacy IPv4 addresses range format with path
|
||||||
|
};
|
||||||
|
final StringBuilder migrated = new StringBuilder();
|
||||||
|
for (final String patterns : nonDeprecatedPatterns) {
|
||||||
|
migrated.setLength(0);
|
||||||
|
Assert.assertFalse("Should not be detected as deprecated : " + patterns,
|
||||||
|
migration.migrateIPAddressPatterns(patternSeparator, patterns, migrated));
|
||||||
|
Assert.assertEquals(patterns, migrated.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
final Map<String, String> deprecatedToMigrated = new HashMap<>();
|
||||||
|
/* old IPv4 wildcard notation */
|
||||||
|
deprecatedToMigrated.put("127.", "127.0.0.0-127.255.255.255");
|
||||||
|
|
||||||
|
/* old IPv4 wildcard notation */
|
||||||
|
deprecatedToMigrated.put("192.168.", "192.168.0.0-192.168.255.255");
|
||||||
|
|
||||||
|
/* old IPv4 wildcard notation */
|
||||||
|
deprecatedToMigrated.put("192.168.1.", "192.168.1.0-192.168.1.255");
|
||||||
|
|
||||||
|
/* IPV4 address and old style path pattern */
|
||||||
|
deprecatedToMigrated.put("192.168.1.1/foo/bar,127.0.0.1/*.txt", "192.168.1.1|/foo/bar,127.0.0.1|*.txt");
|
||||||
|
|
||||||
|
/* old IPv4 wildcard notation and old style path pattern */
|
||||||
|
deprecatedToMigrated.put("192.168./foo/bar,127./*.txt", "192.168.0.0-192.168.255.255|/foo/bar,127.0.0.0-127.255.255.255|*.txt");
|
||||||
|
|
||||||
|
/* old IPv4 wildcard notation and new style path pattern */
|
||||||
|
deprecatedToMigrated.put("192.168.|/foo/bar,127.|*.txt", "192.168.0.0-192.168.255.255|/foo/bar,127.0.0.0-127.255.255.255|*.txt");
|
||||||
|
|
||||||
|
/* mixed deprecated and non deprecated patterns */
|
||||||
|
deprecatedToMigrated.put("10.10.1.2,2001:db8::ff00:42:8329|/foo/bar,192.168.|/foo/bar,192.168.1.0/24,127.|*.txt",
|
||||||
|
"10.10.1.2,2001:db8::ff00:42:8329|/foo/bar,192.168.0.0-192.168.255.255|/foo/bar,192.168.1.0/24,127.0.0.0-127.255.255.255|*.txt");
|
||||||
|
|
||||||
|
for (final Entry<String, String> entry : deprecatedToMigrated.entrySet()) {
|
||||||
|
migrated.setLength(0);
|
||||||
|
Assert.assertTrue("Should be detected as deprecated : " + entry.getKey(),
|
||||||
|
migration.migrateIPAddressPatterns(patternSeparator, entry.getKey(), migrated));
|
||||||
|
Assert.assertEquals(entry.getValue(), migrated.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in new issue