[apparmor] [patch 2/8] utils: convert raw rules classes to subclass from _Raw_Rule

[Seth Arnold]

On Thu, Aug 28, 2014 at 05:04:06PM -0700, Steve Beattie wrote:
> The patch that adds support for af_unix rules added a _Raw_Rule base
> class to inherit from in rules.py. This patch converts the rest of the
> raw rules classes to use the same.
> 
> Signed-off-by: Steve Beattie <steve at nxnw.org>

Acked-by: Seth Arnold <seth.arnold at canonical.com>

Thanks

> ---
>  utils/apparmor/rules.py |   65 +++++++-----------------------------------------
>  1 file changed, 10 insertions(+), 55 deletions(-)
> 
> Index: b/utils/apparmor/rules.py
> ===================================================================
> --- a/utils/apparmor/rules.py
> +++ b/utils/apparmor/rules.py
> @@ -56,65 +56,20 @@ class _Raw_Rule(object):
>                             'deny '  if self.deny else '',
>                             self.rule)
>  
> -class Raw_DBUS_Rule(object):
> -    audit = False
> -    deny = False
> -
> -    def __init__(self, rule):
> -        self.rule = rule
> -
> -    def serialize(self):
> -        return "%s%s%s" % ('audit ' if self.audit else '',
> -                           'deny '  if self.deny else '',
> -                           self.rule)
> -
> -class Raw_Mount_Rule(object):
> -    audit = False
> -    deny = False
> -
> -    def __init__(self, rule):
> -        self.rule = rule
> -
> -    def serialize(self):
> -        return "%s%s%s" % ('audit ' if self.audit else '',
> -                           'deny '  if self.deny else '',
> -                           self.rule)
> -
> -class Raw_Signal_Rule(object):
> -    audit = False
> -    deny = False
> -
> -    def __init__(self, rule):
> -        self.rule = rule
> -
> -    def serialize(self):
> -        return "%s%s%s" % ('audit ' if self.audit else '',
> -                           'deny '  if self.deny else '',
> -                           self.rule)
> -
> -class Raw_Ptrace_Rule(object):
> -    audit = False
> -    deny = False
> -
> -    def __init__(self, rule):
> -        self.rule = rule
> +class Raw_DBUS_Rule(_Raw_Rule):
> +    pass
>  
> -    def serialize(self):
> -        return "%s%s%s" % ('audit ' if self.audit else '',
> -                           'deny '  if self.deny else '',
> -                           self.rule)
> +class Raw_Mount_Rule(_Raw_Rule):
> +    pass
>  
> -class Raw_Pivot_Root_Rule(object):
> -    audit = False
> -    deny = False
> +class Raw_Signal_Rule(_Raw_Rule):
> +    pass
>  
> -    def __init__(self, rule):
> -        self.rule = rule
> +class Raw_Ptrace_Rule(_Raw_Rule):
> +    pass
>  
> -    def serialize(self):
> -        return "%s%s%s" % ('audit ' if self.audit else '',
> -                           'deny '  if self.deny else '',
> -                           self.rule)
> +class Raw_Pivot_Root_Rule(_Raw_Rule):
> +    pass
>  
>  class Raw_Unix_Rule(_Raw_Rule):
>      pass
> 
> 
> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20140903/c450a964/attachment-0001.pgp>