From f65bfaa9af1b1cdf000b6153309f2ae1b8fb4c1c Mon Sep 17 00:00:00 2001 From: low012 Date: Wed, 23 Sep 2009 21:26:14 +0000 Subject: [PATCH] *) Removed base tag from errror page. This has been added by myself a long time ago as a workaround for some weird behavior of my router, but as it turns out, it does more bad than good in general: If HTTPS is used for communication with YaCy, entering a wrong passwort led to an errror page with a form which would send username and password unencrypted with the user possibly being unaware of this. *) changed some comments, added some annotations, added SVN properties here and there git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6340 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/proxymsg/error.html | 1 - .../de/anomic/crawler/retrieval/FTPLoader.java | 2 +- .../anomic/crawler/retrieval/HTTPLoader.java | 8 ++++---- .../crawler/retrieval/LoaderDispatcher.java | 6 +++--- .../de/anomic/crawler/retrieval/Request.java | 6 +++--- .../de/anomic/crawler/retrieval/Response.java | 8 ++++---- .../client/EasySSLProtocolSocketFactory.java | 2 +- .../anomic/http/metadata/HeaderFramework.java | 4 +++- .../de/anomic/http/metadata/RequestHeader.java | 4 ++-- .../http/metadata/ResponseContainer.java | 7 ++++--- .../anomic/http/metadata/ResponseHeader.java | 6 +++--- .../http/server/AlternativeDomainNames.java | 6 +++--- .../anomic/http/server/HTTPDFileHandler.java | 9 +++++---- .../anomic/http/server/HTTPDProxyHandler.java | 3 ++- source/de/anomic/http/server/HTTPDemon.java | 18 +++--------------- .../anomic/http/server/ProxyLogFormatter.java | 17 +++++++++-------- .../de/anomic/http/server/RobotsTxtConfig.java | 9 +++++---- .../anomic/http/server/ServerSideIncludes.java | 8 ++++---- .../de/anomic/http/server/TemplateEngine.java | 2 +- 19 files changed, 60 insertions(+), 66 deletions(-) diff --git a/htroot/proxymsg/error.html b/htroot/proxymsg/error.html index 3dfee954b..496e149d3 100644 --- a/htroot/proxymsg/error.html +++ b/htroot/proxymsg/error.html @@ -1,7 +1,6 @@ - YaCy: Error Message #%env/templates/metas.template%# diff --git a/source/de/anomic/crawler/retrieval/FTPLoader.java b/source/de/anomic/crawler/retrieval/FTPLoader.java index 85c917337..d3ee175d6 100644 --- a/source/de/anomic/crawler/retrieval/FTPLoader.java +++ b/source/de/anomic/crawler/retrieval/FTPLoader.java @@ -1,4 +1,4 @@ -// CrawlerWorker.java +// FTPLoader.java // ------------------------------------- // part of YACY // (C) by Michael Peter Christen; mc@yacy.net diff --git a/source/de/anomic/crawler/retrieval/HTTPLoader.java b/source/de/anomic/crawler/retrieval/HTTPLoader.java index 1d42f6f0e..090504bc2 100644 --- a/source/de/anomic/crawler/retrieval/HTTPLoader.java +++ b/source/de/anomic/crawler/retrieval/HTTPLoader.java @@ -1,13 +1,13 @@ -//plasmaCrawlWorker.java +//HTTPLoader.java //------------------------ //part of YaCy //(C) by Michael Peter Christen; mc@yacy.net //first published on http://www.anomic.de //Frankfurt, Germany, 2006 // -// $LastChangedDate: 2006-08-12 16:28:14 +0200 (Sa, 12 Aug 2006) $ -// $LastChangedRevision: 2397 $ -// $LastChangedBy: theli $ +// $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 diff --git a/source/de/anomic/crawler/retrieval/LoaderDispatcher.java b/source/de/anomic/crawler/retrieval/LoaderDispatcher.java index f02f2582f..fa1f7d1da 100644 --- a/source/de/anomic/crawler/retrieval/LoaderDispatcher.java +++ b/source/de/anomic/crawler/retrieval/LoaderDispatcher.java @@ -4,9 +4,9 @@ // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ -// $LastChangedRevision: 1986 $ -// $LastChangedBy: orbiter $ +// $LastChangedDate$ +// $LastChangedRevision$ +// $LastChangedBy$ // // LICENSE // diff --git a/source/de/anomic/crawler/retrieval/Request.java b/source/de/anomic/crawler/retrieval/Request.java index 1da638b8a..495dbdf12 100755 --- a/source/de/anomic/crawler/retrieval/Request.java +++ b/source/de/anomic/crawler/retrieval/Request.java @@ -4,9 +4,9 @@ // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ -// $LastChangedRevision: 1986 $ -// $LastChangedBy: orbiter $ +// $LastChangedDate$ +// $LastChangedRevision$ +// $LastChangedBy$ // // LICENSE // diff --git a/source/de/anomic/crawler/retrieval/Response.java b/source/de/anomic/crawler/retrieval/Response.java index 747026e2a..768e176a4 100755 --- a/source/de/anomic/crawler/retrieval/Response.java +++ b/source/de/anomic/crawler/retrieval/Response.java @@ -1,12 +1,12 @@ -// httpdProxyCacheEntry.java +// Response.java // (C) 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 19.08.2008 on http://yacy.net // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ -// $LastChangedRevision: 1986 $ -// $LastChangedBy: orbiter $ +// $LastChangedDate$ +// $LastChangedRevision$ +// $LastChangedBy$ // // LICENSE // diff --git a/source/de/anomic/http/client/EasySSLProtocolSocketFactory.java b/source/de/anomic/http/client/EasySSLProtocolSocketFactory.java index 3f6a9940c..f45fce27c 100644 --- a/source/de/anomic/http/client/EasySSLProtocolSocketFactory.java +++ b/source/de/anomic/http/client/EasySSLProtocolSocketFactory.java @@ -30,7 +30,7 @@ /* CHANGES to original file * ======================== - * 2008-04-07 danielr: changed package from org.apache.commons.httpclient.contrib.ssl + * 2008-04-07 danielr: changed package from org.apache.commons.httpclient.contrib.ssl */ package de.anomic.http.client; diff --git a/source/de/anomic/http/metadata/HeaderFramework.java b/source/de/anomic/http/metadata/HeaderFramework.java index 5e037717b..7f5fe2424 100644 --- a/source/de/anomic/http/metadata/HeaderFramework.java +++ b/source/de/anomic/http/metadata/HeaderFramework.java @@ -62,7 +62,7 @@ public class HeaderFramework extends TreeMap implements Map implements Map implements Map 0) ? path + "?" + args : path); - + // reseting the empty request counter this.emptyRequestCount = 0; @@ -1144,9 +1144,6 @@ public final class HTTPDemon implements serverHandler, Cloneable { // set rewrite values final serverObjects tp = new serverObjects(); -// tp.put("host", serverCore.publicIP().getHostAddress()); -// tp.put("port", switchboard.getConfig("port", "8080")); - final String clientIP = conProp.getProperty(HeaderFramework.CONNECTION_PROP_CLIENTIP, "127.0.0.1"); // check if ip is local ip address @@ -1162,15 +1159,6 @@ public final class HTTPDemon implements serverHandler, Cloneable { tp.put("port", Integer.toString(serverCore.getPortNr(switchboard.getConfig("port", "8080")))); } - // if peer has public address it will be used - if (getAlternativeResolver() != null) { - tp.put("extAddress", getAlternativeResolver().myIP() + ":" + getAlternativeResolver().myPort()); - } - // otherwise the local ip address will be used - else { - tp.put("extAddress", tp.get("host", "127.0.0.1") + ":" + tp.get("port", "8080")); - } - tp.put("peerName", (getAlternativeResolver() == null) ? "" : getAlternativeResolver().myName()); tp.put("errorMessageType", errorcase); tp.put("httpStatus", Integer.toString(httpStatusCode) + " " + httpStatusText); diff --git a/source/de/anomic/http/server/ProxyLogFormatter.java b/source/de/anomic/http/server/ProxyLogFormatter.java index a737e5c0f..bb129e302 100644 --- a/source/de/anomic/http/server/ProxyLogFormatter.java +++ b/source/de/anomic/http/server/ProxyLogFormatter.java @@ -1,4 +1,4 @@ -//severMiniLogFormatter.java +//ProxyLogFormatter.java //------------------------------------- //part of YACY //(C) by Michael Peter Christen; mc@yacy.net @@ -6,8 +6,8 @@ //Frankfurt, Germany, 2004 // //This file ist contributed by Martin Thelian -//last major change: $LastChangedDate: 2008-12-04 12:54:16 +0000 (Do, 04 Dez 2008) $ by $LastChangedBy: orbiter $ -//Revision: $LastChangedRevision: 5379 $ +//last change: $LastChangedDate$ by $LastChangedBy$ +//Revision: $LastChangedRevision$ // //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 @@ -36,17 +36,18 @@ public final class ProxyLogFormatter extends SimpleFormatter { super(); } + @Override public synchronized String format(final LogRecord record) { - final StringBuilder buffer = this.buffer; - buffer.setLength(0); + final StringBuilder sb = this.buffer; + sb.setLength(0); - buffer.append(formatMessage(record)); + sb.append(formatMessage(record)); // adding the stack trace if available - buffer.append(System.getProperty("line.separator")); + sb.append(System.getProperty("line.separator")); - return buffer.toString(); + return sb.toString(); } } diff --git a/source/de/anomic/http/server/RobotsTxtConfig.java b/source/de/anomic/http/server/RobotsTxtConfig.java index 7e8f975c4..24506b4c7 100644 --- a/source/de/anomic/http/server/RobotsTxtConfig.java +++ b/source/de/anomic/http/server/RobotsTxtConfig.java @@ -1,4 +1,4 @@ -// httpdRobotsTxtConfig.java +// RobotsTxtConfig.java // --------- // part of YaCy // (C) by Michael Peter Christen; mc@yacy.net @@ -8,9 +8,9 @@ // // This file is contributed by Franz Brausze // -// $LastChangedDate: $ -// $LastChangedRevision: $ -// $LastChangedBy: $ +// $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 @@ -89,6 +89,7 @@ public final class RobotsTxtConfig { return new RobotsTxtConfig(cfg.split(",")); } + @Override public String toString() { if (this.allDisallowed) return ALL; final StringBuilder sb = new StringBuilder(); diff --git a/source/de/anomic/http/server/ServerSideIncludes.java b/source/de/anomic/http/server/ServerSideIncludes.java index 6b516c20b..d382fa03e 100644 --- a/source/de/anomic/http/server/ServerSideIncludes.java +++ b/source/de/anomic/http/server/ServerSideIncludes.java @@ -1,13 +1,13 @@ -// httpSSI.java +// ServerSideIncludes.java // ----------------------------- // (C) 2007 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany // first published 26.06.2007 on http://yacy.net // // This is a part of YaCy, a peer-to-peer based web search engine // -// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $ -// $LastChangedRevision: 1986 $ -// $LastChangedBy: orbiter $ +// $LastChangedDate$ +// $LastChangedRevision$ +// $LastChangedBy$ // // LICENSE // diff --git a/source/de/anomic/http/server/TemplateEngine.java b/source/de/anomic/http/server/TemplateEngine.java index 41d8380a0..65ac4e543 100644 --- a/source/de/anomic/http/server/TemplateEngine.java +++ b/source/de/anomic/http/server/TemplateEngine.java @@ -1,4 +1,4 @@ -//httpTemplate.java +//TemplateEngine.java //------------------------------------- //(C) by Michael Peter Christen; mc@yacy.net //first published on http://www.anomic.de