diff --git a/htroot/env/grafics/usecase_freeworld.png b/htroot/env/grafics/usecase_freeworld.png index b8c34c90c..bbfad827e 100644 Binary files a/htroot/env/grafics/usecase_freeworld.png and b/htroot/env/grafics/usecase_freeworld.png differ diff --git a/htroot/env/grafics/usecase_intranet.png b/htroot/env/grafics/usecase_intranet.png index 3e44e062f..7911ec278 100644 Binary files a/htroot/env/grafics/usecase_intranet.png and b/htroot/env/grafics/usecase_intranet.png differ diff --git a/htroot/env/grafics/usecase_webportal.png b/htroot/env/grafics/usecase_webportal.png index fc874bf74..d49e610c9 100644 Binary files a/htroot/env/grafics/usecase_webportal.png and b/htroot/env/grafics/usecase_webportal.png differ diff --git a/source/de/anomic/http/httpd.java b/source/de/anomic/http/httpd.java index 54f423a1b..705046028 100644 --- a/source/de/anomic/http/httpd.java +++ b/source/de/anomic/http/httpd.java @@ -198,7 +198,7 @@ public final class httpd implements serverHandler { this.clientIP = this.userAddress.getHostAddress(); if (this.userAddress.isAnyLocalAddress()) this.clientIP = "localhost"; if (this.clientIP.startsWith("0:0:0:0:0:0:0:1")) this.clientIP = "localhost"; - if (this.clientIP.equals("127.0.0.1")) this.clientIP = "localhost"; + if (this.clientIP.startsWith("127.")) this.clientIP = "localhost"; final String proxyClient = switchboard.getConfig("proxyClient", "*"); final String serverClient = switchboard.getConfig("serverClient", "*"); diff --git a/source/de/anomic/icap/icapd.java b/source/de/anomic/icap/icapd.java index 9c1f7f808..17021566c 100644 --- a/source/de/anomic/icap/icapd.java +++ b/source/de/anomic/icap/icapd.java @@ -115,7 +115,7 @@ public class icapd implements serverHandler { this.clientIP = this.userAddress.getHostAddress(); if (this.userAddress.isAnyLocalAddress()) this.clientIP = "localhost"; if (this.clientIP.startsWith("0:0:0:0:0:0:0:1")) this.clientIP = "localhost"; - if (this.clientIP.equals("127.0.0.1")) this.clientIP = "localhost"; + if (this.clientIP.startsWith("127.")) this.clientIP = "localhost"; } public String greeting() { diff --git a/source/de/anomic/server/serverCore.java b/source/de/anomic/server/serverCore.java index 25356234c..1099f5789 100644 --- a/source/de/anomic/server/serverCore.java +++ b/source/de/anomic/server/serverCore.java @@ -201,7 +201,7 @@ public final class serverCore extends serverAbstractBusyThread implements server } public static final boolean isLocalhost(String hostname) { - return hostname.equals("localhost") || hostname.equals("127.0.0.1") || hostname.startsWith("0:0:0:0:0:0:0:1"); + return hostname.equals("localhost") || hostname.startsWith("127.") || hostname.startsWith("0:0:0:0:0:0:0:1"); } // class initializer diff --git a/source/de/anomic/yacy/yacySeed.java b/source/de/anomic/yacy/yacySeed.java index 6ec6747b2..9a1393ea1 100644 --- a/source/de/anomic/yacy/yacySeed.java +++ b/source/de/anomic/yacy/yacySeed.java @@ -860,16 +860,16 @@ public class yacySeed { if (ip == null) return "IP is null"; if (ip.length() < 8) return "IP is too short: " + ip; if (!natLib.isProper(ip)) return "IP is not proper: " + ip; //this does not work with staticIP - if (ip.equals("localhost") || ip.equals("127.0.0.1") || (ip.startsWith("0:0:0:0:0:0:0:1"))) return "IP for localhost rejected"; + if (ip.equals("localhost") || ip.startsWith("127.") || (ip.startsWith("0:0:0:0:0:0:0:1"))) return "IP for localhost rejected"; // seedURL final String seedURL = this.dna.get(SEEDLIST); if (seedURL != null && seedURL.length() > 0) { - if (!seedURL.startsWith("http://") && !seedURL.startsWith("http://")) return "wrong protocol for seedURL"; + if (!seedURL.startsWith("http://") && !seedURL.startsWith("https://")) return "wrong protocol for seedURL"; try { URL url = new URL(seedURL); String host = url.getHost(); - if (host.equals("localhost") || host.equals("127.0.0.1") || (host.startsWith("0:0:0:0:0:0:0:1"))) return "seedURL in localhost rejected"; + if (host.equals("localhost") || host.startsWith("127.") || (host.startsWith("0:0:0:0:0:0:0:1"))) return "seedURL in localhost rejected"; } catch (MalformedURLException e) { return "seedURL malformed"; } diff --git a/source/de/anomic/yacy/yacyURL.java b/source/de/anomic/yacy/yacyURL.java index f754a5a87..a22e1eb6b 100644 --- a/source/de/anomic/yacy/yacyURL.java +++ b/source/de/anomic/yacy/yacyURL.java @@ -762,7 +762,7 @@ public class yacyURL implements Serializable { // checks for local/global IP range and local IP public boolean isLocal() { if (this.hash == null) { - if (this.host.startsWith("0:0:0:0:0:0:0:1") || this.host.equals("127.0.0.1") || this.host.equals("localhost")) return true; + if (this.host.startsWith("0:0:0:0:0:0:0:1") || this.host.startsWith("127.") || this.host.equals("localhost")) return true; synchronized (this) { this.hash = urlHashComputation(); }