From d46176a3c3088282b971715cd7f66bf7f38cc46b Mon Sep 17 00:00:00 2001 From: ChiefGyk Date: Tue, 28 Jun 2016 13:30:38 -0400 Subject: [PATCH] forgot to switch branches before submitting commits --- conf/fail2ban/jail.local | 19 +++++++++++++++++++ conf/fail2ban/nginx-badbots.conf | 21 +++++++++++++++++++++ conf/fail2ban/nginx-http-auth.conf | 7 +++++++ conf/fail2ban/owncloud.conf | 8 ++++++++ setup/system.sh | 3 +++ 5 files changed, 58 insertions(+) create mode 100644 conf/fail2ban/nginx-badbots.conf create mode 100644 conf/fail2ban/nginx-http-auth.conf create mode 100644 conf/fail2ban/owncloud.conf diff --git a/conf/fail2ban/jail.local b/conf/fail2ban/jail.local index dc338803..4b50ac72 100644 --- a/conf/fail2ban/jail.local +++ b/conf/fail2ban/jail.local @@ -25,6 +25,25 @@ findtime = 30 maxretry = 20 logpath = /var/log/mail.log +[nginx] +enabled = true +filter = nginx-http-auth +port = http,https + +[nginx-badbots] +enabled = true +port = http,https +filter = nginx-badbots +logpath = /var/log/nginx/access.log +maxretry = 2 + +[owncloud] +enabled = true +filter = owncloud +logpath = STORAGE_ROOT/owncloud/owncloud.log +maxretry = 20 +findtime = 300 + [recidive] enabled = true maxretry = 10 diff --git a/conf/fail2ban/nginx-badbots.conf b/conf/fail2ban/nginx-badbots.conf new file mode 100644 index 00000000..b2ac9626 --- /dev/null +++ b/conf/fail2ban/nginx-badbots.conf @@ -0,0 +1,21 @@ +# Fail2Ban configuration file +# +# Regexp to catch known spambots and software alike. Please verify +# that it is your intent to block IPs which were driven by +# above mentioned bots. + + +[Definition] + +badbotscustom = EmailCollector|WebEMailExtrac|TrackBack/1\.02|sogou music spider +badbots = Atomic_Email_Hunter/4\.0|atSpider/1\.0|autoemailspider|bwh3_user_agent|China Local Browse 2\.6|ContactBot/0\.2|ContentSmartz|DataCha0s/2\.0|DBrowse 1\.4b|DBrowse 1\.4d|Demo Bot DOT 16b|Demo Bot Z 16b|DSurf15a 01|DSurf15a 71|DSurf15a 81|DSurf15a VA|EBrowse 1\.4b|Educate Search VxB|EmailSiphon|EmailSpider|EmailWolf 1\.00|ESurf15a 15|ExtractorPro|Franklin Locator 1\.8|FSurf15a 01|Full Web Bot 0416B|Full Web Bot 0516B|Full Web Bot 2816B|Guestbook Auto Submitter|Industry Program 1\.0\.x|ISC Systems iRc Search 2\.1|IUPUI Research Bot v 1\.9a|LARBIN-EXPERIMENTAL \(efp@gmx\.net\)|LetsCrawl\.com/1\.0 +http\://letscrawl\.com/|Lincoln State Web Browser|LMQueueBot/0\.2|LWP\:\:Simple/5\.803|Mac Finder 1\.0\.xx|MFC Foundation Class Library 4\.0|Microsoft URL Control - 6\.00\.8xxx|Missauga Locate 1\.0\.0|Missigua Locator 1\.9|Missouri College Browse|Mizzu Labs 2\.2|Mo College 1\.9|MVAClient|Mozilla/2\.0 \(compatible; NEWT ActiveX; Win32\)|Mozilla/3\.0 \(compatible; Indy Library\)|Mozilla/3\.0 \(compatible; scan4mail \(advanced version\) http\://www\.peterspages\.net/?scan4mail\)|Mozilla/4\.0 \(compatible; Advanced Email Extractor v2\.xx\)|Mozilla/4\.0 \(compatible; Iplexx Spider/1\.0 http\://www\.iplexx\.at\)|Mozilla/4\.0 \(compatible; MSIE 5\.0; Windows NT; DigExt; DTS Agent|Mozilla/4\.0 efp@gmx\.net|Mozilla/5\.0 \(Version\: xxxx Type\:xx\)|NameOfAgent \(CMS Spider\)|NASA Search 1\.0|Nsauditor/1\.x|PBrowse 1\.4b|PEval 1\.4b|Poirot|Port Huron Labs|Production Bot 0116B|Production Bot 2016B|Production Bot DOT 3016B|Program Shareware 1\.0\.2|PSurf15a 11|PSurf15a 51|PSurf15a VA|psycheclone|RSurf15a 41|RSurf15a 51|RSurf15a 81|searchbot admin@google\.com|ShablastBot 1\.0|snap\.com beta crawler v0|Snapbot/1\.0|Snapbot/1\.0 \(Snap Shots, +http\://www\.snap\.com\)|sogou develop spider|Sogou Orion spider/3\.0\(+http\://www\.sogou\.com/docs/help/webmasters\.htm#07\)|sogou spider|Sogou web spider/3\.0\(+http\://www\.sogou\.com/docs/help/webmasters\.htm#07\)|sohu agent|SSurf15a 11 |TSurf15a 11|Under the Rainbow 2\.2|User-Agent\: Mozilla/4\.0 \(compatible; MSIE 6\.0; Windows NT 5\.1\)|VadixBot|WebVulnCrawl\.unknown/1\.0 libwww-perl/5\.803|Wells Search II|WEP Search 00 + +failregex = ^ -.*"(GET|POST).*HTTP.*"(?:%(badbots)s|%(badbotscustom)s)"$ + +ignoreregex = + +# DEV Notes: +# List of bad bots fetched from http://www.user-agents.org +# Generated on Thu Nov 7 14:23:35 PST 2013 by files/gen_badbots. +# +# Author: Yaroslav Halchenko diff --git a/conf/fail2ban/nginx-http-auth.conf b/conf/fail2ban/nginx-http-auth.conf new file mode 100644 index 00000000..5f89b3a4 --- /dev/null +++ b/conf/fail2ban/nginx-http-auth.conf @@ -0,0 +1,7 @@ +[Definition] + + +failregex = ^ \[error\] \d+#\d+: \*\d+ user "\S+":? (password mismatch|was not found in ".*"), client: , server: \S+, request: "\S+ \S+ HTTP/\d+\.\d+", host: "\S+"\s*$ + ^ \[error\] \d+#\d+: \*\d+ no user/password was provided for basic authentication, client: , server: \S+, request: "\S+ \S+ HTTP/\d+\.\d+", host: "\S+"\s*$ + +ignoreregex = \ No newline at end of file diff --git a/conf/fail2ban/owncloud.conf b/conf/fail2ban/owncloud.conf new file mode 100644 index 00000000..c62763d0 --- /dev/null +++ b/conf/fail2ban/owncloud.conf @@ -0,0 +1,8 @@ +[INCLUDES] +before = common.conf + +[Definition] +_daemon = owncloud + +failregex = {"reqId":".*","remoteAddr":".*","app":"core","message":"Login failed: '.*' \(Remote IP: ''\)","level":2,"time":".*","method":".*} +ignoreregex = diff --git a/setup/system.sh b/setup/system.sh index cc152524..a88e37a6 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -296,5 +296,8 @@ cat conf/fail2ban/jail.local \ | sed "s/PUBLIC_IP/$PUBLIC_IP/g" \ > /etc/fail2ban/jail.local cp conf/fail2ban/dovecotimap.conf /etc/fail2ban/filter.d/dovecotimap.conf +cp conf/fail2ban/owncloud.conf /etc/fail2ban/filter.d/owncloud.conf +cp conf/fail2ban/nginx-http-auth.conf /etc/fail2ban/filter.d/nginx-http-auth.conf +cp conf/fail2ban/nginx-badbots.conf /etc/fail2ban/filter.d/nginx-badbots.conf restart_service fail2ban