From 74fa705e20454a5f415ccfa40bb93fd76930238a Mon Sep 17 00:00:00 2001 From: Ahti Kitsik Date: Sat, 29 Mar 2014 11:06:51 +0200 Subject: [PATCH] Bugfix for ufw to support "logging" properly: It's a separate parameter so updated docs and set it as mutually exclusive param. Also due to an array construction typo it was not working in any situation (ufw LOGLEVEL was passed to cmd instead of ufw logging LOGLEVEL). Also fixed doc and parameters parsing typo ("choises" should be "choices") --- system/ufw | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/system/ufw b/system/ufw index 73dc9e8974b..8496997b279 100644 --- a/system/ufw +++ b/system/ufw @@ -1,6 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +# (c) 2014, Ahti Kitsik # (c) 2014, Jarno Keskikangas # (c) 2013, Aleksey Ovcharenko # (c) 2013, James Martin @@ -27,7 +28,7 @@ short_description: Manage firewall with UFW description: - Manage firewall with UFW. version_added: 1.6 -author: Aleksey Ovcharenko, Jarno Keskikangas +author: Aleksey Ovcharenko, Jarno Keskikangas, Ahti Kitsik notes: - See C(man ufw) for more examples. requirements: @@ -65,12 +66,12 @@ options: description: - Add firewall rule required: false - choises: ['allow', 'deny', 'reject', 'limit'] + choices: ['allow', 'deny', 'reject', 'limit'] log: description: - Log new connections matched to this rule required: false - choises: ['yes', 'no'] + choices: ['yes', 'no'] from_ip: description: - Source IP address. @@ -111,7 +112,10 @@ options: EXAMPLES = ''' # Allow everything and enable UFW -ufw: state=enable policy=allow logging=on +ufw: state=enabled policy=allow + +# Set logging +ufw: logging=on # Sometimes it is desirable to let the sender know when traffic is # being denied, rather than simply ignoring it. In these cases, use @@ -163,8 +167,8 @@ def main(): argument_spec = dict( state = dict(default=None, choices=['enabled', 'disabled', 'reloaded', 'reset']), default = dict(default=None, aliases=['policy'], choices=['allow', 'deny', 'reject']), - logging = dict(default=None, choises=['on', 'off', 'low', 'medium', 'high', 'full']), - direction = dict(default=None, choises=['in', 'incoming', 'out', 'outgoing']), + logging = dict(default=None, choices=['on', 'off', 'low', 'medium', 'high', 'full']), + direction = dict(default=None, choices=['in', 'incoming', 'out', 'outgoing']), delete = dict(default=False, type='bool'), insert = dict(default=None), rule = dict(default=None, choices=['allow', 'deny', 'reject', 'limit']), @@ -178,13 +182,14 @@ def main(): app = dict(default=None, aliases=['name']) ), supports_check_mode = True, - mutually_exclusive = [['app', 'proto']] + mutually_exclusive = [['app', 'proto', 'logging']] ) cmds = [] def execute(cmd): cmd = ' '.join(map(itemgetter(-1), filter(itemgetter(0), cmd))) + cmds.append(cmd) (rc, out, err) = module.run_command(cmd) @@ -217,7 +222,7 @@ def main(): execute(cmd + [['-f'], [states[value]]]) elif command == 'logging': - execute(cmd + [[command, value]]) + execute(cmd + [[command], [value]]) elif command == 'default': execute(cmd + [[command], [value], [params['direction']]])