From 06f0315cf4c87f010b639424b30e8b62ebdbbf84 Mon Sep 17 00:00:00 2001 From: Manuel Fuhr Date: Fri, 28 Oct 2022 19:44:37 +0200 Subject: [PATCH] Remove broken spam/referrer handling --- .../src/main/java/btools/server/RouteServer.java | 16 ---------------- .../test/java/btools/server/RouteServerTest.java | 12 ------------ 2 files changed, 28 deletions(-) diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index 62c74e5..24abb13 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -81,7 +81,6 @@ public class RouteServer extends Thread implements Comparable { String agent = null; String encodings = null; String xff = null; // X-Forwarded-For - String referer = null; // more headers until first empty line for (; ; ) { @@ -108,12 +107,6 @@ public class RouteServer extends Thread implements Comparable { if (line.startsWith("x-forwarded-for: ")) { xff = line.substring("x-forwarded-for: ".length()); } - if (line.startsWith("Referer: ")) { - referer = line.substring("Referer: ".length()); - } - if (line.startsWith("Referrer: ")) { - referer = line.substring("Referrer: ".length()); - } } InetAddress ip = clientSocket.getInetAddress(); @@ -139,15 +132,6 @@ public class RouteServer extends Thread implements Comparable { } } - if (referer != null && referer.indexOf("brouter.de/brouter-web") >= 0) { - if (getline.indexOf("%7C") >= 0 && getline.indexOf("%2C") >= 0) { - writeHttpHeader(bw, HTTP_STATUS_FORBIDDEN); - bw.write("Spam? please stop"); - bw.flush(); - return; - } - } - if (getline.startsWith("GET /favicon.ico")) { writeHttpHeader(bw, HTTP_STATUS_NOT_FOUND); bw.flush(); diff --git a/brouter-server/src/test/java/btools/server/RouteServerTest.java b/brouter-server/src/test/java/btools/server/RouteServerTest.java index e3b1a12..7babe6a 100644 --- a/brouter-server/src/test/java/btools/server/RouteServerTest.java +++ b/brouter-server/src/test/java/btools/server/RouteServerTest.java @@ -4,7 +4,6 @@ package btools.server; import org.json.JSONObject; import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import java.io.File; @@ -102,15 +101,4 @@ public class RouteServerTest { Assert.assertEquals(HttpURLConnection.HTTP_NOT_FOUND, httpConnection.getResponseCode()); } - - @Test - @Ignore("Broken implementation (uppercase / lowercase issue)") - public void invalidReferrer() throws IOException { - URL requestUrl = new URL(baseUrl + "brouter/%7C/%2C"); - HttpURLConnection httpConnection = (HttpURLConnection) requestUrl.openConnection(); - httpConnection.setRequestProperty("Referer", "http://brouter.de/brouter-web/"); - httpConnection.connect(); - - Assert.assertEquals(HttpURLConnection.HTTP_FORBIDDEN, httpConnection.getResponseCode()); - } }