aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrexxnor <rexxnor+gnunet@brief.li>2019-06-15 15:57:31 +0200
committerrexxnor <rexxnor+gnunet@brief.li>2019-06-15 15:57:31 +0200
commitdb545a42e300771283cac1f18c9c2626437eb657 (patch)
treee8ccedaa43c90dfca0a8b1aea6dd7ed4017ed61d
parent6e06ef043933082cef4a726c6fd597bfef61989d (diff)
downloadascension-db545a42e300771283cac1f18c9c2626437eb657.tar.gz
ascension-db545a42e300771283cac1f18c9c2626437eb657.zip
added privkey env if available
-rw-r--r--ascension-0.11.5.tar.gzbin11049 -> 11240 bytes
-rw-r--r--ascension/ascension.py79
-rw-r--r--deb_dist/ascension-0.11.5/ascension/ascension.py79
-rw-r--r--deb_dist/ascension-0.11.5/debian/changelog2
-rw-r--r--deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/control2
-rw-r--r--deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums4
-rw-r--r--deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gzbin162 -> 162 bytes
-rwxr-xr-xdeb_dist/ascension-0.11.5/debian/rules2
-rw-r--r--deb_dist/ascension_0.11.5-1.debian.tar.xzbin1668 -> 1668 bytes
-rw-r--r--deb_dist/ascension_0.11.5-1.dsc12
-rw-r--r--deb_dist/ascension_0.11.5-1_amd64.buildinfo16
-rw-r--r--deb_dist/ascension_0.11.5-1_amd64.changes32
-rw-r--r--deb_dist/ascension_0.11.5-1_source.buildinfo10
-rw-r--r--deb_dist/ascension_0.11.5-1_source.changes26
-rw-r--r--deb_dist/ascension_0.11.5.orig.tar.gzbin11049 -> 11240 bytes
-rw-r--r--deb_dist/python3-ascension_0.11.5-1_all.debbin11798 -> 11930 bytes
16 files changed, 159 insertions, 105 deletions
diff --git a/ascension-0.11.5.tar.gz b/ascension-0.11.5.tar.gz
index 39058ce..53dd59c 100644
--- a/ascension-0.11.5.tar.gz
+++ b/ascension-0.11.5.tar.gz
Binary files differ
diff --git a/ascension/ascension.py b/ascension/ascension.py
index 3485878..39d5963 100644
--- a/ascension/ascension.py
+++ b/ascension/ascension.py
@@ -45,6 +45,7 @@ Options:
45 45
46# imports 46# imports
47import logging 47import logging
48import os
48import queue 49import queue
49import re 50import re
50import socket 51import socket
@@ -111,13 +112,22 @@ class Ascender():
111 try: 112 try:
112 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND, 113 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND,
113 '-C', self.domain, 114 '-C', self.domain,
114 '-V'], 115 '-V', '-p'],
115 stdout=sp.PIPE, 116 stdout=sp.PIPE,
116 stderr=sp.DEVNULL) 117 stderr=sp.DEVNULL,
117 pkey = ret.stdout.decode().strip() 118 check=True)
118 self.subzonedict[self.domain] = (pkey, self.minimum) 119 keystring = ret.stdout.decode().strip()
120 pkey, _, privkey = keystring.split(" ")
121 self.subzonedict[self.domain] = (pkey, self.minimum, privkey)
119 logging.info("executed command: %s", " ".join(ret.args)) 122 logging.info("executed command: %s", " ".join(ret.args))
120 except sp.CalledProcessError: 123 except sp.CalledProcessError:
124 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND,
125 '-dqpe', self.domain],
126 stdout=sp.PIPE,
127 stderr=sp.DEVNULL)
128 keystring = ret.stdout.decode().strip()
129 pkey, _, privkey = keystring.split(" ")
130 self.subzonedict[self.domain] = (pkey, self.minimum, privkey)
121 logging.info("Zone %s already exists!", self.domain) 131 logging.info("Zone %s already exists!", self.domain)
122 132
123 def get_dns_zone_serial(self, 133 def get_dns_zone_serial(self,
@@ -192,6 +202,7 @@ class Ascender():
192 recordline = list() 202 recordline = list()
193 label = "" 203 label = ""
194 bestlabel = "" 204 bestlabel = ""
205 privkey = ""
195 domain = None 206 domain = None
196 207
197 labelrecords = taskqueue.get() 208 labelrecords = taskqueue.get()
@@ -215,8 +226,10 @@ class Ascender():
215 if fqdn in self.subzonedict.keys(): 226 if fqdn in self.subzonedict.keys():
216 label = "@" 227 label = "@"
217 domain = fqdn 228 domain = fqdn
229 _, _, privkey = self.subzonedict[domain]
218 elif subzone in self.subzonedict.keys(): 230 elif subzone in self.subzonedict.keys():
219 domain = subzone 231 domain = subzone
232 _, _, privkey = self.subzonedict[domain]
220 bestlabel = label 233 bestlabel = label
221 234
222 for rdataset in listofrdatasets: 235 for rdataset in listofrdatasets:
@@ -277,7 +290,8 @@ class Ascender():
277 self.rrsetcount += 1 290 self.rrsetcount += 1
278 self.add_recordline_to_gns(recordline, 291 self.add_recordline_to_gns(recordline,
279 domain, 292 domain,
280 label) 293 label,
294 privkey)
281 295
282 taskqueue.task_done() 296 taskqueue.task_done()
283 # End of worker 297 # End of worker
@@ -313,21 +327,33 @@ class Ascender():
313 @staticmethod 327 @staticmethod
314 def add_recordline_to_gns(recordline: list, 328 def add_recordline_to_gns(recordline: list,
315 zonename: str, 329 zonename: str,
316 label: str) -> None: 330 label: str,
331 privkey: str) -> None:
317 """ 332 """
318 Replaces records in zone or adds them if not 333 Replaces records in zone or adds them if not
319 :param recordline: records to replace as list in form 334 :param recordline: records to replace as list in form
320 ['-R', 'TTL TYPE FLAGS VALUE'] 335 ['-R', 'TTL TYPE FLAGS VALUE']
321 :param zonename: zonename of zone to add records to 336 :param zonename: zonename of zone to add records to
322 :param label: label under which to add the records 337 :param label: label under which to add the records
338 :param privkey: private key to give to GNUNET_NAMESTORE_COMMAND
323 """ 339 """
324 logging.info("trying to add %d records with name %s", 340 logging.info("trying to add %d records with name %s",
325 len(recordline)/2, label) 341 len(recordline)/2, label)
326 342
327 ret = sp.run([GNUNET_NAMESTORE_COMMAND, 343 if privkey:
328 '-z', zonename, 344 ret = sp.run([GNUNET_NAMESTORE_COMMAND,
329 '-n', str(label), 345 '-z', zonename,
330 ] + recordline) 346 '-n', str(label),
347 ] + recordline,
348 env=dict(os.environ, **{
349 "GNUNET_NAMESTORE_EGO_PRIVATE_KEY": privkey
350 }))
351 else:
352 ret = sp.run([GNUNET_NAMESTORE_COMMAND,
353 '-z', zonename,
354 '-n', str(label),
355 ] + recordline,
356 )
331 357
332 if ret.returncode != 0: 358 if ret.returncode != 0:
333 logging.warning("failed adding record with name %s", 359 logging.warning("failed adding record with name %s",
@@ -547,29 +573,31 @@ class Ascender():
547 logging.info("Added new SOA record") 573 logging.info("Added new SOA record")
548 574
549 @staticmethod 575 @staticmethod
550 def create_zone_and_get_pkey(zonestring: str) -> str: 576 def create_zone_and_get_pkey(zonestring: str) -> tuple:
551 """ 577 """
552 Creates the zone in zonestring and returns pkey 578 Creates the zone in zonestring and returns pkey
553 :param zonestring: The label name of the zone 579 :param zonestring: The label name of the zone
554 :returns: gnunet pkey of the zone 580 :returns: tuple of pubkey, privkey of created GNUnet zone
555 """ 581 """
556 try: 582 try:
557 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND, 583 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND,
558 '-C', zonestring, 584 '-C', zonestring,
559 '-V'], 585 '-V', '-p'],
560 stdout=sp.PIPE, 586 stdout=sp.PIPE,
561 stderr=sp.DEVNULL, 587 stderr=sp.DEVNULL,
562 check=True) 588 check=True)
563 logging.info("executed command: %s", " ".join(ret.args)) 589 logging.info("executed command: %s", " ".join(ret.args))
564 pkey_zone = ret.stdout.decode().strip() 590 keystring = ret.stdout.decode().strip()
591 pkey, _, privkey = keystring.split(" ")
565 except sp.CalledProcessError: 592 except sp.CalledProcessError:
566 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND, 593 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND,
567 '-dq', 594 '-dqp',
568 '-e', zonestring], 595 '-e', zonestring],
569 stdout=sp.PIPE) 596 stdout=sp.PIPE)
570 logging.info("executed command: %s", " ".join(ret.args)) 597 logging.info("executed command: %s", " ".join(ret.args))
571 pkey_zone = ret.stdout.decode().strip() 598 keystring = ret.stdout.decode().strip()
572 return pkey_zone 599 pkey, _, privkey = keystring.split(" ")
600 return (pkey, privkey)
573 601
574 @staticmethod 602 @staticmethod
575 def add_pkey_record_to_zone(pkey: str, 603 def add_pkey_record_to_zone(pkey: str,
@@ -616,13 +644,13 @@ class Ascender():
616 """ 644 """
617 # Extend Dictionary using GNS identities that already exist, 645 # Extend Dictionary using GNS identities that already exist,
618 # checking for conflicts with information in DNS 646 # checking for conflicts with information in DNS
619 ids = sp.run([GNUNET_ZONE_CREATION_COMMAND, '-d'], stdout=sp.PIPE) 647 ids = sp.run([GNUNET_ZONE_CREATION_COMMAND, '-d', '-p'], stdout=sp.PIPE)
620 domainlist = ''.join(col for col in ids.stdout.decode()).split('\n') 648 domainlist = ''.join(col for col in ids.stdout.decode()).split('\n')
621 # Filter for domains relevant for us, i.e. that end in self.domain 649 # Filter for domains relevant for us, i.e. that end in self.domain
622 altdomainlist = [e for e in domainlist if self.domain + " " in e] 650 altdomainlist = [e for e in domainlist if self.domain + " " in e]
623 for zone in altdomainlist: 651 for zone in altdomainlist:
624 zonename, _, pkey = zone.split(" ") 652 zonename, _, pkey, _, privkey = zone.split(" ")
625 self.subzonedict[zonename] = (pkey, self.minimum) 653 self.subzonedict[zonename] = (pkey, self.minimum, privkey)
626 654
627 # Create missing zones (and add to dict) for GNS zones that are NOT DNS zones 655 # Create missing zones (and add to dict) for GNS zones that are NOT DNS zones
628 # ("." is not a zone-cut in DNS, but always in GNS). 656 # ("." is not a zone-cut in DNS, but always in GNS).
@@ -631,11 +659,10 @@ class Ascender():
631 for i in range(1, len(subzones)): 659 for i in range(1, len(subzones)):
632 subdomain = ".".join(subzones[i:]) 660 subdomain = ".".join(subzones[i:])
633 zonename = "%s.%s" % (subdomain, self.domain) 661 zonename = "%s.%s" % (subdomain, self.domain)
634 ttl = self.minimum # new record, cannot use existing one, might want to use larger value 662 ttl = self.minimum # new record, cannot use existing one
635 if self.subzonedict.get(zonename) is None: 663 if self.subzonedict.get(zonename) is None:
636 pkey = self.create_zone_and_get_pkey(zonename) 664 pkey, privkey = self.create_zone_and_get_pkey(zonename)
637 self.subzonedict[zonename] = (pkey, ttl) 665 self.subzonedict[zonename] = (pkey, ttl, privkey)
638
639 666
640 # Check if a delegated zone is available in GNS as per NS record 667 # Check if a delegated zone is available in GNS as per NS record
641 # Adds NS records that contain "gns--pkey--" to dictionary 668 # Adds NS records that contain "gns--pkey--" to dictionary
@@ -664,7 +691,7 @@ class Ascender():
664 691
665 zone = "%s.%s" % (name, self.domain) 692 zone = "%s.%s" % (name, self.domain)
666 if not self.subzonedict.get(zone): 693 if not self.subzonedict.get(zone):
667 self.subzonedict[zone] = (zonepkey, ttl) 694 self.subzonedict[zone] = (zonepkey, ttl, None)
668 else: 695 else:
669 # This should be impossible!!? 696 # This should be impossible!!?
670 pkey_ttl = self.subzonedict[zone] 697 pkey_ttl = self.subzonedict[zone]
@@ -675,7 +702,7 @@ class Ascender():
675 702
676 # Generate PKEY records for all entries in subzonedict 703 # Generate PKEY records for all entries in subzonedict
677 for zone, pkeyttltuple in self.subzonedict.items(): 704 for zone, pkeyttltuple in self.subzonedict.items():
678 pkey, ttl = pkeyttltuple 705 pkey, ttl, _ = pkeyttltuple
679 domain = ".".join(zone.split('.')[1::]) 706 domain = ".".join(zone.split('.')[1::])
680 # This happens if root is reached 707 # This happens if root is reached
681 if domain == '': 708 if domain == '':
diff --git a/deb_dist/ascension-0.11.5/ascension/ascension.py b/deb_dist/ascension-0.11.5/ascension/ascension.py
index 3485878..39d5963 100644
--- a/deb_dist/ascension-0.11.5/ascension/ascension.py
+++ b/deb_dist/ascension-0.11.5/ascension/ascension.py
@@ -45,6 +45,7 @@ Options:
45 45
46# imports 46# imports
47import logging 47import logging
48import os
48import queue 49import queue
49import re 50import re
50import socket 51import socket
@@ -111,13 +112,22 @@ class Ascender():
111 try: 112 try:
112 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND, 113 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND,
113 '-C', self.domain, 114 '-C', self.domain,
114 '-V'], 115 '-V', '-p'],
115 stdout=sp.PIPE, 116 stdout=sp.PIPE,
116 stderr=sp.DEVNULL) 117 stderr=sp.DEVNULL,
117 pkey = ret.stdout.decode().strip() 118 check=True)
118 self.subzonedict[self.domain] = (pkey, self.minimum) 119 keystring = ret.stdout.decode().strip()
120 pkey, _, privkey = keystring.split(" ")
121 self.subzonedict[self.domain] = (pkey, self.minimum, privkey)
119 logging.info("executed command: %s", " ".join(ret.args)) 122 logging.info("executed command: %s", " ".join(ret.args))
120 except sp.CalledProcessError: 123 except sp.CalledProcessError:
124 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND,
125 '-dqpe', self.domain],
126 stdout=sp.PIPE,
127 stderr=sp.DEVNULL)
128 keystring = ret.stdout.decode().strip()
129 pkey, _, privkey = keystring.split(" ")
130 self.subzonedict[self.domain] = (pkey, self.minimum, privkey)
121 logging.info("Zone %s already exists!", self.domain) 131 logging.info("Zone %s already exists!", self.domain)
122 132
123 def get_dns_zone_serial(self, 133 def get_dns_zone_serial(self,
@@ -192,6 +202,7 @@ class Ascender():
192 recordline = list() 202 recordline = list()
193 label = "" 203 label = ""
194 bestlabel = "" 204 bestlabel = ""
205 privkey = ""
195 domain = None 206 domain = None
196 207
197 labelrecords = taskqueue.get() 208 labelrecords = taskqueue.get()
@@ -215,8 +226,10 @@ class Ascender():
215 if fqdn in self.subzonedict.keys(): 226 if fqdn in self.subzonedict.keys():
216 label = "@" 227 label = "@"
217 domain = fqdn 228 domain = fqdn
229 _, _, privkey = self.subzonedict[domain]
218 elif subzone in self.subzonedict.keys(): 230 elif subzone in self.subzonedict.keys():
219 domain = subzone 231 domain = subzone
232 _, _, privkey = self.subzonedict[domain]
220 bestlabel = label 233 bestlabel = label
221 234
222 for rdataset in listofrdatasets: 235 for rdataset in listofrdatasets:
@@ -277,7 +290,8 @@ class Ascender():
277 self.rrsetcount += 1 290 self.rrsetcount += 1
278 self.add_recordline_to_gns(recordline, 291 self.add_recordline_to_gns(recordline,
279 domain, 292 domain,
280 label) 293 label,
294 privkey)
281 295
282 taskqueue.task_done() 296 taskqueue.task_done()
283 # End of worker 297 # End of worker
@@ -313,21 +327,33 @@ class Ascender():
313 @staticmethod 327 @staticmethod
314 def add_recordline_to_gns(recordline: list, 328 def add_recordline_to_gns(recordline: list,
315 zonename: str, 329 zonename: str,
316 label: str) -> None: 330 label: str,
331 privkey: str) -> None:
317 """ 332 """
318 Replaces records in zone or adds them if not 333 Replaces records in zone or adds them if not
319 :param recordline: records to replace as list in form 334 :param recordline: records to replace as list in form
320 ['-R', 'TTL TYPE FLAGS VALUE'] 335 ['-R', 'TTL TYPE FLAGS VALUE']
321 :param zonename: zonename of zone to add records to 336 :param zonename: zonename of zone to add records to
322 :param label: label under which to add the records 337 :param label: label under which to add the records
338 :param privkey: private key to give to GNUNET_NAMESTORE_COMMAND
323 """ 339 """
324 logging.info("trying to add %d records with name %s", 340 logging.info("trying to add %d records with name %s",
325 len(recordline)/2, label) 341 len(recordline)/2, label)
326 342
327 ret = sp.run([GNUNET_NAMESTORE_COMMAND, 343 if privkey:
328 '-z', zonename, 344 ret = sp.run([GNUNET_NAMESTORE_COMMAND,
329 '-n', str(label), 345 '-z', zonename,
330 ] + recordline) 346 '-n', str(label),
347 ] + recordline,
348 env=dict(os.environ, **{
349 "GNUNET_NAMESTORE_EGO_PRIVATE_KEY": privkey
350 }))
351 else:
352 ret = sp.run([GNUNET_NAMESTORE_COMMAND,
353 '-z', zonename,
354 '-n', str(label),
355 ] + recordline,
356 )
331 357
332 if ret.returncode != 0: 358 if ret.returncode != 0:
333 logging.warning("failed adding record with name %s", 359 logging.warning("failed adding record with name %s",
@@ -547,29 +573,31 @@ class Ascender():
547 logging.info("Added new SOA record") 573 logging.info("Added new SOA record")
548 574
549 @staticmethod 575 @staticmethod
550 def create_zone_and_get_pkey(zonestring: str) -> str: 576 def create_zone_and_get_pkey(zonestring: str) -> tuple:
551 """ 577 """
552 Creates the zone in zonestring and returns pkey 578 Creates the zone in zonestring and returns pkey
553 :param zonestring: The label name of the zone 579 :param zonestring: The label name of the zone
554 :returns: gnunet pkey of the zone 580 :returns: tuple of pubkey, privkey of created GNUnet zone
555 """ 581 """
556 try: 582 try:
557 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND, 583 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND,
558 '-C', zonestring, 584 '-C', zonestring,
559 '-V'], 585 '-V', '-p'],
560 stdout=sp.PIPE, 586 stdout=sp.PIPE,
561 stderr=sp.DEVNULL, 587 stderr=sp.DEVNULL,
562 check=True) 588 check=True)
563 logging.info("executed command: %s", " ".join(ret.args)) 589 logging.info("executed command: %s", " ".join(ret.args))
564 pkey_zone = ret.stdout.decode().strip() 590 keystring = ret.stdout.decode().strip()
591 pkey, _, privkey = keystring.split(" ")
565 except sp.CalledProcessError: 592 except sp.CalledProcessError:
566 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND, 593 ret = sp.run([GNUNET_ZONE_CREATION_COMMAND,
567 '-dq', 594 '-dqp',
568 '-e', zonestring], 595 '-e', zonestring],
569 stdout=sp.PIPE) 596 stdout=sp.PIPE)
570 logging.info("executed command: %s", " ".join(ret.args)) 597 logging.info("executed command: %s", " ".join(ret.args))
571 pkey_zone = ret.stdout.decode().strip() 598 keystring = ret.stdout.decode().strip()
572 return pkey_zone 599 pkey, _, privkey = keystring.split(" ")
600 return (pkey, privkey)
573 601
574 @staticmethod 602 @staticmethod
575 def add_pkey_record_to_zone(pkey: str, 603 def add_pkey_record_to_zone(pkey: str,
@@ -616,13 +644,13 @@ class Ascender():
616 """ 644 """
617 # Extend Dictionary using GNS identities that already exist, 645 # Extend Dictionary using GNS identities that already exist,
618 # checking for conflicts with information in DNS 646 # checking for conflicts with information in DNS
619 ids = sp.run([GNUNET_ZONE_CREATION_COMMAND, '-d'], stdout=sp.PIPE) 647 ids = sp.run([GNUNET_ZONE_CREATION_COMMAND, '-d', '-p'], stdout=sp.PIPE)
620 domainlist = ''.join(col for col in ids.stdout.decode()).split('\n') 648 domainlist = ''.join(col for col in ids.stdout.decode()).split('\n')
621 # Filter for domains relevant for us, i.e. that end in self.domain 649 # Filter for domains relevant for us, i.e. that end in self.domain
622 altdomainlist = [e for e in domainlist if self.domain + " " in e] 650 altdomainlist = [e for e in domainlist if self.domain + " " in e]
623 for zone in altdomainlist: 651 for zone in altdomainlist:
624 zonename, _, pkey = zone.split(" ") 652 zonename, _, pkey, _, privkey = zone.split(" ")
625 self.subzonedict[zonename] = (pkey, self.minimum) 653 self.subzonedict[zonename] = (pkey, self.minimum, privkey)
626 654
627 # Create missing zones (and add to dict) for GNS zones that are NOT DNS zones 655 # Create missing zones (and add to dict) for GNS zones that are NOT DNS zones
628 # ("." is not a zone-cut in DNS, but always in GNS). 656 # ("." is not a zone-cut in DNS, but always in GNS).
@@ -631,11 +659,10 @@ class Ascender():
631 for i in range(1, len(subzones)): 659 for i in range(1, len(subzones)):
632 subdomain = ".".join(subzones[i:]) 660 subdomain = ".".join(subzones[i:])
633 zonename = "%s.%s" % (subdomain, self.domain) 661 zonename = "%s.%s" % (subdomain, self.domain)
634 ttl = self.minimum # new record, cannot use existing one, might want to use larger value 662 ttl = self.minimum # new record, cannot use existing one
635 if self.subzonedict.get(zonename) is None: 663 if self.subzonedict.get(zonename) is None:
636 pkey = self.create_zone_and_get_pkey(zonename) 664 pkey, privkey = self.create_zone_and_get_pkey(zonename)
637 self.subzonedict[zonename] = (pkey, ttl) 665 self.subzonedict[zonename] = (pkey, ttl, privkey)
638
639 666
640 # Check if a delegated zone is available in GNS as per NS record 667 # Check if a delegated zone is available in GNS as per NS record
641 # Adds NS records that contain "gns--pkey--" to dictionary 668 # Adds NS records that contain "gns--pkey--" to dictionary
@@ -664,7 +691,7 @@ class Ascender():
664 691
665 zone = "%s.%s" % (name, self.domain) 692 zone = "%s.%s" % (name, self.domain)
666 if not self.subzonedict.get(zone): 693 if not self.subzonedict.get(zone):
667 self.subzonedict[zone] = (zonepkey, ttl) 694 self.subzonedict[zone] = (zonepkey, ttl, None)
668 else: 695 else:
669 # This should be impossible!!? 696 # This should be impossible!!?
670 pkey_ttl = self.subzonedict[zone] 697 pkey_ttl = self.subzonedict[zone]
@@ -675,7 +702,7 @@ class Ascender():
675 702
676 # Generate PKEY records for all entries in subzonedict 703 # Generate PKEY records for all entries in subzonedict
677 for zone, pkeyttltuple in self.subzonedict.items(): 704 for zone, pkeyttltuple in self.subzonedict.items():
678 pkey, ttl = pkeyttltuple 705 pkey, ttl, _ = pkeyttltuple
679 domain = ".".join(zone.split('.')[1::]) 706 domain = ".".join(zone.split('.')[1::])
680 # This happens if root is reached 707 # This happens if root is reached
681 if domain == '': 708 if domain == '':
diff --git a/deb_dist/ascension-0.11.5/debian/changelog b/deb_dist/ascension-0.11.5/debian/changelog
index e8054e7..822ac4d 100644
--- a/deb_dist/ascension-0.11.5/debian/changelog
+++ b/deb_dist/ascension-0.11.5/debian/changelog
@@ -2,4 +2,4 @@ ascension (0.11.5-1) unstable; urgency=low
2 2
3 * source package automatically created by stdeb 0.8.5 3 * source package automatically created by stdeb 0.8.5
4 4
5 -- rexxnor <rexxnor+gnunet@brief.li> Thu, 13 Jun 2019 10:41:28 +0000 5 -- rexxnor <rexxnor+gnunet@brief.li> Sat, 15 Jun 2019 13:53:04 +0000
diff --git a/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/control b/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/control
index 35dcbaf..3c73350 100644
--- a/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/control
+++ b/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/control
@@ -3,7 +3,7 @@ Source: ascension
3Version: 0.11.5-1 3Version: 0.11.5-1
4Architecture: all 4Architecture: all
5Maintainer: rexxnor <rexxnor+gnunet@brief.li> 5Maintainer: rexxnor <rexxnor+gnunet@brief.li>
6Installed-Size: 61 6Installed-Size: 63
7Depends: python3-coverage, python3-dnspython, python3-docopt, python3-mock, python3-pbr, python3-six, python3:any (>= 3.3.2-2~) 7Depends: python3-coverage, python3-dnspython, python3-docopt, python3-mock, python3-pbr, python3-six, python3:any (>= 3.3.2-2~)
8Section: python 8Section: python
9Priority: optional 9Priority: optional
diff --git a/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums b/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums
index d68c3e9..afc7613 100644
--- a/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums
+++ b/deb_dist/ascension-0.11.5/debian/python3-ascension/DEBIAN/md5sums
@@ -5,6 +5,6 @@ b9326cd655bd4569eaeb5f029ae298d4 usr/lib/python3/dist-packages/ascension-0.11.5
5d41d8cd98f00b204e9800998ecf8427e usr/lib/python3/dist-packages/ascension-0.11.5.egg-info/requires.txt 5d41d8cd98f00b204e9800998ecf8427e usr/lib/python3/dist-packages/ascension-0.11.5.egg-info/requires.txt
6e616e4373e7b199db038fd8e938a3188 usr/lib/python3/dist-packages/ascension-0.11.5.egg-info/top_level.txt 6e616e4373e7b199db038fd8e938a3188 usr/lib/python3/dist-packages/ascension-0.11.5.egg-info/top_level.txt
7d41d8cd98f00b204e9800998ecf8427e usr/lib/python3/dist-packages/ascension/__init__.py 7d41d8cd98f00b204e9800998ecf8427e usr/lib/python3/dist-packages/ascension/__init__.py
809bacc1c6dadf140cb8ea0c184b8277a usr/lib/python3/dist-packages/ascension/ascension.py 8b7d5d3701c79064cef49f7c67b05aed5 usr/lib/python3/dist-packages/ascension/ascension.py
939df66d80ba29af1e364404d9f28012c usr/man/man1/ascension.1 939df66d80ba29af1e364404d9f28012c usr/man/man1/ascension.1
10148bfb8f45db94a92ddaf7793c49fa47 usr/share/doc/python3-ascension/changelog.Debian.gz 10b943f447573826719fe8c0e341a4b8ac usr/share/doc/python3-ascension/changelog.Debian.gz
diff --git a/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz b/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz
index e76d10c..186017b 100644
--- a/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz
+++ b/deb_dist/ascension-0.11.5/debian/python3-ascension/usr/share/doc/python3-ascension/changelog.Debian.gz
Binary files differ
diff --git a/deb_dist/ascension-0.11.5/debian/rules b/deb_dist/ascension-0.11.5/debian/rules
index 40bb8b5..dc5e2a9 100755
--- a/deb_dist/ascension-0.11.5/debian/rules
+++ b/deb_dist/ascension-0.11.5/debian/rules
@@ -1,7 +1,7 @@
1#!/usr/bin/make -f 1#!/usr/bin/make -f
2 2
3# This file was automatically generated by stdeb 0.8.5 at 3# This file was automatically generated by stdeb 0.8.5 at
4# Thu, 13 Jun 2019 10:41:28 +0000 4# Sat, 15 Jun 2019 13:53:04 +0000
5 5
6%: 6%:
7 dh $@ --with python3 --buildsystem=python_distutils 7 dh $@ --with python3 --buildsystem=python_distutils
diff --git a/deb_dist/ascension_0.11.5-1.debian.tar.xz b/deb_dist/ascension_0.11.5-1.debian.tar.xz
index c62d42f..53cdd4c 100644
--- a/deb_dist/ascension_0.11.5-1.debian.tar.xz
+++ b/deb_dist/ascension_0.11.5-1.debian.tar.xz
Binary files differ
diff --git a/deb_dist/ascension_0.11.5-1.dsc b/deb_dist/ascension_0.11.5-1.dsc
index ea53c27..020bf84 100644
--- a/deb_dist/ascension_0.11.5-1.dsc
+++ b/deb_dist/ascension_0.11.5-1.dsc
@@ -9,11 +9,11 @@ Build-Depends: python3-setuptools, python3-all, debhelper (>= 7.4.3)
9Package-List: 9Package-List:
10 python3-ascension deb python optional arch=all 10 python3-ascension deb python optional arch=all
11Checksums-Sha1: 11Checksums-Sha1:
12 b4d60725c966881ebc25aab999939301ef0b8556 11049 ascension_0.11.5.orig.tar.gz 12 8f3149f126141b96652799d1603bfa542ee8d428 11240 ascension_0.11.5.orig.tar.gz
13 5326ef48867107f2779afa3885903259335023ea 1668 ascension_0.11.5-1.debian.tar.xz 13 7a3e5b65230bc1383ab891542efe654c325b13c4 1668 ascension_0.11.5-1.debian.tar.xz
14Checksums-Sha256: 14Checksums-Sha256:
15 b79207076b1b1545e490e7d6867b131e89745ccadc9b911a16e24ac08fe8de08 11049 ascension_0.11.5.orig.tar.gz 15 2e874e3159e02ad82a40f2d32173185a546fdcb1a349e048203b237bf9a5789b 11240 ascension_0.11.5.orig.tar.gz
16 b735f1b11f5a9b9682a89b8a94bcf75e99fe62238029f0a75c3fffdb1336302a 1668 ascension_0.11.5-1.debian.tar.xz 16 ce014ac1c00c226a5613b866bf6d3e11ecf81ecd0f99f408bca0fc84aafdfcac 1668 ascension_0.11.5-1.debian.tar.xz
17Files: 17Files:
18 9bffa31fb1a5a0f087b7b1d395c403a0 11049 ascension_0.11.5.orig.tar.gz 18 da11eee3599ed1d294dbbfdae6a10b4a 11240 ascension_0.11.5.orig.tar.gz
19 657a74f5293d1990f6de645a0fa1140e 1668 ascension_0.11.5-1.debian.tar.xz 19 4ae84d4412deb7d897e0ce0eb878b645 1668 ascension_0.11.5-1.debian.tar.xz
diff --git a/deb_dist/ascension_0.11.5-1_amd64.buildinfo b/deb_dist/ascension_0.11.5-1_amd64.buildinfo
index a518fff..665a48c 100644
--- a/deb_dist/ascension_0.11.5-1_amd64.buildinfo
+++ b/deb_dist/ascension_0.11.5-1_amd64.buildinfo
@@ -4,17 +4,17 @@ Binary: python3-ascension
4Architecture: all source 4Architecture: all source
5Version: 0.11.5-1 5Version: 0.11.5-1
6Checksums-Md5: 6Checksums-Md5:
7 69f931f2c791ac8d334c3af07e7aad48 846 ascension_0.11.5-1.dsc 7 4322f7063bf7653292dd9480de0064f7 846 ascension_0.11.5-1.dsc
8 8bdedfa3e1a5e16283e50eaddf5a2051 11798 python3-ascension_0.11.5-1_all.deb 8 aabbef1e2b653e868e7973bd704f515e 11930 python3-ascension_0.11.5-1_all.deb
9Checksums-Sha1: 9Checksums-Sha1:
10 c7c18e4ada8c3fe10fac9eeeb35f8adc5115f5be 846 ascension_0.11.5-1.dsc 10 2c440495382630819d1e0c0bea84b07f43f8c68b 846 ascension_0.11.5-1.dsc
11 b912ed9f8b2707d9b1fa28c73ebf8de5338399e4 11798 python3-ascension_0.11.5-1_all.deb 11 2acc62d1e6ce3f916ea51cb6f8811eb571d4300f 11930 python3-ascension_0.11.5-1_all.deb
12Checksums-Sha256: 12Checksums-Sha256:
13 271d7863c61c0a1dbb18890ef535b8d1d559333207dfd4a5d04546289cb279ad 846 ascension_0.11.5-1.dsc 13 0a56495f697cf6d09a7a3dd0e38f4b8741e0452f152363ed2b062292256b52e7 846 ascension_0.11.5-1.dsc
14 44237bb83bdfa24f98fa21453fe5450a2ddb02267a26b6698c7b15b8aaf5183d 11798 python3-ascension_0.11.5-1_all.deb 14 b1aa44aebfc7c9faf4f5036a9cd9d510bb2673061c87336f17ef3fb922f9994b 11930 python3-ascension_0.11.5-1_all.deb
15Build-Origin: Debian 15Build-Origin: Debian
16Build-Architecture: amd64 16Build-Architecture: amd64
17Build-Date: Thu, 13 Jun 2019 10:41:53 +0000 17Build-Date: Sat, 15 Jun 2019 13:53:52 +0000
18Installed-Build-Depends: 18Installed-Build-Depends:
19 autoconf (= 2.69-10), 19 autoconf (= 2.69-10),
20 automake (= 1:1.15-6), 20 automake (= 1:1.15-6),
@@ -177,4 +177,4 @@ Installed-Build-Depends:
177 zlib1g (= 1:1.2.8.dfsg-5) 177 zlib1g (= 1:1.2.8.dfsg-5)
178Environment: 178Environment:
179 DEB_BUILD_OPTIONS="parallel=2" 179 DEB_BUILD_OPTIONS="parallel=2"
180 SOURCE_DATE_EPOCH="1560422488" 180 SOURCE_DATE_EPOCH="1560606784"
diff --git a/deb_dist/ascension_0.11.5-1_amd64.changes b/deb_dist/ascension_0.11.5-1_amd64.changes
index 0beec50..4afe597 100644
--- a/deb_dist/ascension_0.11.5-1_amd64.changes
+++ b/deb_dist/ascension_0.11.5-1_amd64.changes
@@ -1,5 +1,5 @@
1Format: 1.8 1Format: 1.8
2Date: Thu, 13 Jun 2019 10:41:28 +0000 2Date: Sat, 15 Jun 2019 13:53:04 +0000
3Source: ascension 3Source: ascension
4Binary: python3-ascension 4Binary: python3-ascension
5Architecture: source all 5Architecture: source all
@@ -15,20 +15,20 @@ Changes:
15 . 15 .
16 * source package automatically created by stdeb 0.8.5 16 * source package automatically created by stdeb 0.8.5
17Checksums-Sha1: 17Checksums-Sha1:
18 c7c18e4ada8c3fe10fac9eeeb35f8adc5115f5be 846 ascension_0.11.5-1.dsc 18 2c440495382630819d1e0c0bea84b07f43f8c68b 846 ascension_0.11.5-1.dsc
19 b4d60725c966881ebc25aab999939301ef0b8556 11049 ascension_0.11.5.orig.tar.gz 19 8f3149f126141b96652799d1603bfa542ee8d428 11240 ascension_0.11.5.orig.tar.gz
20 5326ef48867107f2779afa3885903259335023ea 1668 ascension_0.11.5-1.debian.tar.xz 20 7a3e5b65230bc1383ab891542efe654c325b13c4 1668 ascension_0.11.5-1.debian.tar.xz
21 5b5d2087a130d6d1996be9d367b6863db4b67af6 5432 ascension_0.11.5-1_amd64.buildinfo 21 09eeffdd7123b858875ae1e9af3bd262b57a4aa8 5432 ascension_0.11.5-1_amd64.buildinfo
22 b912ed9f8b2707d9b1fa28c73ebf8de5338399e4 11798 python3-ascension_0.11.5-1_all.deb 22 2acc62d1e6ce3f916ea51cb6f8811eb571d4300f 11930 python3-ascension_0.11.5-1_all.deb
23Checksums-Sha256: 23Checksums-Sha256:
24 271d7863c61c0a1dbb18890ef535b8d1d559333207dfd4a5d04546289cb279ad 846 ascension_0.11.5-1.dsc 24 0a56495f697cf6d09a7a3dd0e38f4b8741e0452f152363ed2b062292256b52e7 846 ascension_0.11.5-1.dsc
25 b79207076b1b1545e490e7d6867b131e89745ccadc9b911a16e24ac08fe8de08 11049 ascension_0.11.5.orig.tar.gz 25 2e874e3159e02ad82a40f2d32173185a546fdcb1a349e048203b237bf9a5789b 11240 ascension_0.11.5.orig.tar.gz
26 b735f1b11f5a9b9682a89b8a94bcf75e99fe62238029f0a75c3fffdb1336302a 1668 ascension_0.11.5-1.debian.tar.xz 26 ce014ac1c00c226a5613b866bf6d3e11ecf81ecd0f99f408bca0fc84aafdfcac 1668 ascension_0.11.5-1.debian.tar.xz
27 bb71c7cfb386b0d54a5ac97004190ed4da3733437c97ae9f2677d26210d31888 5432 ascension_0.11.5-1_amd64.buildinfo 27 9c005e85c8c932a029ba9763adc9a41f7f7bd2fd715e47f3ad703d48b5440339 5432 ascension_0.11.5-1_amd64.buildinfo
28 44237bb83bdfa24f98fa21453fe5450a2ddb02267a26b6698c7b15b8aaf5183d 11798 python3-ascension_0.11.5-1_all.deb 28 b1aa44aebfc7c9faf4f5036a9cd9d510bb2673061c87336f17ef3fb922f9994b 11930 python3-ascension_0.11.5-1_all.deb
29Files: 29Files:
30 69f931f2c791ac8d334c3af07e7aad48 846 python optional ascension_0.11.5-1.dsc 30 4322f7063bf7653292dd9480de0064f7 846 python optional ascension_0.11.5-1.dsc
31 9bffa31fb1a5a0f087b7b1d395c403a0 11049 python optional ascension_0.11.5.orig.tar.gz 31 da11eee3599ed1d294dbbfdae6a10b4a 11240 python optional ascension_0.11.5.orig.tar.gz
32 657a74f5293d1990f6de645a0fa1140e 1668 python optional ascension_0.11.5-1.debian.tar.xz 32 4ae84d4412deb7d897e0ce0eb878b645 1668 python optional ascension_0.11.5-1.debian.tar.xz
33 473d729570d9ac7496fc3e4fffa27e87 5432 python optional ascension_0.11.5-1_amd64.buildinfo 33 0f0192d92ead3bbaf9524bd5efca6f73 5432 python optional ascension_0.11.5-1_amd64.buildinfo
34 8bdedfa3e1a5e16283e50eaddf5a2051 11798 python optional python3-ascension_0.11.5-1_all.deb 34 aabbef1e2b653e868e7973bd704f515e 11930 python optional python3-ascension_0.11.5-1_all.deb
diff --git a/deb_dist/ascension_0.11.5-1_source.buildinfo b/deb_dist/ascension_0.11.5-1_source.buildinfo
index 9f23a7a..fb21d78 100644
--- a/deb_dist/ascension_0.11.5-1_source.buildinfo
+++ b/deb_dist/ascension_0.11.5-1_source.buildinfo
@@ -4,14 +4,14 @@ Binary: python3-ascension
4Architecture: source 4Architecture: source
5Version: 0.11.5-1 5Version: 0.11.5-1
6Checksums-Md5: 6Checksums-Md5:
7 ae066bb33d2bf6c2ff555980ec878564 846 ascension_0.11.5-1.dsc 7 8464db8e7378642e54b5d8ef60ebd768 846 ascension_0.11.5-1.dsc
8Checksums-Sha1: 8Checksums-Sha1:
9 29368f9cc9d806e1a00fd587472d647960d0f891 846 ascension_0.11.5-1.dsc 9 f6371b24a5040a064cd5ff89b2567068e997be1f 846 ascension_0.11.5-1.dsc
10Checksums-Sha256: 10Checksums-Sha256:
11 873676e137d47067b5ecdf85755855753dbc90e85f8f0dd16aafa8d313fb38e6 846 ascension_0.11.5-1.dsc 11 f4238f94179310b674157589dda0487224b8222cc9ecf7f69efb38f17ee65254 846 ascension_0.11.5-1.dsc
12Build-Origin: Debian 12Build-Origin: Debian
13Build-Architecture: amd64 13Build-Architecture: amd64
14Build-Date: Thu, 13 Jun 2019 10:41:30 +0000 14Build-Date: Sat, 15 Jun 2019 13:53:06 +0000
15Installed-Build-Depends: 15Installed-Build-Depends:
16 autoconf (= 2.69-10), 16 autoconf (= 2.69-10),
17 automake (= 1:1.15-6), 17 automake (= 1:1.15-6),
@@ -174,4 +174,4 @@ Installed-Build-Depends:
174 zlib1g (= 1:1.2.8.dfsg-5) 174 zlib1g (= 1:1.2.8.dfsg-5)
175Environment: 175Environment:
176 DEB_BUILD_OPTIONS="parallel=2" 176 DEB_BUILD_OPTIONS="parallel=2"
177 SOURCE_DATE_EPOCH="1560422488" 177 SOURCE_DATE_EPOCH="1560606784"
diff --git a/deb_dist/ascension_0.11.5-1_source.changes b/deb_dist/ascension_0.11.5-1_source.changes
index 892e73f..120a26a 100644
--- a/deb_dist/ascension_0.11.5-1_source.changes
+++ b/deb_dist/ascension_0.11.5-1_source.changes
@@ -1,5 +1,5 @@
1Format: 1.8 1Format: 1.8
2Date: Thu, 13 Jun 2019 10:41:28 +0000 2Date: Sat, 15 Jun 2019 13:53:04 +0000
3Source: ascension 3Source: ascension
4Binary: python3-ascension 4Binary: python3-ascension
5Architecture: source 5Architecture: source
@@ -15,17 +15,17 @@ Changes:
15 . 15 .
16 * source package automatically created by stdeb 0.8.5 16 * source package automatically created by stdeb 0.8.5
17Checksums-Sha1: 17Checksums-Sha1:
18 29368f9cc9d806e1a00fd587472d647960d0f891 846 ascension_0.11.5-1.dsc 18 f6371b24a5040a064cd5ff89b2567068e997be1f 846 ascension_0.11.5-1.dsc
19 b4d60725c966881ebc25aab999939301ef0b8556 11049 ascension_0.11.5.orig.tar.gz 19 8f3149f126141b96652799d1603bfa542ee8d428 11240 ascension_0.11.5.orig.tar.gz
20 8397314a0407cd184887d8c44eeb7542b2559d77 1136 ascension_0.11.5-1.debian.tar.xz 20 6b445eb27087cdf629cf637a1ff438562765c847 1136 ascension_0.11.5-1.debian.tar.xz
21 5c022a8f4c907e64e6805f1608af7585c95b9f88 5163 ascension_0.11.5-1_source.buildinfo 21 aa2b20ff7cee5bdf971a380e1aff780c437143ce 5163 ascension_0.11.5-1_source.buildinfo
22Checksums-Sha256: 22Checksums-Sha256:
23 873676e137d47067b5ecdf85755855753dbc90e85f8f0dd16aafa8d313fb38e6 846 ascension_0.11.5-1.dsc 23 f4238f94179310b674157589dda0487224b8222cc9ecf7f69efb38f17ee65254 846 ascension_0.11.5-1.dsc
24 b79207076b1b1545e490e7d6867b131e89745ccadc9b911a16e24ac08fe8de08 11049 ascension_0.11.5.orig.tar.gz 24 2e874e3159e02ad82a40f2d32173185a546fdcb1a349e048203b237bf9a5789b 11240 ascension_0.11.5.orig.tar.gz
25 b98915d645d089d8fa163e0c1e80389749e600b269d2dc5b92833988580257fc 1136 ascension_0.11.5-1.debian.tar.xz 25 4afc6f89d41805973db4c86f61659fb9791ff1b0d4c81632928608c13971a838 1136 ascension_0.11.5-1.debian.tar.xz
26 f91c3de9310ca229a7173d9f0e202c62e60f4361a645724777adf090d9232ed7 5163 ascension_0.11.5-1_source.buildinfo 26 0bad87934b76941a438426c2a2efcbffc79853d4da151defa09d74a300425e63 5163 ascension_0.11.5-1_source.buildinfo
27Files: 27Files:
28 ae066bb33d2bf6c2ff555980ec878564 846 python optional ascension_0.11.5-1.dsc 28 8464db8e7378642e54b5d8ef60ebd768 846 python optional ascension_0.11.5-1.dsc
29 9bffa31fb1a5a0f087b7b1d395c403a0 11049 python optional ascension_0.11.5.orig.tar.gz 29 da11eee3599ed1d294dbbfdae6a10b4a 11240 python optional ascension_0.11.5.orig.tar.gz
30 e5a540c826e5c23f5fc5fbf9690d0a20 1136 python optional ascension_0.11.5-1.debian.tar.xz 30 3cf09635fb24871aed3225e80756a8ea 1136 python optional ascension_0.11.5-1.debian.tar.xz
31 69fd22a6cf7d00e60ab3ca9d59101734 5163 python optional ascension_0.11.5-1_source.buildinfo 31 c7a06a94ebff0b04f073b8c9271dfe82 5163 python optional ascension_0.11.5-1_source.buildinfo
diff --git a/deb_dist/ascension_0.11.5.orig.tar.gz b/deb_dist/ascension_0.11.5.orig.tar.gz
index 39058ce..53dd59c 100644
--- a/deb_dist/ascension_0.11.5.orig.tar.gz
+++ b/deb_dist/ascension_0.11.5.orig.tar.gz
Binary files differ
diff --git a/deb_dist/python3-ascension_0.11.5-1_all.deb b/deb_dist/python3-ascension_0.11.5-1_all.deb
index e99927e..b7c2e6a 100644
--- a/deb_dist/python3-ascension_0.11.5-1_all.deb
+++ b/deb_dist/python3-ascension_0.11.5-1_all.deb
Binary files differ