From 0253b04b9ba7c3e4ef139bf352b7a57de823daaa Mon Sep 17 00:00:00 2001 From: Matt Schwager Date: Fri, 19 Oct 2012 13:37:49 -0400 Subject: Added CIDR notation to IP ACLs. Still need to test. --- src/lib/Bcfg2/Server/Plugins/Acl.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/lib/Bcfg2/Server/Plugins') diff --git a/src/lib/Bcfg2/Server/Plugins/Acl.py b/src/lib/Bcfg2/Server/Plugins/Acl.py index 71275de27..1f7b27b53 100644 --- a/src/lib/Bcfg2/Server/Plugins/Acl.py +++ b/src/lib/Bcfg2/Server/Plugins/Acl.py @@ -1,5 +1,6 @@ import os import logging +import netaddr import Bcfg2.Server.Plugin class AclFile(Bcfg2.Server.Plugin.XMLFileBacked): @@ -23,6 +24,7 @@ class AclFile(Bcfg2.Server.Plugin.XMLFileBacked): Bcfg2.Server.Plugin.XMLFileBacked.__init__(self, filename, fam=fam, should_monitor=True) self.core = core + self.cidr_ips = [] self.ips = [] self.logger = logging.getLogger(self.__class__.__name__) @@ -30,6 +32,14 @@ class AclFile(Bcfg2.Server.Plugin.XMLFileBacked): Bcfg2.Server.Plugin.XMLFileBacked.Index(self) for entry in self.xdata.xpath('//IPs'): [self.ips.append(i.get('name')) for i in entry.findall('IP')] + [self.cidr_ips.append(i.get('name')) for i in entry.findall('CIDR')] + + def check_acl(self, ip): + if ('*' in self.ips or + ip in self.ips or + IP(ip) in [CIDR(cidr_ip) for cidr_ip in self.cidr_ips]): + return True + return False class Acl(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.Connector): -- cgit v1.2.3-1-g7c22