vikarti.anatra/nginx-ultimate-bad-bot-blocker
1
0
Fork 0
mirror of https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker.git synced 2025-09-03 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX Regex Formatting for Word Boundaries (6) PATCH from @funilrys

Browse source
This commit is contained in:
Mitchell Krog 2017-10-02 15:03:13 +02:00
parent 16215f4039
commit aae0d5378e
No known key found for this signature in database
GPG key ID: 2BB9A077C8DD6994
2 changed files with 132 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
.dev-tools/generate-regex-format-referrers.php
View file

@ -1,17 +1,20 @@
<?php <?php
/* Regex Formatting Generator Script for the Nginx Ultimate Bad Bot Blocker
* Adapted from Script Copyright (c) 2017 Stevie-Ray - https://github.com/Stevie-Ray /* Regex Formatting Generator Script for the Nginx Ultimate Bad Bot Blocker
* Adapted by: Mitchell Krog (mitchellkrog@gmail.com) - https://github.com/mitchellkrogza * Adapted from Script Copyright (c) 2017 Stevie-Ray - https://github.com/Stevie-Ray
* Repo Url: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker * Adapted by: Mitchell Krog (mitchellkrog@gmail.com) - https://github.com/mitchellkrogza
*/ * Repo Url: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
*/
namespace mitchellkrogza; namespace mitchellkrogza;
use Mso\IdnaConvert\IdnaConvert; use Mso\IdnaConvert\IdnaConvert;
class Generator class Generator
{ {
private $projectUrl = "https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker"; private $projectUrl = "https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker";
public function generateFiles() public function generateFiles()
{ {
date_default_timezone_set('Africa/Johannesburg'); date_default_timezone_set('Africa/Johannesburg');
@ -20,7 +23,6 @@ class Generator
$this->createNginx($lines); $this->createNginx($lines);
} }
/** /**
* @return array * @return array
*/ */
@ -42,7 +44,6 @@ class Generator
$IDN = new IdnaConvert(); $IDN = new IdnaConvert();
$line = $IDN->encode($line); $line = $IDN->encode($line);
} }
if (empty($line)) { if (empty($line)) {
@ -50,9 +51,12 @@ class Generator
} }
$lines[] = $line; $lines[] = $line;
} }
fclose($handle); fclose($handle);
$uniqueLines = array_unique($lines, SORT_STRING); $uniqueLines = array_unique($lines, SORT_STRING);
sort($uniqueLines, SORT_STRING); sort($uniqueLines, SORT_STRING);
if (is_writable($domainsFile)) { if (is_writable($domainsFile)) {
file_put_contents($domainsFile, implode("\n", $uniqueLines)); file_put_contents($domainsFile, implode("\n", $uniqueLines));
} else { } else {
@ -62,35 +66,37 @@ class Generator
return $lines; return $lines;
} }
/** /**
* Write to File Function * Write to File Function
* @param $filename * @param $filename
* @param $data * @param $data
*/ */
protected function writeToFile($filename, $data) protected function writeToFile($filename, $data)
{ {
$file = "/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/referrers-regex-format.txt"; $file = "/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/referrers-regex-format.txt";
$handle = fopen($file, 'w') or die('Cannot open file: '.$file); $handle = fopen($file, 'w') or die('Cannot open file: ' . $file);
fwrite($handle, $data); fwrite($handle, $data);
} }
/** /**
* @param string $date * @param string $date
* @param array $lines * @param array $lines
*/ */
public function createNginx(array $lines) public function createNginx(array $lines)
{ {
$file = "/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/referrers-regex-format.txt"; $file = "/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/referrers-regex-format.txt";
$data = ""; $data = "";
{
foreach ($lines as $line) { foreach ($lines as $line) {
//$data .= "\"~*" "\\" "b" . preg_quote($line) . "\\" "b" "\" \t1;\n"; //$data .= "\"~*" "\\" "b" . preg_quote($line) . "\\" "b" "\" \t1;\n";
//$data .= "\" . "~*\\" . 'b' . preg_quote($line) . "\" . '\\' . 'b' "\" "\t1;\n"; //$data .= "\" . "~*\\" . 'b' . preg_quote($line) . "\" . '\\' . 'b' "\" "\t1;\n";
$data .= "\" . "~\" . '\b' . preg_quote($line) . "\" . '\' . '\b' "\t1;\n"; //$data .= "\" . "~\\" . '\b' . preg_quote($line) . "\" . '\' . '\b' "\t1\n";
$data .= '\\' . '~\\' . "\\" . "b" . preg_quote($line) . "\\" . "b \t1\n";
} }
$this->writeToFile($file, $data); $this->writeToFile($file, $data);
} }
}
} }
$generator = new Generator(); $generator = new Generator();
$generator->generateFiles(); $generator->generateFiles();

