From 81c40921853a8437fb83dd0c0ed1e864c123008b Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Fri, 28 Feb 2020 07:07:52 -0800 Subject: [PATCH 1/4] Add check_origin option to ZoneFileSource --- octodns/source/axfr.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/octodns/source/axfr.py b/octodns/source/axfr.py index be2acf5..70569d1 100644 --- a/octodns/source/axfr.py +++ b/octodns/source/axfr.py @@ -192,12 +192,17 @@ class ZoneFileSource(AxfrBaseSource): # The directory holding the zone files # Filenames should match zone name (eg. example.com.) directory: ./zonefiles + # Should sanity checks of the origin node be done + # (optional, default true) + check_origin: false ''' - def __init__(self, id, directory): + def __init__(self, id, directory, check_origin=True): self.log = logging.getLogger('ZoneFileSource[{}]'.format(id)) - self.log.debug('__init__: id=%s, directory=%s', id, directory) + self.log.debug('__init__: id=%s, directory=%s, check_origin=%s', id, + directory, check_origin) super(ZoneFileSource, self).__init__(id) self.directory = directory + self.check_origin = check_origin self._zone_records = {} @@ -206,7 +211,8 @@ class ZoneFileSource(AxfrBaseSource): if zone_name in zonefiles: try: z = dns.zone.from_file(join(self.directory, zone_name), - zone_name, relativize=False) + zone_name, relativize=False, + check_origin=self.check_origin) except DNSException as error: raise ZoneFileSourceLoadFailure(error) else: From cc09651b2f632bd058af0e123303b6327e89ed3d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 1 Mar 2020 08:15:27 +0000 Subject: [PATCH 2/4] Bump boto3 from 1.12.5 to 1.12.11 Bumps [boto3](https://github.com/boto/boto3) from 1.12.5 to 1.12.11. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/boto3/compare/1.12.5...1.12.11) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1636c8d..0a89227 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ PyYaml==5.3 azure-common==1.1.24 azure-mgmt-dns==3.0.0 -boto3==1.12.5 +boto3==1.12.11 botocore==1.15.5 dnspython==1.16.0 docutils==0.16 From 944b259ce3aecbd45bc579bf9e76ba2cddc95764 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 15:21:46 +0000 Subject: [PATCH 3/4] Bump botocore from 1.15.5 to 1.15.11 Bumps [botocore](https://github.com/boto/botocore) from 1.15.5 to 1.15.11. - [Release notes](https://github.com/boto/botocore/releases) - [Changelog](https://github.com/boto/botocore/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/boto/botocore/compare/1.15.5...1.15.11) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0a89227..92fd6e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ PyYaml==5.3 azure-common==1.1.24 azure-mgmt-dns==3.0.0 boto3==1.12.11 -botocore==1.15.5 +botocore==1.15.11 dnspython==1.16.0 docutils==0.16 dyn==1.8.1 From 0c87bc3561a129562311ac2c180a82f10951eb10 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2020 15:26:01 +0000 Subject: [PATCH 4/4] Bump jmespath from 0.9.4 to 0.9.5 Bumps [jmespath](https://github.com/jmespath/jmespath.py) from 0.9.4 to 0.9.5. - [Release notes](https://github.com/jmespath/jmespath.py/releases) - [Changelog](https://github.com/jmespath/jmespath.py/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/jmespath/jmespath.py/compare/0.9.4...0.9.5) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 92fd6e7..d77f298 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ futures==3.2.0; python_version < '3.0' google-cloud-core==1.3.0 google-cloud-dns==0.32.0 ipaddress==1.0.23 -jmespath==0.9.4 +jmespath==0.9.5 msrestazure==0.6.2 natsort==6.2.1 ns1-python==0.15.0