From 19cf115fce3293d3cd011257760b95c74ea3f362 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 6 Aug 2017 17:07:25 +0200 Subject: [PATCH] recommit for updates in build 21 --- CHANGELOG.md | 20 ++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_fail2ban.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Afiles.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_fail2ban_3A_3Amain_3A_3Aservice.html | 2 +- .../cd_fail2ban_3A_3Aparams.html | 338 +++++++++++++++--- doc/top-level-namespace.html | 2 +- 12 files changed, 317 insertions(+), 61 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 192962c..399a14e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,26 @@ Changelog of Git Changelog.

No issue

+df59c3e85d59b32 Arne Teuke 2017-08-03 16:33:22 +

+

added more file controls

+ +

+1b33e2a2105237c Jenkins Server 2017-08-03 16:32:58 +

+

recommit for updates in build 12

+ +

+d33c85b30d815d8 Arne Teuke 2017-08-03 16:29:36 +

+

added more file controls

+ +

+e4cfd9c5663c0e2 Arne Teuke 2017-08-03 16:25:10 +

+

added more file controls

+ +

cb4b482e20b2be5 Arne Teuke 2017-08-03 14:56:00

fixed controls for main conf/local files

diff --git a/doc/_index.html b/doc/_index.html index a84ecc4..7d7f332 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -132,7 +132,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 026d4df..88f8336 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -251,7 +251,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index c844152..38cd58d 100644 --- a/doc/index.html +++ b/doc/index.html @@ -251,7 +251,7 @@ environments.

