From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 17 Jan 2018 14:51:47 +0000 (+0100)
Subject: Renaming method is_local() to is_local_domain()
X-Git-Tag: 0.1.2~19
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=aa8a834242afa100ca78f6c076f02b3a8e351cf3;p=pixelpark%2Fadmin-tools.git

Renaming method is_local() to is_local_domain()
---

diff --git a/pp_lib/cfg_app.py b/pp_lib/cfg_app.py
index 59d068c..c22f120 100644
--- a/pp_lib/cfg_app.py
+++ b/pp_lib/cfg_app.py
@@ -42,7 +42,7 @@ from .global_version import __version__ as __global_version__
 
 from .errors import PpAppError
 
-from .common import pp, to_bool
+from .common import pp, to_bool, RE_DOT_AT_END
 
 from .merge import merge_structure
 
@@ -50,7 +50,7 @@ from .mailaddress import MailAddress
 
 from .app import PpApplication
 
-__version__ = '0.6.5'
+__version__ = '0.6.6'
 LOG = logging.getLogger(__name__)
 
 VALID_MAIL_METHODS = ('smtp', 'sendmail')
@@ -791,32 +791,34 @@ class PpConfigApplication(PpApplication):
         self.initialized = True
 
     # -------------------------------------------------------------------------
-    def is_local(self, domain):
+    def is_local_domain(self, domain):
+
+        zone_name = RE_DOT_AT_END.sub('', domain)
 
         if self.verbose > 1:
-            LOG.debug("Checking, whether {!r} is a not public zone.".format(domain))
+            LOG.debug("Checking, whether {!r} is a local zone.".format(zone_name))
 
-        tld = domain.split('.')[-1]
+        tld = zone_name.split('.')[-1]
         if tld in ('intern', 'internal', 'local', 'localdomain', 'lokal'):
-            LOG.debug("Zone {!r} has a local TLD {!r}.".format(domain, tld))
+            LOG.debug("Zone {!r} has a local TLD {!r}.".format(zone_name, tld))
             return True
 
-        zone_base = domain.split('.')[0]
+        zone_base = zone_name.split('.')[0]
         if zone_base in ('intern', 'internal', 'local', 'localdomain', 'lokal'):
-            LOG.debug("Zone {!r} has a local base {!r}.".format(domain, tld))
+            LOG.debug("Zone {!r} has a local base {!r}.".format(zone_name, tld))
             return True
 
         if tld != 'arpa':
             if self.verbose > 2:
-                LOG.debug("Zone {!r} has a public TLD {!r}.".format(domain, tld))
+                LOG.debug("Zone {!r} has a public TLD {!r}.".format(zone_name, tld))
                 return False
 
-        if domain.endswith('.in-addr.arpa'):
+        if zone_name.endswith('.in-addr.arpa'):
             tupels = []
-            for tupel in reversed(domain.replace('.in-addr.arpa', '').split('.')):
+            for tupel in reversed(zone_name.replace('.in-addr.arpa', '').split('.')):
                 tupels.append(tupel)
             if self.verbose > 2:
-                LOG.debug("Got IPv4 tupels from zone {!r}: {}".format(domain, pp(tupels)))
+                LOG.debug("Got IPv4 tupels from zone {!r}: {}".format(zone_name, pp(tupels)))
             bitmask = None
             if len(tupels) == 1:
                 bitmask = 8
@@ -831,23 +833,23 @@ class PpConfigApplication(PpApplication):
                 bitmask = 24
                 tupels.append('0')
             else:
-                LOG.warn("Could not interprete reverse IPv4 zone {!r}.".format(domain))
+                LOG.warn("Could not interprete reverse IPv4 zone {!r}.".format(zone_name))
                 return False
             net_address = '.'.join(tupels) + '/{}'.format(bitmask)
             if self.verbose > 2:
-                LOG.debug("Got IPv4 network address of zone {!r}: {!r}.".format(domain, net_address))
+                LOG.debug("Got IPv4 network address of zone {!r}: {!r}.".format(zone_name, net_address))
             network = ipaddress.ip_network(net_address)
             if network.is_global:
                 if self.verbose > 1:
                     LOG.debug("The network {!r} of zone {!r} is allocated for public networks.".format(
-                        net_address, domain))
+                        net_address, zone_name))
                 return False
             LOG.debug("The network {!r} of zone {!r} is allocated for local networks.".format(
-                net_address, domain))
+                net_address, zone_name))
             return True
 
         if self.verbose > 2:
-            LOG.debug("Zone {!r} seems to be a reverse zone for a public network.".format(domain))
+            LOG.debug("Zone {!r} seems to be a reverse zone for a public network.".format(zone_name))
         return False