From 01d4aa60f0ada4eca19297fe5b2c91ba1aa1bdbc Mon Sep 17 00:00:00 2001
From: Karl Hasselbring <Karl Hasselbring>
Date: Tue, 8 Aug 2017 10:45:42 +0200
Subject: [PATCH] Noaccess und bot protection entfernt
---
app/Http/Controllers/MetaGerSearch.php | 5 -----
app/MetaGer.php | 29 -------------------------
resources/views/botProtection.blade.php | 20 -----------------
routes/web.php | 1 -
4 files changed, 55 deletions(-)
delete mode 100644 resources/views/botProtection.blade.php
diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index 9b89c79e7..3916f817e 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -30,11 +30,6 @@ class MetaGerSearch extends Controller
# Mit gelieferte Formulardaten parsen und abspeichern:
$metager->parseFormData($request);
- # Ein Schutz gegen bestimmte Bot-Angriffe, die uns passiert sind.
- if ($metager->doBotProtection($request->input('bot', ""))) {
- return redirect(LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), url("/noaccess", ['redirect' => base64_encode(url()->full())])));
- }
-
# Nach Spezialsuchen überprüfen:
$metager->checkSpecialSearches($request);
diff --git a/app/MetaGer.php b/app/MetaGer.php
index 1cb9f5b26..ca9726b8e 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -346,35 +346,6 @@ class MetaGer
}
}
- /**
- * Diese Funktion überprüft, ob wir einen erweiterten Check auf Bots machen müssen.
- * Z.B.: Wurden wir von einem Bot (dessen Anfragen aus dem Tor-Netzwerk kamen) mit tausenden
- * Anfragen zu Telefonnummern überschwemmt. Bei diesen werden wir nun eine erweiterte Überprüfung
- * durchführen.
- * Für den Anfang werden wir alle Anfragen, die unter diese Kriterien fallen, nur noch beantworten, wenn
- * JavaScript ausgeführt wird. (Mal schauen ob und wie lange dies ausreicht)
- */
- public function doBotProtection($bot)
- {
- $hash = md5(date('YmdHi'));
-
- $shouldCheck = false;
-
- foreach ($this->request->all() as $key => $value) {
- if (strpos($key, "amp;") !== false) {
- $shouldCheck = true;
- break;
- }
- }
-
- if ((preg_match("/^\d+$/s", $this->getEingabe()) || $shouldCheck) && $bot !== $hash) {
- return true;
- } else {
- return false;
- }
-
- }
-
public function combineResults($engines)
{
foreach ($engines as $engine) {
diff --git a/resources/views/botProtection.blade.php b/resources/views/botProtection.blade.php
deleted file mode 100644
index 2b9534f43..000000000
--- a/resources/views/botProtection.blade.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Access Denied</title>
- <link href="/favicon.ico" rel="icon" type="image/x-icon" />
- <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" />
- <meta content="width=device-width, initial-scale=1.0, user-scalable=no" name="viewport" />
- <meta content="{{ getmypid() }}" name="p" />
- <meta content="#wknekjnbweignipwep==" name="q" />
- <meta content="{{ $hash }}" name="pq" />
- <meta content="{{ $r }}" name="pqr" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link type="text/css" rel="stylesheet" href="/css/themes/{{ app('request')->input('theme', 'default') }}.css" />
- </head>
- <body>
- <h1 class="hidden">Your Access to this site has been denied. Please contact <a href="mailto:office@suma-ev.de">office@suma-ev.de</a> if this is not correct</h1>
- <script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script>
- <script type="text/javascript" src="{{ elixir('js/scriptResultPage.js') }}"></script>
- </body>
-</html>
diff --git a/routes/web.php b/routes/web.php
index 5b6b6ec34..a351d702d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -146,7 +146,6 @@ Route::group(
Route::get('settings', 'StartpageController@loadSettings');
Route::match(['get', 'post'], 'meta/meta.ger3', 'MetaGerSearch@search');
- Route::get('noaccess/{redirect}', 'MetaGerSearch@botProtection');
Route::get('meta/picture', 'Pictureproxy@get');
Route::get('clickstats', 'LogController@clicklog');
Route::get('pluginClose', 'LogController@pluginClose');
--
GitLab