- making blacklist path part case insensitive (solving http://bugs.yacy.net/view.php?id=171)
- blacklist test adding explicite response text "not blocked" if no blacklist matchpull/1/head
reger
12 years ago
parent
e2d499be9e
commit
e80dfeca23
@ -1,42 +1,42 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>YaCy '#[clientname]#': Blacklist Test</title>
|
||||
#%env/templates/metas.template%#
|
||||
</head>
|
||||
<body id="Blacklist">
|
||||
#%env/templates/header.template%#
|
||||
#%env/templates/submenuBlacklist.template%#
|
||||
|
||||
<h2>Blacklist Test</h2>
|
||||
<p>Used Blacklist engine: <span class="settingsValue">#[blacklistEngine]#</span></p>
|
||||
<!-- blacklist selection -->
|
||||
<form action="BlacklistTest_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
|
||||
<fieldset>
|
||||
<legend>Test list:</legend>
|
||||
<input type="text" name="testurl" size="50" value="#[url]#" />
|
||||
<input type="submit" name="testList" value="Test" />
|
||||
|
||||
#(testlist)#::
|
||||
<br /><br />
|
||||
<div>
|
||||
The tested URL was #[url]#<br>
|
||||
It is blocked for the following cases:<br>
|
||||
<ul>
|
||||
#(listedincrawler)#::<li>Crawling</li>#(/listedincrawler)#
|
||||
#(listedindht)#::<li>DHT</li>#(/listedindht)#
|
||||
#(listedinnews)#::<li>News</li>#(/listedinnews)#
|
||||
#(listedinproxy)#::<li>Proxy</li>#(/listedinproxy)#
|
||||
#(listedinsearch)#::<li>Search</li>#(/listedinsearch)#
|
||||
#(listedinsurftips)#::<li>Surftips</li>#(/listedinsurftips)#
|
||||
</ul>
|
||||
</div>
|
||||
::
|
||||
<br /><br />
|
||||
<div>The tested URL was not valid.</div>
|
||||
#(/testlist)#
|
||||
</fieldset>
|
||||
</form>
|
||||
#%env/templates/footer.template%#
|
||||
</body>
|
||||
</html>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<title>YaCy '#[clientname]#': Blacklist Test</title>
|
||||
#%env/templates/metas.template%#
|
||||
</head>
|
||||
<body id="Blacklist">
|
||||
#%env/templates/header.template%#
|
||||
#%env/templates/submenuBlacklist.template%#
|
||||
|
||||
<h2>Blacklist Test</h2>
|
||||
<p>Used Blacklist engine: <span class="settingsValue">#[blacklistEngine]#</span></p>
|
||||
<!-- blacklist selection -->
|
||||
<form action="BlacklistTest_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
|
||||
<fieldset>
|
||||
<legend>Test list:</legend>
|
||||
<input type="text" name="testurl" size="50" value="#[url]#" />
|
||||
<input type="submit" name="testList" value="Test" />
|
||||
|
||||
#(testlist)#::
|
||||
<br /><br />
|
||||
<div>
|
||||
The tested URL was #[url]#<br>
|
||||
#(isnotblocked)#It is blocked for the following cases:<br>::<br><b>is not blocked</b><br>#(/isnotblocked)#
|
||||
<ul>
|
||||
#(listedincrawler)#::<li>Crawling</li>#(/listedincrawler)#
|
||||
#(listedindht)#::<li>DHT</li>#(/listedindht)#
|
||||
#(listedinnews)#::<li>News</li>#(/listedinnews)#
|
||||
#(listedinproxy)#::<li>Proxy</li>#(/listedinproxy)#
|
||||
#(listedinsearch)#::<li>Search</li>#(/listedinsearch)#
|
||||
#(listedinsurftips)#::<li>Surftips</li>#(/listedinsurftips)#
|
||||
</ul>
|
||||
</div>
|
||||
::
|
||||
<br /><br />
|
||||
<div>The tested URL was not valid.</div>
|
||||
#(/testlist)#
|
||||
</fieldset>
|
||||
</form>
|
||||
#%env/templates/footer.template%#
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,96 +1,114 @@
|
||||
// BlacklistTest_p.java
|
||||
// -----------------------
|
||||
// part of YaCy
|
||||
// (C) by Michael Peter Christen; mc@yacy.net
|
||||
// first published on http://www.anomic.de
|
||||
// Frankfurt, Germany, 2004
|
||||
//
|
||||
// This File is contributed by Alexander Schier
|
||||
//
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
// $LastChangedBy$
|
||||
//
|
||||
// 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
|
||||
|
||||
// You must compile this file with
|
||||
// javac -classpath .:../classes Blacklist_p.java
|
||||
// if the shell's current path is HTROOT
|
||||
|
||||
import java.io.File;
|
||||
import java.net.MalformedURLException;
|
||||
|
||||
import net.yacy.cora.protocol.RequestHeader;
|
||||
import net.yacy.data.ListManager;
|
||||
import net.yacy.kelondro.data.meta.DigestURI;
|
||||
import net.yacy.repository.Blacklist;
|
||||
import net.yacy.repository.Blacklist.BlacklistType;
|
||||
import net.yacy.search.Switchboard;
|
||||
import net.yacy.server.serverObjects;
|
||||
import net.yacy.server.serverSwitch;
|
||||
|
||||
public class BlacklistTest_p {
|
||||
|
||||
public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) {
|
||||
|
||||
// initialize the list manager
|
||||
ListManager.switchboard = (Switchboard) env;
|
||||
ListManager.listsPath = new File(ListManager.switchboard.getDataPath(),ListManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
|
||||
|
||||
final serverObjects prop = new serverObjects();
|
||||
prop.putHTML("blacklistEngine", Blacklist.getEngineInfo());
|
||||
|
||||
// do all post operations
|
||||
if(post != null && post.containsKey("testList")) {
|
||||
prop.put("testlist", "1");
|
||||
String urlstring = post.get("testurl", "");
|
||||
if (!urlstring.startsWith("http://") &&
|
||||
!urlstring.startsWith("https://") &&
|
||||
!urlstring.startsWith("ftp://") &&
|
||||
!urlstring.startsWith("smb://") &&
|
||||
!urlstring.startsWith("file://")) urlstring = "http://" + urlstring;
|
||||
DigestURI testurl = null;
|
||||
try {
|
||||
testurl = new DigestURI(urlstring);
|
||||
} catch (final MalformedURLException e) {
|
||||
testurl = null;
|
||||
}
|
||||
if(testurl != null) {
|
||||
prop.putHTML("url",testurl.toString());
|
||||
prop.putHTML("testlist_url",testurl.toString());
|
||||
if(Switchboard.urlBlacklist.isListed(BlacklistType.CRAWLER, testurl))
|
||||
prop.put("testlist_listedincrawler", "1");
|
||||
if(Switchboard.urlBlacklist.isListed(BlacklistType.DHT, testurl))
|
||||
prop.put("testlist_listedindht", "1");
|
||||
if(Switchboard.urlBlacklist.isListed(BlacklistType.NEWS, testurl))
|
||||
prop.put("testlist_listedinnews", "1");
|
||||
if(Switchboard.urlBlacklist.isListed(BlacklistType.PROXY, testurl))
|
||||
prop.put("testlist_listedinproxy", "1");
|
||||
if(Switchboard.urlBlacklist.isListed(BlacklistType.SEARCH, testurl))
|
||||
prop.put("testlist_listedinsearch", "1");
|
||||
if(Switchboard.urlBlacklist.isListed(BlacklistType.SURFTIPS, testurl))
|
||||
prop.put("testlist_listedinsurftips", "1");
|
||||
}
|
||||
else {
|
||||
prop.putHTML("url",urlstring);
|
||||
prop.put("testlist", "2");
|
||||
}
|
||||
} else {
|
||||
prop.putHTML("url", "http://");
|
||||
}
|
||||
return prop;
|
||||
}
|
||||
|
||||
}
|
||||
// BlacklistTest_p.java
|
||||
// -----------------------
|
||||
// part of YaCy
|
||||
// (C) by Michael Peter Christen; mc@yacy.net
|
||||
// first published on http://www.anomic.de
|
||||
// Frankfurt, Germany, 2004
|
||||
//
|
||||
// This File is contributed by Alexander Schier
|
||||
//
|
||||
// $LastChangedDate$
|
||||
// $LastChangedRevision$
|
||||
// $LastChangedBy$
|
||||
//
|
||||
// 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
|
||||
|
||||
// You must compile this file with
|
||||
// javac -classpath .:../classes Blacklist_p.java
|
||||
// if the shell's current path is HTROOT
|
||||
|
||||
import java.io.File;
|
||||
import java.net.MalformedURLException;
|
||||
|
||||
import net.yacy.cora.protocol.RequestHeader;
|
||||
import net.yacy.data.ListManager;
|
||||
import net.yacy.kelondro.data.meta.DigestURI;
|
||||
import net.yacy.repository.Blacklist;
|
||||
import net.yacy.repository.Blacklist.BlacklistType;
|
||||
import net.yacy.search.Switchboard;
|
||||
import net.yacy.server.serverObjects;
|
||||
import net.yacy.server.serverSwitch;
|
||||
|
||||
public class BlacklistTest_p {
|
||||
|
||||
public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, final serverObjects post, final serverSwitch env) {
|
||||
|
||||
// initialize the list manager
|
||||
ListManager.switchboard = (Switchboard) env;
|
||||
ListManager.listsPath = new File(ListManager.switchboard.getDataPath(),ListManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));
|
||||
|
||||
final serverObjects prop = new serverObjects();
|
||||
prop.putHTML("blacklistEngine", Blacklist.getEngineInfo());
|
||||
|
||||
// do all post operations
|
||||
if(post != null && post.containsKey("testList")) {
|
||||
prop.put("testlist", "1");
|
||||
String urlstring = post.get("testurl", "");
|
||||
if (!urlstring.startsWith("http://") &&
|
||||
!urlstring.startsWith("https://") &&
|
||||
!urlstring.startsWith("ftp://") &&
|
||||
!urlstring.startsWith("smb://") &&
|
||||
!urlstring.startsWith("file://")) urlstring = "http://" + urlstring;
|
||||
DigestURI testurl = null;
|
||||
try {
|
||||
testurl = new DigestURI(urlstring);
|
||||
} catch (final MalformedURLException e) {
|
||||
testurl = null;
|
||||
}
|
||||
if(testurl != null) {
|
||||
prop.putHTML("url",testurl.toString());
|
||||
prop.putHTML("testlist_url",testurl.toString());
|
||||
boolean isblocked = false;
|
||||
|
||||
if (Switchboard.urlBlacklist.isListed(BlacklistType.CRAWLER, testurl)) {
|
||||
prop.put("testlist_listedincrawler", "1");
|
||||
isblocked = true;
|
||||
}
|
||||
if (Switchboard.urlBlacklist.isListed(BlacklistType.DHT, testurl)) {
|
||||
prop.put("testlist_listedindht", "1");
|
||||
isblocked = true;
|
||||
}
|
||||
if (Switchboard.urlBlacklist.isListed(BlacklistType.NEWS, testurl)) {
|
||||
prop.put("testlist_listedinnews", "1");
|
||||
isblocked = true;
|
||||
}
|
||||
if (Switchboard.urlBlacklist.isListed(BlacklistType.PROXY, testurl)) {
|
||||
prop.put("testlist_listedinproxy", "1");
|
||||
isblocked = true;
|
||||
}
|
||||
if (Switchboard.urlBlacklist.isListed(BlacklistType.SEARCH, testurl)) {
|
||||
prop.put("testlist_listedinsearch", "1");
|
||||
isblocked = true;
|
||||
}
|
||||
if (Switchboard.urlBlacklist.isListed(BlacklistType.SURFTIPS, testurl)) {
|
||||
prop.put("testlist_listedinsurftips", "1");
|
||||
isblocked = true;
|
||||
}
|
||||
|
||||
if (!isblocked) {
|
||||
prop.put("testlist_isnotblocked", "1");
|
||||
}
|
||||
}
|
||||
else {
|
||||
prop.putHTML("url",urlstring);
|
||||
prop.put("testlist", "2");
|
||||
}
|
||||
} else {
|
||||
prop.putHTML("url", "http://");
|
||||
}
|
||||
return prop;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in new issue