diff --git a/doc/puppet_classes/cd_fail2ban.html b/doc/puppet_classes/cd_fail2ban.html index 98cca7e..c09a4e7 100644 --- a/doc/puppet_classes/cd_fail2ban.html +++ b/doc/puppet_classes/cd_fail2ban.html @@ -139,7 +139,7 @@ class cd_fail2ban { diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html index e0aa07f..65525c6 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aconfig.html @@ -153,7 +153,7 @@ class cd_fail2ban::main::config ( diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html index 2d811b7..8066fa6 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Adirs.html @@ -350,7 +350,7 @@ class cd_fail2ban::main::dirs ( diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html index 97bae40..1c4a982 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Afiles.html @@ -286,7 +286,7 @@ class cd_fail2ban::main::files ( diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html index f22bf7c..a3c4a1e 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Ainstall.html @@ -159,7 +159,7 @@ class cd_fail2ban::main::install ( diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html index dae961d..a3ec0af 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Amain_3A_3Aservice.html @@ -166,7 +166,7 @@ class cd_fail2ban::main::service ( diff --git a/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html b/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html index 58144fa..f266486 100644 --- a/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html +++ b/doc/puppet_classes/cd_fail2ban_3A_3Aparams.html @@ -128,7 +128,9 @@ for more details.

with this program. If not, see www.gnu.org/licenses/. CRITICAL,ERROR,WARNING,NOTICE,INFO -and DEBUG.

+and DEBUG. + @param [string] Report ban via badips.com, and use +as blacklist

@@ -537,10 +539,10 @@ auto: will use the system locale setting

fn_enabled - (string) + (boolean) - (defaults to: 'false') + (defaults to: false) — @@ -714,6 +716,212 @@ href="https://tools.ietf.org/html/rfc7231#section-5.5.3">tools.ietf.org/html/rfc +
  • + + fn_banaction + + + (string) + + + (defaults to: 'iptables-multiport') + + + — +
    +

    Default banning action

    +
    + +
    • + +
  • + + fn_banaction_allports + + + (string) + + + (defaults to: 'iptables-allports') + + + — +
    +

    Default banning action

    +
    + +
    • + +
  • + + fn_action_ + + + (string) + + + (defaults to: '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]') + + + — +
    +

    ban only

    +
    + +
    • + +
  • + + fn_action_mw + + + (string) + + + (defaults to: '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"] + %(mta)s-whois[name=%(__name__)s, sender="%(sender)s", dest="%(destemail)s", protocol="%(protocol)s", chain="%(chain)s"]') + + + — +
    +

    ban & send an e-mail with whois report to the +destemail.

    +
    + +
    • + +
  • + + fn_action_mwl + + + (string) + + + (defaults to: '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"] + %(mta)s-whois-lines[name=%(__name__)s, sender="%(sender)s", dest="%(destemail)s", logpath=%(logpath)s, chain="%(chain)s"]') + + + — +
    +

    ban & send an e-mail with whois report and +relevant log lines

    +
    + +
    • + +
  • + + fn_action_xarf + + + (string) + + + (defaults to: '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"] + xarf-login-attack[service=%(__name__)s, sender="%(sender)s", logpath=%(logpath)s, port="%(port)s"]') + + + — +
    +

    ban & send a xarf e-mail to abuse contact of +IP address and include +relevant log lines.

    +
    + +
    • + +
  • + + fn_action_cf_mwl + + + (string) + + + (defaults to: 'cloudflare[cfuser="%(cfemail)s", cftoken="%(cfapikey)s"] + %(mta)s-whois-lines[name=%(__name__)s, sender="%(sender)s", dest="%(destemail)s", logpath=%(logpath)s, chain="%(chain)s"]') + + + — +
    +

    ban IP on CloudFlare & send an e-mail with +whois report and relevant +log lines.

    +
    + +
    • + +
  • + + fn_action_blocklist_de + + + (string) + + + (defaults to: 'blocklist_de[email="%(sender)s", service=%(filter)s, apikey="%(blocklist_de_apikey)s", agent="%(fail2ban_agent)s"]') + + + — +
    +

    Report block via blocklist.de fail2ban +reporting service API

    +
    + +
    • + +
  • + + fn_action_badips_report + + + (string) + + + (defaults to: 'badips[category="%(__name__)s", agent="%(fail2ban_agent)s"]') + + + — +
    +

    Report ban via badips.com

    + +

    (uses action.d/badips.conf for reporting only).

    +
    + +
    • + +
  • + + fn_default_action + + + (string) + + + (defaults to: 'action_') + + + — +
    +

    Choose default action.

    +
    + +
    • + +
  • + + fn_action_badips + + + (Any) + + + (defaults to: 'badips.py[category="%(__name__)s", banaction="%(banaction)s", agent="%(fail2ban_agent)s"]') + + +
    • + @@ -724,23 +932,6 @@ href="https://tools.ietf.org/html/rfc7231#section-5.5.3">tools.ietf.org/html/rfc 
     
 
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
 121
 122
 123
@@ -804,47 +995,92 @@ href="https://tools.ietf.org/html/rfc7231#section-5.5.3">tools.ietf.org/html/rfc
 181
 182
 183
-184
    +184 +185 +186 +187 +188 +189 +190 +191 +192 +193 +194 +195 +196 +197 +198 +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +210 +211 +212 +213 +214 +215 - 
    # File 'manifests/params.pp', line 104
+        
    # File 'manifests/params.pp', line 121
 
 class cd_fail2ban::params (
 
-$pkg_ensure             = 'latest',
+$pkg_ensure                 = 'latest',
 
-$fn_manage_config       = true,
-$fn_enable_service      = 'running',
+$fn_manage_config           = true,
+$fn_enable_service          = 'running',
 
 # fail2ban.conf/local
 
-$fn_loglevel            = 'INFO',
-$fn_logtarget           = 'SYSLOG',
-$fn_syslogsocket        = 'auto',
-$fn_socket              = '/var/run/fail2ban/fail2ban.sock',
-$fn_pidfile             = '/var/run/fail2ban/fail2ban.pid',
-$fn_dbfile              = '/var/lib/fail2ban/fail2ban.sqlite3',
-$fn_dbpurgeage          = '86400',
+$fn_loglevel                = 'INFO',
+$fn_logtarget               = 'SYSLOG',
+$fn_syslogsocket            = 'auto',
+$fn_socket                  = '/var/run/fail2ban/fail2ban.sock',
+$fn_pidfile                 = '/var/run/fail2ban/fail2ban.pid',
+$fn_dbfile                  = '/var/lib/fail2ban/fail2ban.sqlite3',
+$fn_dbpurgeage              = '86400',
 
 # jail.conf/local
-$fn_ignoreip            = '127.0.0.1/8',
-$fn_ignorecommand       = '',
-$fn_bantime             = '600',
-$fn_findtime            = '600',
-$fn_maxretry            = '5',
-$fn_backend             = 'auto',
-$fn_usedns              = 'warn',
-$fn_logencoding         = 'auto',
-$fn_enabled             = 'false',
-$fn_filter              = '%(__name__)s',
-$fn_destemail           = 'root@localhost',
-$fn_sender              = 'root@localhost',
-$fn_mta                 = 'sendmail',
-$fn_protocol            = 'tcp',
-$fn_chain               = 'INPUT',
-$fn_port                = '0:65535',
-$fn_fail2ban_agent      = 'Fail2Ban/%(fail2ban_version)s',
-
+$fn_ignoreip                = '127.0.0.1/8',
+$fn_ignorecommand           = '',
+$fn_bantime                 = '600',
+$fn_findtime                = '600',
+$fn_maxretry                = '5',
+$fn_backend                 = 'auto',
+$fn_usedns                  = 'warn',
+$fn_logencoding             = 'auto',
+$fn_enabled                 = false,
+$fn_filter                  = '%(__name__)s',
+$fn_destemail               = 'root@localhost',
+$fn_sender                  = 'root@localhost',
+$fn_mta                     = 'sendmail',
+$fn_protocol                = 'tcp',
+$fn_chain                   = 'INPUT',
+$fn_port                    = '0:65535',
+$fn_fail2ban_agent          = 'Fail2Ban/%(fail2ban_version)s',
+$fn_banaction               = 'iptables-multiport',
+$fn_banaction_allports      = 'iptables-allports',
+$fn_action_                 = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]',
+$fn_action_mw               = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
+                        %(mta)s-whois[name=%(__name__)s,  sender="%(sender)s", dest="%(destemail)s", protocol="%(protocol)s", chain="%(chain)s"]',
+$fn_action_mwl              = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
+                        %(mta)s-whois-lines[name=%(__name__)s, sender="%(sender)s", dest="%(destemail)s", logpath=%(logpath)s, chain="%(chain)s"]',
+$fn_action_xarf             = '%(banaction)s[name=%(__name__)s, bantime="%(bantime)s", port="%(port)s", protocol="%(protocol)s", chain="%(chain)s"]
+                        xarf-login-attack[service=%(__name__)s, sender="%(sender)s", logpath=%(logpath)s, port="%(port)s"]',
+$fn_action_cf_mwl           = 'cloudflare[cfuser="%(cfemail)s", cftoken="%(cfapikey)s"]
+                        %(mta)s-whois-lines[name=%(__name__)s, sender="%(sender)s", dest="%(destemail)s", logpath=%(logpath)s, chain="%(chain)s"]',
+$fn_action_blocklist_de     = 'blocklist_de[email="%(sender)s", service=%(filter)s, apikey="%(blocklist_de_apikey)s", agent="%(fail2ban_agent)s"]',
+$fn_action_badips           = 'badips.py[category="%(__name__)s", banaction="%(banaction)s", agent="%(fail2ban_agent)s"]',
+$fn_action_badips_report    = 'badips[category="%(__name__)s", agent="%(fail2ban_agent)s"]',
+$fn_default_action          = 'action_',
 
 ) {
 
@@ -897,7 +1133,7 @@ $fn_jail_local_erb      = 'cd_fail2ban/jail_local.erb'
 
 
       
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index 136fa21..f69125f 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@