mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
*) sorting peer name list on Blacklist_p.html
*) restructuring of sharedBlacklist_p.java git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2405 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
theli
parent
6c8366aea1
commit
5e0b6f8f83
|
|
@ -55,6 +55,8 @@ import java.io.PrintWriter;
|
|||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Enumeration;
|
||||
import java.util.TreeMap;
|
||||
|
||||
import de.anomic.data.listManager;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
|
|
@ -312,20 +314,25 @@ public class Blacklist_p {
|
|||
|
||||
|
||||
// List known hosts for BlackList retrieval
|
||||
yacySeed seed;
|
||||
if (yacyCore.seedDB != null && yacyCore.seedDB.sizeConnected() > 0) { // no nullpointer error
|
||||
final Enumeration e = yacyCore.seedDB.seedsConnected(true, false, null);
|
||||
int peerCount = 0;
|
||||
while (e.hasMoreElements()) {
|
||||
seed = (yacySeed) e.nextElement();
|
||||
if (seed != null) {
|
||||
final String Hash = seed.hash;
|
||||
final String Name = seed.get(yacySeed.NAME, "nameless");
|
||||
try {
|
||||
TreeMap hostList = new TreeMap();
|
||||
final Enumeration e = yacyCore.seedDB.seedsConnected(true, false, null);
|
||||
while (e.hasMoreElements()) {
|
||||
yacySeed seed = (yacySeed) e.nextElement();
|
||||
if (seed != null) hostList.put(seed.get(yacySeed.NAME, "nameless"),seed.hash);
|
||||
}
|
||||
|
||||
String peername;
|
||||
while ((peername = (String) hostList.firstKey()) != null) {
|
||||
final String Hash = (String) hostList.get(peername);
|
||||
prop.put("otherHosts_" + peerCount + "_hash", Hash);
|
||||
prop.put("otherHosts_" + peerCount + "_name", Name);
|
||||
prop.put("otherHosts_" + peerCount + "_name", peername);
|
||||
hostList.remove(peername);
|
||||
peerCount++;
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {/* */}
|
||||
prop.put("otherHosts", peerCount);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,12 @@
|
|||
<!--
|
||||
function selectall(){
|
||||
for(i = 1; i<= document.getElementsByName("num")[0].value; i++){
|
||||
document.getElementsByName(i)[0].checked = true;
|
||||
document.getElementsByName("item" + i)[0].checked = true;
|
||||
}
|
||||
}
|
||||
function deselectall(){
|
||||
for(i = 1; i<= document.getElementsByName("num")[0].value; i++){
|
||||
document.getElementsByName("item" + i)[0].checked = false;
|
||||
}
|
||||
}
|
||||
-->
|
||||
|
|
@ -18,44 +23,58 @@ function selectall(){
|
|||
<br><br>
|
||||
<h2>Add Items to Blacklist</h2>
|
||||
|
||||
#(page)#
|
||||
<p>This are all new Blacklist Entries from "#[name]#":</p>
|
||||
::
|
||||
#(/page)#
|
||||
<p>
|
||||
#(status)#
|
||||
::
|
||||
#{list}#
|
||||
<b>#[entry]#</b> was added to your Blacklist.<br>
|
||||
#{/list}#
|
||||
::
|
||||
File Error! Wrong Path?
|
||||
::
|
||||
YaCy-Peer "#[name]#" not found.
|
||||
::
|
||||
URL "#[address]#" not found or empty list.
|
||||
::
|
||||
Wrong Invocation! Please invoke with sharedBlacklist.html?name=PeerName
|
||||
<p class="info">
|
||||
#(status)#<!-- [0] -->
|
||||
::<!-- [1] -->
|
||||
Unable to store the items into the blacklist file:<br>
|
||||
<font color="red">#[error]#</font>
|
||||
::<!-- [2] -->
|
||||
File Error! Wrong Path?
|
||||
::<!-- [3] -->
|
||||
YaCy-Peer "<span class="settingsValue">#[name]#</span>" not found.
|
||||
::<!-- [4] -->
|
||||
URL "<span class="settingsValue">#[address]#</span>" not found or empty list.
|
||||
::<!-- [5] -->
|
||||
Wrong Invocation! Please invoke with sharedBlacklist.html?name=PeerName
|
||||
#(/status)#
|
||||
</p>
|
||||
|
||||
<form action="sharedBlacklist_p.html" method="post" enctype="multipart/form-data">
|
||||
<input type="hidden" name="num" value="#[num]#">
|
||||
<input type="hidden" name="filename" value="#[filename]#">
|
||||
<input type="hidden" name="currentBlacklist" value="#[currentBlacklist]#">
|
||||
<p>
|
||||
#(page)#
|
||||
<table border="1" cellspacing="1" cellpadding="3">
|
||||
<tr><th>Hostname/File/URL</th><th width="100%" align="left">Blocked Server</th><th> </th></tr>
|
||||
#{urllist}#
|
||||
#(page)#<!-- [0] -->
|
||||
<table>
|
||||
<tr>
|
||||
<td>#[name]#</td>
|
||||
<td>#[url]#</td>
|
||||
<td><input type="checkbox" name="#[count]#" value="#[url]#"></td>
|
||||
<td><b>Blacklist source:</b></td>
|
||||
<td><span class="settingsValue">#[source]#</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>Blacklist target:</b></td>
|
||||
<td><span class="settingsValue">#[target]#</span></td>
|
||||
</tr>
|
||||
#{/urllist}#
|
||||
<tr><td colspan="3"><input type="button" onclick="selectall()" value="select all"><br><input type="submit" value="add" name="add"></td></tr>
|
||||
</table>
|
||||
::
|
||||
<p />
|
||||
<table border="0" cellspacing="1" cellpadding="3" >
|
||||
<tr class="TableHeader">
|
||||
<th class="small" width="100%" align="left">Blacklist item</th>
|
||||
<th class="small"> </th>
|
||||
</tr>
|
||||
#{urllist}#
|
||||
<tr class="TableCell#(dark)#Light::Dark#(/dark)#" class="small">
|
||||
<td>#[url]#</td>
|
||||
<td><input type="checkbox" name="item#[count]#" value="#[url]#"></td>
|
||||
</tr>
|
||||
#{/urllist}#
|
||||
<tr class="small" style="background-color: #eeeeee">
|
||||
<td colspan="2">
|
||||
<input type="button" onclick="selectall()" value="select all">
|
||||
<input type="button" onclick="deselectall()" value="deselect all">
|
||||
<input type="submit" value="add" name="add">
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
::<!-- [1] -->
|
||||
#(/page)#
|
||||
</p>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -1,71 +1,65 @@
|
|||
// sharedBlacklist_p.java
|
||||
// -----------------------
|
||||
// part of the AnomicHTTPProxy
|
||||
// (C) by Michael Peter Christen; mc@anomic.de
|
||||
// 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
|
||||
//
|
||||
// Using this software in any meaning (reading, learning, copying, compiling,
|
||||
// running) means that you agree that the Author(s) is (are) not responsible
|
||||
// for cost, loss of data or any harm that may be caused directly or indirectly
|
||||
// by usage of this softare or this documentation. The usage of this software
|
||||
// is on your own risk. The installation and usage (starting/running) of this
|
||||
// software may allow other people or application to access your computer and
|
||||
// any attached devices and is highly dependent on the configuration of the
|
||||
// software which must be done by the user of the software; the author(s) is
|
||||
// (are) also not responsible for proper configuration and usage of the
|
||||
// software, even if provoked by documentation provided together with
|
||||
// the software.
|
||||
//
|
||||
// Any changes to this file according to the GPL as documented in the file
|
||||
// gpl.txt aside this file in the shipment you received can be done to the
|
||||
// lines that follows this copyright notice here, but changes must not be
|
||||
// done inside the copyright notive above. A re-distribution must contain
|
||||
// the intact and unchanged copyright notice.
|
||||
// Contributions and changes to the program code must be marked as such.
|
||||
//sharedBlacklist_p.java
|
||||
//-----------------------
|
||||
//part of the AnomicHTTPProxy
|
||||
//(C) by Michael Peter Christen; mc@anomic.de
|
||||
//first published on http://www.anomic.de
|
||||
//Frankfurt, Germany, 2004
|
||||
|
||||
// You must compile this file with
|
||||
// javac -classpath .:../Classes Blacklist_p.java
|
||||
// if the shell's current path is HTROOT
|
||||
//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
|
||||
|
||||
//Using this software in any meaning (reading, learning, copying, compiling,
|
||||
//running) means that you agree that the Author(s) is (are) not responsible
|
||||
//for cost, loss of data or any harm that may be caused directly or indirectly
|
||||
//by usage of this softare or this documentation. The usage of this software
|
||||
//is on your own risk. The installation and usage (starting/running) of this
|
||||
//software may allow other people or application to access your computer and
|
||||
//any attached devices and is highly dependent on the configuration of the
|
||||
//software which must be done by the user of the software; the author(s) is
|
||||
//(are) also not responsible for proper configuration and usage of the
|
||||
//software, even if provoked by documentation provided together with
|
||||
//the software.
|
||||
|
||||
//Any changes to this file according to the GPL as documented in the file
|
||||
//gpl.txt aside this file in the shipment you received can be done to the
|
||||
//lines that follows this copyright notice here, but changes must not be
|
||||
//done inside the copyright notive above. A re-distribution must contain
|
||||
//the intact and unchanged copyright notice.
|
||||
//Contributions and changes to the program code must be marked as such.
|
||||
|
||||
//You must compile this file with
|
||||
//javac -classpath .:../Classes Blacklist_p.java
|
||||
//if the shell's current path is HTROOT
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.PrintWriter;
|
||||
import de.anomic.net.URL;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Enumeration;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
|
||||
import de.anomic.data.listManager;
|
||||
import de.anomic.http.httpHeader;
|
||||
import de.anomic.http.httpc;
|
||||
import de.anomic.net.URL;
|
||||
import de.anomic.plasma.plasmaSwitchboard;
|
||||
import de.anomic.server.serverCore;
|
||||
import de.anomic.server.serverObjects;
|
||||
import de.anomic.server.serverSwitch;
|
||||
import de.anomic.yacy.yacyCore;
|
||||
|
|
@ -73,214 +67,197 @@ import de.anomic.yacy.yacySeed;
|
|||
|
||||
public class sharedBlacklist_p {
|
||||
|
||||
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
|
||||
// return variable that accumulates replacements
|
||||
serverObjects prop = new serverObjects();
|
||||
plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
|
||||
File listsPath = new File(switchboard.getRootPath(), env.getConfig("listsPath", "DATA/LISTS"));
|
||||
String filename = "";
|
||||
String line = "";
|
||||
String out = "";
|
||||
HashSet Blacklist = new HashSet();
|
||||
ArrayList otherBlacklist = new ArrayList();
|
||||
int num = 0;
|
||||
int i = 0; //loop-var
|
||||
int count = 0;
|
||||
String IP = "127.0.0.1"; //should be replaced later
|
||||
String Port = "8080"; //aua!
|
||||
String Name = "";
|
||||
String Hash = "";
|
||||
String address = "";
|
||||
|
||||
if( post != null && post.containsKey("filename") ){
|
||||
filename = (String)post.get("filename");
|
||||
}else{
|
||||
filename = "shared.black";
|
||||
}
|
||||
public static final int STATUS_NONE = 0;
|
||||
public static final int STATUS_ENTRIES_ADDED = 1;
|
||||
public static final int STATUS_FILE_ERROR = 2;
|
||||
public static final int STATUS_PEER_UNKNOWN = 3;
|
||||
public static final int STATUS_URL_PROBLEM = 4;
|
||||
public static final int STATUS_WRONG_INVOCATION = 5;
|
||||
|
||||
BufferedReader br = null;
|
||||
try{
|
||||
//Read the List
|
||||
br = new BufferedReader(new InputStreamReader(new FileInputStream(new File(listsPath, filename))));
|
||||
while((line = br.readLine()) != null){
|
||||
if(! (line.startsWith("#") || line.equals("")) ){
|
||||
Blacklist.add(line);
|
||||
out += line + serverCore.crlfString;
|
||||
}
|
||||
}
|
||||
br.close();
|
||||
}catch(IOException e){}
|
||||
finally {
|
||||
if (br!=null) try{br.close(); br=null;}catch(Exception e){}
|
||||
}
|
||||
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
|
||||
// return variable that accumulates replacements
|
||||
serverObjects prop = new serverObjects();
|
||||
plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
|
||||
|
||||
prop.put("page", 0); //checkbox list
|
||||
if( post != null && post.containsKey("hash") ){ //Step 1: retrieve the Items
|
||||
Hash = (String) post.get("hash");
|
||||
prop.put("status", 3);//YaCy-Peer not found
|
||||
prop.put("status_name", Name);
|
||||
|
||||
yacySeed seed;
|
||||
if( yacyCore.seedDB != null ){ //no nullpointer error..
|
||||
Enumeration e = yacyCore.seedDB.seedsConnected(true, false, null);
|
||||
while (e.hasMoreElements()) {
|
||||
seed = (yacySeed) e.nextElement();
|
||||
if (seed != null && seed.hash.equals(Hash) ) {
|
||||
IP = seed.get(yacySeed.IP, "127.0.0.1");
|
||||
Port = seed.get(yacySeed.PORT, "8080");
|
||||
Name = seed.get(yacySeed.NAME, "<" + IP + ":" + Port + ">");
|
||||
prop.put("status", 0);//nothing
|
||||
}else{
|
||||
//status = "No Seed found"; //wrong? The Name not known?
|
||||
}
|
||||
}
|
||||
}
|
||||
//DEBUG
|
||||
//IP = "217.234.127.107";
|
||||
//Port = "8080";
|
||||
//Name = "RootServer";
|
||||
|
||||
//Make Adresse
|
||||
address = "http://" + IP + ":" + Port + "/yacy/list.html?col=black";
|
||||
try {
|
||||
httpHeader reqHeader = new httpHeader();
|
||||
reqHeader.put(httpHeader.PRAGMA,"no-cache");
|
||||
reqHeader.put(httpHeader.CACHE_CONTROL,"no-cache");
|
||||
|
||||
// get List
|
||||
URL u = new URL(address);
|
||||
otherBlacklist = httpc.wget(u, u.getHost(), 12000, null, null, switchboard.remoteProxyConfig,reqHeader);
|
||||
} catch (Exception e) {}
|
||||
|
||||
//Make HTML-Optionlist with retrieved items
|
||||
for(i = 0; i <= (otherBlacklist.size() -1); i++){
|
||||
String tmp = (String) otherBlacklist.get(i);
|
||||
if( !Blacklist.contains(tmp) && (!tmp.equals("")) ){
|
||||
//newBlacklist.add(tmp);
|
||||
count++;
|
||||
prop.put("page_urllist_"+(count-1)+"_name", Name);
|
||||
prop.put("page_urllist_"+(count-1)+"_url", tmp);
|
||||
prop.put("page_urllist_"+(count-1)+"_count", count);
|
||||
}
|
||||
}
|
||||
prop.put("page_urllist", (count));
|
||||
//write the list
|
||||
try{
|
||||
BufferedWriter bw = new BufferedWriter(new PrintWriter(new FileWriter(new File(listsPath, filename))));
|
||||
bw.write(out);
|
||||
bw.close();
|
||||
}catch(IOException e){}
|
||||
|
||||
}else if( post != null && post.containsKey("url") ){
|
||||
//load from URL
|
||||
address = (String)post.get("url");
|
||||
prop.put("status", 4);
|
||||
prop.put("status_address", address);
|
||||
//Name = " "; //No Name
|
||||
Name = address;
|
||||
|
||||
try {
|
||||
URL u = new URL(address);
|
||||
otherBlacklist = httpc.wget(u, u.getHost(), 6000, null, null, switchboard.remoteProxyConfig); //get List
|
||||
} catch (Exception e) {}
|
||||
prop.put("status", 0); //TODO: check if the wget failed...
|
||||
|
||||
//Make HTML-Optionlist with retrieved items
|
||||
for(i = 0; i <= (otherBlacklist.size() -1); i++){
|
||||
String tmp = (String) otherBlacklist.get(i);
|
||||
if( !Blacklist.contains(tmp) && (!tmp.equals("")) && (!tmp.startsWith("#")) ){ //This List may contain comments.
|
||||
//newBlacklist.add(tmp);
|
||||
count++;
|
||||
prop.put("page_urllist_"+(count-1)+"_name", Name);
|
||||
prop.put("page_urllist_"+(count-1)+"_url", tmp);
|
||||
prop.put("page_urllist_"+(count-1)+"_count", count);
|
||||
}
|
||||
}
|
||||
prop.put("page_urllist", (count));
|
||||
|
||||
}else if( post != null && post.containsKey("file") ){
|
||||
|
||||
try{
|
||||
//Read the List
|
||||
br = new BufferedReader(new InputStreamReader(new FileInputStream( (String)post.get("file") )));
|
||||
while((line = br.readLine()) != null){
|
||||
if(! (line.startsWith("#") || line.equals("")) ){
|
||||
otherBlacklist.add(line);
|
||||
}
|
||||
}
|
||||
br.close();
|
||||
}catch(IOException e){
|
||||
prop.put("status", 2); //File Error
|
||||
} finally {
|
||||
if (br != null) try {br.close(); br = null; } catch (Exception e){}
|
||||
// getting the name of the destination blacklist
|
||||
String selectedBlacklistName = "";
|
||||
if( post != null && post.containsKey("currentBlacklist") ){
|
||||
selectedBlacklistName = (String)post.get("currentBlacklist");
|
||||
}else{
|
||||
selectedBlacklistName = "shared.black";
|
||||
}
|
||||
Name = (String)post.get("file");
|
||||
|
||||
prop.put("currentBlacklist", selectedBlacklistName);
|
||||
prop.put("page_target", selectedBlacklistName);
|
||||
|
||||
if (post != null) {
|
||||
ArrayList otherBlacklist = null;
|
||||
|
||||
if (post.containsKey("hash")) {
|
||||
/* ======================================================
|
||||
* Import blacklist from other peer
|
||||
* ====================================================== */
|
||||
|
||||
// getting the source peer hash
|
||||
String Hash = (String) post.get("hash");
|
||||
|
||||
// generate the download URL
|
||||
String downloadURL = null;
|
||||
if( yacyCore.seedDB != null ){ //no nullpointer error..
|
||||
yacySeed seed = yacyCore.seedDB.getConnected(Hash);
|
||||
if (seed != null) {
|
||||
String IP = seed.get(yacySeed.IP, "127.0.0.1");
|
||||
String Port = seed.get(yacySeed.PORT, "8080");
|
||||
String peerName = seed.get(yacySeed.NAME, "<" + IP + ":" + Port + ">");
|
||||
prop.put("page_source", peerName);
|
||||
|
||||
//Make HTML-Optionlist with retrieved items
|
||||
for(i = 0; i <= (otherBlacklist.size() -1); i++){
|
||||
String tmp = (String) otherBlacklist.get(i);
|
||||
if( !Blacklist.contains(tmp) && (!tmp.equals("")) && (!tmp.startsWith("#")) ){ //This List may contain comments.
|
||||
//newBlacklist.add(tmp);
|
||||
count++;
|
||||
prop.put("page_urllist_"+(count-1)+"_name", Name);
|
||||
prop.put("page_urllist_"+(count-1)+"_url", tmp);
|
||||
prop.put("page_urllist_"+(count-1)+"_count", count);
|
||||
}
|
||||
downloadURL = "http://" + IP + ":" + Port + "/yacy/list.html?col=black";
|
||||
} else {
|
||||
prop.put("status", STATUS_PEER_UNKNOWN);//YaCy-Peer not found
|
||||
prop.put("page", 1);
|
||||
}
|
||||
} else {
|
||||
prop.put("status", STATUS_PEER_UNKNOWN);//YaCy-Peer not found
|
||||
prop.put("page", 1);
|
||||
}
|
||||
prop.put("page_urllist", (count));
|
||||
|
||||
if (downloadURL != null) {
|
||||
// download the blacklist
|
||||
try {
|
||||
httpHeader reqHeader = new httpHeader();
|
||||
reqHeader.put(httpHeader.PRAGMA,"no-cache");
|
||||
reqHeader.put(httpHeader.CACHE_CONTROL,"no-cache");
|
||||
|
||||
}else if( post != null && post.containsKey("add") ){ //Step 2: Add the Items
|
||||
prop.put("page", 1); //result page
|
||||
num = Integer.parseInt( (String)post.get("num") );
|
||||
prop.put("status", 1); //list of added Entries
|
||||
count = 0;//couter of added entries
|
||||
for(i=1;i <= num; i++){ //count/num starts with 1!
|
||||
if( post.containsKey( String.valueOf(i) ) ){
|
||||
String newItem = (String)post.get( String.valueOf(i) );
|
||||
//This should not be needed...
|
||||
if ( newItem.startsWith("http://") ){
|
||||
newItem = newItem.substring(7);
|
||||
}
|
||||
// separate the newItem into host and path
|
||||
int pos = newItem.indexOf("/");
|
||||
if (pos < 0) {
|
||||
// add default empty path pattern
|
||||
pos = newItem.length();
|
||||
newItem = newItem + "/.*";
|
||||
}
|
||||
out += newItem+"\n";
|
||||
prop.put("status_list_"+count+"_entry", newItem);
|
||||
count++;
|
||||
if (plasmaSwitchboard.urlBlacklist != null) {
|
||||
String supportedBlacklistTypesStr = env.getConfig("BlackLists.types", "");
|
||||
String[] supportedBlacklistTypes = supportedBlacklistTypesStr.split(",");
|
||||
// get List
|
||||
URL u = new URL(downloadURL);
|
||||
otherBlacklist = httpc.wget(u, u.getHost(), 12000, null, null, switchboard.remoteProxyConfig,reqHeader);
|
||||
} catch (Exception e) {
|
||||
prop.put("status", STATUS_PEER_UNKNOWN);
|
||||
prop.put("page", 1);
|
||||
}
|
||||
}
|
||||
} else if (post.containsKey("url")) {
|
||||
/* ======================================================
|
||||
* Download the blacklist from URL
|
||||
* ====================================================== */
|
||||
|
||||
String downloadURL = (String)post.get("url");
|
||||
prop.put("page_source", downloadURL);
|
||||
|
||||
try {
|
||||
URL u = new URL(downloadURL);
|
||||
otherBlacklist = httpc.wget(u, u.getHost(), 6000, null, null, switchboard.remoteProxyConfig); //get List
|
||||
} catch (Exception e) {
|
||||
prop.put("status", STATUS_URL_PROBLEM);
|
||||
prop.put("status_address",downloadURL);
|
||||
prop.put("page", 1);
|
||||
}
|
||||
} else if (post.containsKey("file")) {
|
||||
/* ======================================================
|
||||
* Import the blacklist from file
|
||||
* ====================================================== */
|
||||
String sourceFileName = (String)post.get("file");
|
||||
prop.put("page_source", sourceFileName);
|
||||
|
||||
File sourceFile = new File(listManager.listsPath, sourceFileName);
|
||||
if (!sourceFile.exists() || !sourceFile.canRead() || !sourceFile.isFile()) {
|
||||
prop.put("status", STATUS_FILE_ERROR);
|
||||
prop.put("page", 1);
|
||||
} else {
|
||||
otherBlacklist = listManager.getListArray(sourceFile);
|
||||
}
|
||||
|
||||
} else if (post.containsKey("add")) {
|
||||
/* ======================================================
|
||||
* Add loaded items into blacklist file
|
||||
* ====================================================== */
|
||||
|
||||
prop.put("page", 1); //result page
|
||||
prop.put("status", STATUS_ENTRIES_ADDED); //list of added Entries
|
||||
|
||||
int count = 0;//couter of added entries
|
||||
PrintWriter pw = null;
|
||||
try {
|
||||
// open the blacklist file
|
||||
pw = new PrintWriter(new FileWriter(new File(listManager.listsPath, selectedBlacklistName), true));
|
||||
|
||||
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
|
||||
if (listManager.ListInListslist(supportedBlacklistTypes[blTypes] + ".BlackLists",filename)) {
|
||||
plasmaSwitchboard.urlBlacklist.add(supportedBlacklistTypes[blTypes],newItem.substring(0, pos), newItem.substring(pos + 1));
|
||||
}
|
||||
}
|
||||
// loop through the received entry list
|
||||
int num = Integer.parseInt( (String)post.get("num") );
|
||||
for(int i=0;i < num; i++){
|
||||
if( post.containsKey("item" + i) ){
|
||||
String newItem = (String)post.get("item" + i);
|
||||
|
||||
//This should not be needed...
|
||||
if ( newItem.startsWith("http://") ){
|
||||
newItem = newItem.substring(7);
|
||||
}
|
||||
|
||||
// separate the newItem into host and path
|
||||
int pos = newItem.indexOf("/");
|
||||
if (pos < 0) {
|
||||
// add default empty path pattern
|
||||
pos = newItem.length();
|
||||
newItem = newItem + "/.*";
|
||||
}
|
||||
|
||||
// append the item to the file
|
||||
pw.println(newItem);
|
||||
|
||||
count++;
|
||||
if (plasmaSwitchboard.urlBlacklist != null) {
|
||||
String supportedBlacklistTypesStr = env.getConfig("BlackLists.types", "");
|
||||
String[] supportedBlacklistTypes = supportedBlacklistTypesStr.split(",");
|
||||
|
||||
for (int blTypes=0; blTypes < supportedBlacklistTypes.length; blTypes++) {
|
||||
if (listManager.ListInListslist(supportedBlacklistTypes[blTypes] + ".BlackLists",selectedBlacklistName)) {
|
||||
plasmaSwitchboard.urlBlacklist.add(supportedBlacklistTypes[blTypes],newItem.substring(0, pos), newItem.substring(pos + 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
prop.put("status",1);
|
||||
prop.put("status_error", e.getLocalizedMessage());
|
||||
} finally {
|
||||
if (pw != null) try { pw.close(); } catch (Exception e){ /* */}
|
||||
}
|
||||
|
||||
//write the list
|
||||
try{
|
||||
BufferedWriter bw = new BufferedWriter(new PrintWriter(new FileWriter(new File(listsPath, filename))));
|
||||
bw.write(out);
|
||||
bw.close();
|
||||
}catch(IOException e){}
|
||||
|
||||
}else{
|
||||
}
|
||||
}
|
||||
prop.put("status_list", count);
|
||||
}else{
|
||||
prop.put("status", 5);//Wrong Invokation
|
||||
}
|
||||
|
||||
prop.put("filename", filename);
|
||||
prop.put("page_name", Name);
|
||||
prop.put("num", String.valueOf(count));
|
||||
return prop;
|
||||
|
||||
prop.put("LOCATION","Blacklist_p.html?selectedListName=" + selectedBlacklistName + "&selectList=");
|
||||
return prop;
|
||||
}
|
||||
|
||||
// generate the html list
|
||||
if (otherBlacklist != null) {
|
||||
// loading the current blacklist content
|
||||
HashSet Blacklist = new HashSet(listManager.getListArray(new File(listManager.listsPath, selectedBlacklistName)));
|
||||
|
||||
// sort the loaded blacklist
|
||||
String[] sortedlist = (String[])otherBlacklist.toArray(new String[otherBlacklist.size()]);
|
||||
Arrays.sort(sortedlist);
|
||||
|
||||
int count = 0;
|
||||
for(int i = 0; i < sortedlist.length; i++){
|
||||
String tmp = sortedlist[i];
|
||||
if( !Blacklist.contains(tmp) && (!tmp.equals("")) ){
|
||||
//newBlacklist.add(tmp);
|
||||
prop.put("page_urllist_" + count + "_dark", count % 2 == 0 ? 0:1);
|
||||
prop.put("page_urllist_" + count + "_url", tmp);
|
||||
prop.put("page_urllist_" + count + "_count", count);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
prop.put("page_urllist", (count));
|
||||
prop.put("num", String.valueOf(count));
|
||||
prop.put("page", 0);
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
prop.put("page", 1);
|
||||
prop.put("status", 5);//Wrong Invokation
|
||||
}
|
||||
return prop;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,7 +75,8 @@ public final class list {
|
|||
if(filenamesarray.length > 0){
|
||||
for(int i = 0;i < filenamesarray.length; i++){
|
||||
String filename = filenamesarray[i];
|
||||
out.append(listManager.getListString(new File(listsPath,filename).toString(), false))
|
||||
File fileObj = new File(listsPath,filename);
|
||||
out.append(listManager.getListString(fileObj, false))
|
||||
.append(serverCore.crlfString);
|
||||
}
|
||||
} // if filenamesarray.length > 0
|
||||
|
|
|
|||
|
|
@ -164,13 +164,17 @@ public class listManager {
|
|||
return writeList(listFile, out.toString()); //(File, String)
|
||||
}
|
||||
|
||||
public static String getListString(String filename, boolean withcomments){
|
||||
public static String getListString(String filename, boolean withcomments) {
|
||||
File listFile = new File(listsPath ,filename);
|
||||
return getListString(listFile, withcomments);
|
||||
}
|
||||
|
||||
public static String getListString(File listFile, boolean withcomments){
|
||||
StringBuffer temp = new StringBuffer();
|
||||
|
||||
BufferedReader br = null;
|
||||
try{
|
||||
File listFile;
|
||||
br = new BufferedReader(new InputStreamReader(new FileInputStream(listFile = new File(listsPath ,filename))));
|
||||
br = new BufferedReader(new InputStreamReader(new FileInputStream(listFile)));
|
||||
temp.ensureCapacity((int) listFile.length());
|
||||
|
||||
// Read the List
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user