mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
Fix call parameter for ConnectionInfo in MonitorHandler
(expected scheme e.g. http, was protocol version). Depreceate obsolete custom X-...-Scheme header constant. Use existing FORMAT_ANSIC Dateformatter in HeaderFramework. Correct htmlParserTest (del one not intended println)
This commit is contained in:
parent
9e626f6b00
commit
41e2ee0eca
|
@ -35,6 +35,7 @@ import java.util.TimeZone;
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
|
import net.yacy.cora.date.GenericFormatter;
|
||||||
import net.yacy.cora.document.encoding.ASCII;
|
import net.yacy.cora.document.encoding.ASCII;
|
||||||
import net.yacy.cora.document.encoding.UTF8;
|
import net.yacy.cora.document.encoding.UTF8;
|
||||||
import net.yacy.cora.util.CommonPattern;
|
import net.yacy.cora.util.CommonPattern;
|
||||||
|
@ -100,7 +101,8 @@ public class HeaderFramework extends TreeMap<String, String> implements Map<Stri
|
||||||
|
|
||||||
public static final String X_YACY_INDEX_CONTROL = "X-YaCy-Index-Control";
|
public static final String X_YACY_INDEX_CONTROL = "X-YaCy-Index-Control";
|
||||||
/** Added when generating legacy request header to allow template servlets to know the original request scheme : "http" or "https" */
|
/** Added when generating legacy request header to allow template servlets to know the original request scheme : "http" or "https" */
|
||||||
public static final String X_YACY_REQUEST_SCHEME = "X-YaCy-Request-Scheme"; // TODO: after completing implementation of HttpServletRequest getScheme() should be used and this can be removed
|
@Deprecated /** use getScheme() (header not used in any request, 2017-02-22) */
|
||||||
|
public static final String X_YACY_REQUEST_SCHEME = "X-YaCy-Request-Scheme";
|
||||||
|
|
||||||
public static final String SET_COOKIE = "Set-Cookie";
|
public static final String SET_COOKIE = "Set-Cookie";
|
||||||
public static final String SET_COOKIE2 = "Set-Cookie2";
|
public static final String SET_COOKIE2 = "Set-Cookie2";
|
||||||
|
@ -223,10 +225,8 @@ public class HeaderFramework extends TreeMap<String, String> implements Map<Stri
|
||||||
/** Date formatter/parser for standard compliant HTTP header dates (RFC 1123) */
|
/** Date formatter/parser for standard compliant HTTP header dates (RFC 1123) */
|
||||||
private static final String PATTERN_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss Z"; // with numeric time zone indicator as defined in RFC5322
|
private static final String PATTERN_RFC1123 = "EEE, dd MMM yyyy HH:mm:ss Z"; // with numeric time zone indicator as defined in RFC5322
|
||||||
private static final String PATTERN_RFC1036 = "EEEE, dd-MMM-yy HH:mm:ss zzz";
|
private static final String PATTERN_RFC1036 = "EEEE, dd-MMM-yy HH:mm:ss zzz";
|
||||||
private static final String PATTERN_ANSIC = "EEE MMM d HH:mm:ss yyyy";
|
public static final SimpleDateFormat FORMAT_RFC1123 = new SimpleDateFormat(PATTERN_RFC1123, Locale.US);
|
||||||
public static final SimpleDateFormat FORMAT_RFC1123 = new SimpleDateFormat(PATTERN_RFC1123, Locale.US);
|
public static final SimpleDateFormat FORMAT_RFC1036 = new SimpleDateFormat(PATTERN_RFC1036, Locale.US);
|
||||||
public static final SimpleDateFormat FORMAT_RFC1036 = new SimpleDateFormat(PATTERN_RFC1036, Locale.US);
|
|
||||||
public static final SimpleDateFormat FORMAT_ANSIC = new SimpleDateFormat(PATTERN_ANSIC, Locale.US);
|
|
||||||
private static final TimeZone TZ_GMT = TimeZone.getTimeZone("GMT");
|
private static final TimeZone TZ_GMT = TimeZone.getTimeZone("GMT");
|
||||||
private static final Calendar CAL_GMT = Calendar.getInstance(TZ_GMT, Locale.US);
|
private static final Calendar CAL_GMT = Calendar.getInstance(TZ_GMT, Locale.US);
|
||||||
|
|
||||||
|
@ -240,7 +240,7 @@ public class HeaderFramework extends TreeMap<String, String> implements Map<Stri
|
||||||
// RFC 1036/850 (old) "Monday, 12-Nov-07 10:11:12 GMT"
|
// RFC 1036/850 (old) "Monday, 12-Nov-07 10:11:12 GMT"
|
||||||
FORMAT_RFC1036,
|
FORMAT_RFC1036,
|
||||||
// ANSI C asctime() "Mon Nov 12 10:11:12 2007"
|
// ANSI C asctime() "Mon Nov 12 10:11:12 2007"
|
||||||
FORMAT_ANSIC,
|
GenericFormatter.FORMAT_ANSIC,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -643,11 +643,7 @@ public class RequestHeader extends HeaderFramework implements HttpServletRequest
|
||||||
if (_request != null) {
|
if (_request != null) {
|
||||||
return _request.getScheme();
|
return _request.getScheme();
|
||||||
} else {
|
} else {
|
||||||
if (super.containsKey(HeaderFramework.X_YACY_REQUEST_SCHEME)) {
|
return "http";
|
||||||
return super.get(HeaderFramework.X_YACY_REQUEST_SCHEME);
|
|
||||||
} else {
|
|
||||||
return "http";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class MonitorHandler extends AbstractHandler {
|
||||||
|
|
||||||
final Connection connection = baseRequest.getHttpChannel().getEndPoint().getConnection();
|
final Connection connection = baseRequest.getHttpChannel().getEndPoint().getConnection();
|
||||||
final ConnectionInfo info = new ConnectionInfo(
|
final ConnectionInfo info = new ConnectionInfo(
|
||||||
baseRequest.getProtocol(),
|
baseRequest.getScheme(),
|
||||||
baseRequest.getRemoteAddr() + ":" + baseRequest.getRemotePort(),
|
baseRequest.getRemoteAddr() + ":" + baseRequest.getRemotePort(),
|
||||||
baseRequest.getMethod() + " " + baseRequest.getUri().getPathAndParam(),
|
baseRequest.getMethod() + " " + baseRequest.getUri().getPathAndParam(),
|
||||||
connection.hashCode(),
|
connection.hashCode(),
|
||||||
|
|
|
@ -705,7 +705,7 @@ public class YaCyDefaultServlet extends HttpServlet {
|
||||||
if("http".equals(protocolHeader) || "https".equals(protocolHeader)) {
|
if("http".equals(protocolHeader) || "https".equals(protocolHeader)) {
|
||||||
protocol = protocolHeader.toLowerCase();
|
protocol = protocolHeader.toLowerCase();
|
||||||
} else if(protocolHeader != null && !protocolHeader.isEmpty()) {
|
} else if(protocolHeader != null && !protocolHeader.isEmpty()) {
|
||||||
ConcurrentLog.warn("FILEHANDLER","YaCyDefaultServlet: illegal " + HeaderFramework.X_YACY_REQUEST_SCHEME + " header value : " + protocolHeader);
|
ConcurrentLog.warn("FILEHANDLER","YaCyDefaultServlet: illegal protocol scheme header value : " + protocolHeader);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This peer can also be behind a reverse proxy requested using https, even if the request coming to this YaCy peer is http only
|
/* This peer can also be behind a reverse proxy requested using https, even if the request coming to this YaCy peer is http only
|
||||||
|
|
|
@ -167,9 +167,8 @@ public class htmlParserTest extends TestCase {
|
||||||
+ "</html>";
|
+ "</html>";
|
||||||
ContentScraper scraper = parseToScraper(url, charset, new VocabularyScraper(), 0, testhtml, 10);
|
ContentScraper scraper = parseToScraper(url, charset, new VocabularyScraper(), 0, testhtml, 10);
|
||||||
|
|
||||||
System.out.println(scraper.getText());
|
|
||||||
String txt = scraper.getText();
|
String txt = scraper.getText();
|
||||||
System.out.println("ScraperTagTest: [" + textSource + "] = [" + txt + "]");
|
System.out.println("ScraperScriptTagTest: [" + textSource + "] = [" + txt + "]");
|
||||||
assertEquals(txt, textSource);
|
assertEquals(txt, textSource);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user