boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

catch one more malformed url in proxy url rewrite

Browse Source
pull/1/head
reger 12 years ago
parent 605530fec5
commit 69599566f9
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File

41
source/net/yacy/server/http/HTTPDFileHandler.java
Unescape View File

@ -1602,8 +1602,8 @@ public final class HTTPDFileHandler {
if(m.group(8) != null) url = m.group(8); if(m.group(8) != null) url = m.group(8);
if(m.group(10) != null) url = m.group(10); if(m.group(10) != null) url = m.group(10);
if (url.startsWith("data:") || url.startsWith("#") || url.startsWith("mailto:") || url.startsWith("javascript:")) { if (url.startsWith("data:") || url.startsWith("#") || url.startsWith("mailto:") || url.startsWith("javascript:")) {
String newurl = init + url; String newurl = init + url;
newurl = newurl.replaceAll("\\$","\\\\\\$"); newurl = newurl.replaceAll("\\$","\\\\\\$");
m.appendReplacement(result, newurl); m.appendReplacement(result, newurl);
} else if (url.startsWith("http")) { } else if (url.startsWith("http")) {
@ -1614,32 +1614,37 @@ public final class HTTPDFileHandler {
continue; continue;
} }
} catch (final MalformedURLException e) { } catch (final MalformedURLException e) {
theLogger.fine("malformed url for url-rewirte " + url.toString()); theLogger.fine("malformed url for url-rewirte: " + url);
continue; continue;
} }
} }
String newurl = init + "/proxy.html?url=" + url; String newurl = init + "/proxy.html?url=" + url;
newurl = newurl.replaceAll("\\$","\\\\\\$"); newurl = newurl.replaceAll("\\$","\\\\\\$");
m.appendReplacement(result, newurl); m.appendReplacement(result, newurl);
} else if (url.startsWith("//")) { } else if (url.startsWith("//")) {
// absoulte url but same protocol of form href="//domain.com/path" // absoulte url but same protocol of form href="//domain.com/path"
final String complete_url = proxyurl.getProtocol() + ":" + url; final String complete_url = proxyurl.getProtocol() + ":" + url;
if (sb.getConfig("proxyURL.rewriteURLs", "all").equals("domainlist")) { if (sb.getConfig("proxyURL.rewriteURLs", "all").equals("domainlist")) {
if (sb.crawlStacker.urlInAcceptedDomain(new DigestURL(complete_url)) != null) { try {
continue; if (sb.crawlStacker.urlInAcceptedDomain(new DigestURL(complete_url)) != null) {
} continue;
} }
} catch (final MalformedURLException e) {
theLogger.fine("malformed url for url-rewirte: " + complete_url);
continue;
}
}
String newurl = init + "/proxy.html?url=" + complete_url; String newurl = init + "/proxy.html?url=" + complete_url;
newurl = newurl.replaceAll("\\$","\\\\\\$"); newurl = newurl.replaceAll("\\$", "\\\\\\$");
m.appendReplacement(result, newurl); m.appendReplacement(result, newurl);
} else if (url.startsWith("/")) { } else if (url.startsWith("/")) {
// absolute path of form href="/absolute/path/to/linked/page" // absolute path of form href="/absolute/path/to/linked/page"
String newurl = init + "/proxy.html?url=http://" + host + url; String newurl = init + "/proxy.html?url=http://" + host + url;
newurl = newurl.replaceAll("\\$","\\\\\\$"); newurl = newurl.replaceAll("\\$","\\\\\\$");
m.appendReplacement(result, newurl); m.appendReplacement(result, newurl);
} else { } else {

Write Preview
Loading…
Cancel
Save