108
regex.patch Normal file
View file

@ -0,0 +1,108 @@
diff --git .dev-tools/generate-regex-format-referrers.php .dev-tools/generate-regex-format-referrers.php
index d42c289..6f63814 100755
--- .dev-tools/generate-regex-format-referrers.php
+++ .dev-tools/generate-regex-format-referrers.php
@@ -1,17 +1,20 @@
<?php
- /* Regex Formatting Generator Script for the Nginx Ultimate Bad Bot Blocker
- * Adapted from Script Copyright (c) 2017 Stevie-Ray - https://github.com/Stevie-Ray
- * Adapted by: Mitchell Krog (mitchellkrog@gmail.com) - https://github.com/mitchellkrogza
- * Repo Url: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
- */
+
+/* Regex Formatting Generator Script for the Nginx Ultimate Bad Bot Blocker
+ * Adapted from Script Copyright (c) 2017 Stevie-Ray - https://github.com/Stevie-Ray
+ * Adapted by: Mitchell Krog (mitchellkrog@gmail.com) - https://github.com/mitchellkrogza
+ * Repo Url: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker
+ */
+
namespace mitchellkrogza;
use Mso\IdnaConvert\IdnaConvert;
class Generator
{
-
+
private $projectUrl = "https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker";
+
public function generateFiles()
{
date_default_timezone_set('Africa/Johannesburg');
@@ -20,7 +23,6 @@ class Generator
$this->createNginx($lines);
}
-
/**
* @return array
*/
@@ -42,7 +44,6 @@ class Generator
$IDN = new IdnaConvert();
$line = $IDN->encode($line);
-
}
if (empty($line)) {
@@ -50,9 +51,12 @@ class Generator
}
$lines[] = $line;
}
+
fclose($handle);
$uniqueLines = array_unique($lines, SORT_STRING);
sort($uniqueLines, SORT_STRING);
+
+
if (is_writable($domainsFile)) {
file_put_contents($domainsFile, implode("\n", $uniqueLines));
} else {
@@ -62,35 +66,37 @@ class Generator
return $lines;
}
- /**
+ /**
* Write to File Function
* @param $filename
* @param $data
*/
protected function writeToFile($filename, $data)
{
- $file = "/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/referrers-regex-format.txt";
- $handle = fopen($file, 'w') or die('Cannot open file: '.$file);
- fwrite($handle, $data);
+ $file = "/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/referrers-regex-format.txt";
+ $handle = fopen($file, 'w') or die('Cannot open file: ' . $file);
+ fwrite($handle, $data);
}
/**
* @param string $date
* @param array $lines
*/
- public function createNginx(array $lines)
+ public function createNginx(array $lines)
{
- $file = "/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/referrers-regex-format.txt";
+ $file = "/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/.dev-tools/referrers-regex-format.txt";
$data = "";
- {
+
foreach ($lines as $line) {
//$data .= "\"~*" "\\" "b" . preg_quote($line) . "\\" "b" "\" \t1;\n";
//$data .= "\" . "~*\\" . 'b' . preg_quote($line) . "\" . '\\' . 'b' "\" "\t1;\n";
- $data .= "\" . "~\" . '\b' . preg_quote($line) . "\" . '\' . '\b' "\t1;\n";
+ //$data .= "\" . "~\\" . '\b' . preg_quote($line) . "\" . '\' . '\b' "\t1\n";
+ $data .= '\\' . '~\\' . "\\" . "b" . preg_quote($line) . "\\" . "b \t1\n";
}
$this->writeToFile($file, $data);
- }
- }
+ }
+
}
+
$generator = new Generator();
$generator->generateFiles();