Merge pull request #12 from jvdmr/develop

Release 2.2.0

Author: jvdmr

CHANGELOG

@@ -1,3 +1,8 @@
+Version 2.2.0
+-----------
+
+[20200208] jvdmr: Add DOSWhitelistUri config option
+
 Version 2.1.1
 -----------
 

Dockerfile

@@ -0,0 +1,16 @@
+FROM jvdmr/apache-dev:latest
+MAINTAINER @jvdmr
+
+EXPOSE 80
+
+ADD . /opt/jvdmr/apache2/mod_evasive
+WORKDIR /opt/jvdmr/apache2/mod_evasive
+
+RUN mv mod_evasive24.c mod_evasive.c && \
+    /usr/bin/apxs -i -a -c -l pcre2-8 mod_evasive.c && \
+		apache2ctl configtest
+
+RUN cp mod_evasive.conf /etc/apache2/conf-enabled/mod_evasive.conf
+RUN cp test/sites.conf /etc/apache2/sites-enabled/sites.conf
+
+CMD service apache2 start && bash

README.md

@@ -187,6 +187,7 @@ Optionally you can also add the following directives:
     DOSSystemCommand  "su - someuser -c '/sbin/... %s ...'"
     DOSLogDir   "/var/lock/mod_evasive"
     DOSWhitelist  127.0.0.1
+    DOSWhitelistUri  whitelist.*regex
     DOSHTTPStatus       429
 ```
 
@@ -352,12 +353,33 @@ blocked.
 To whitelist an address (or range) add an entry to the Apache configuration 
 in the following fashion:
 
-DOSWhitelist  127.0.0.1
-DOSWhitelist  127.0.0.*
+		DOSWhitelist  127.0.0.1
+		DOSWhitelist  127.0.0.*
 
 Wildcards can be used on up to the last 3 octets if necessary.  Multiple
 DOSWhitelist commands may be used in the configuration.
 
+You can add several entries.
+
+## Whitelisting URI's
+
+Specific URI's can be whitelisted to insure they are never denied.  Some
+clients may repeatedly request the same URI (due to bugs, or for other
+reasons), and subsequently be blocked from making other (valid) requests.  If
+you want, you may whitelist these URI's so these clients won't be blocked.
+Use with caution.
+
+To whitelist a URI add an entry to the Apache configuration 
+in the following fashion:
+
+		DOSWhitelistUri  /path/to/whitelisted/resource
+		DOSWhitelistUri  .*whitelisted.*
+
+`DOSWhitelistUri` supports perl-style regex and matches the whole request URI
+(everything between the domain name and the ?) against this regex.
+
+You can add several entries.
+
 # Tweaking Apache
 
 The keep-alive settings for your children should be reasonable enough to 

debian-build.sh

@@ -0,0 +1,3 @@
+cd dist
+cp /usr/lib/apache2/modules/mod_evasive.so libapache2-mod-evasive/usr/lib/apache2/modules/mod_evasive.so
+dpkg-deb --build libapache2-mod-evasive

dist/libapache2-mod-evasive.deb

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker build . -t mod_evasive || exit 1
+docker run -t -d -p 1980:80 mod_evasive
+./test/test.pl
+docker ps -a | grep mod_evasive | awk -F "  +" '{print $7}' | xargs docker stop
+docker run -t -v `pwd`/dist:/opt/jvdmr/apache2/mod_evasive/dist mod_evasive bash debian-build.sh

dist/libapache2-mod-evasive/usr/lib/apache2/modules/mod_evasive.so

@@ -0,0 +1,16 @@
+# vim:ts=4
+<IfModule mod_evasive.c>
+	DOSEnabled			true
+	DOSHashTableSize	3097
+	DOSPageCount		2
+	DOSSiteCount		50
+	DOSPageInterval		1
+	DOSSiteInterval		1
+	DOSBlockingPeriod	10
+#	DOSEmailNotify		[email protected]
+#	DOSSystemCommand	"su - someuser -c '/sbin/... %s ...'"
+#	DOSLogDir			"/var/lock/mod_evasive"
+#	DOSWhitelist		127.0.0.1
+#	DOSWhitelistUri		white.*regex
+#	DOSHTTPStatus		429
+</IfModule>