From db4b8821ec4768cc0b33ffaa83fdc1f9d96ea497 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 1 Dec 2019 17:38:31 +0000 Subject: [PATCH] make-secnet-sites: Rework with new `inpub' class The use of k.forsites(,None,) was rather unprincipled and required a strange comment. Instead, invent a `forpub' method for this use. `forsites' can be implemented, for these classes, in terms of forpub. Likewise testing whether the return from forsites was []; replace that with an okforonlykey method. (The implementation uses the same trick but now it's inside the class.) We transpose the if `pubkeys_install' with the `for k' loop. The `not pubkeys_install' arm is rather different now, accumulating in outk. The one nontrivial consquence is that now if there are multiple eligible keys to be written to a sites.conf, we fail, rather than just choosing the first. Signed-off-by: Ian Jackson --- make-secnet-sites | 70 +++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/make-secnet-sites b/make-secnet-sites index cd04868..0bdb694 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -422,22 +422,22 @@ class address (basetype): def __str__(self): return '"%s"; port %d'%(self.adr,self.port) -class pubkey (basetype): +class inpub (basetype): + def forsites(self,version,xcopy,fs): + return self.forpub(version,fs) + +class pubkey (inpub): "Some kind of publie key" def __init__(self,w): self.a=w[1].name('algname') self.d=w[2].base91(); def __str__(self): return 'make-public("%s","%s")'%(self.a,self.d) - def forsites(self,version,xcopy,fs): + def forpub(self,version,fs): if version < 2: return [] return ['pub', self.a, self.d] - # forsites for properties which are from - # keywords with kw[2]=='pub' may not use copy. - # This is because the property values can be - # written out in sites file format during sites.conf - # construction (with --pubkeys-install), in which case - # the original input line is no longer available. + def okforonlykey(self,version,fs): + return len(self.forpub(version,fs)) != 0 class rsakey (pubkey): "An RSA public key" @@ -457,11 +457,11 @@ class rsakey (pubkey): return 'rsa-public("%s","%s")'%(self.e,self.n) # this specialisation means we can generate files # compatible with old secnet executables - def forsites(self,version,xcopy,fs): + def forpub(self,version,fs): if version < 2: if fs.pkg != '00000000': return [] return ['pubkey', str(self.l), self.e, self.n] - return pubkey.forsites(self,version,xcopy,fs) + return pubkey.forpub(self,version,fs) class rsakey_newfmt(rsakey): "An old-style RSA public key in new-style sites format" @@ -481,16 +481,19 @@ class rsakey_newfmt(rsakey): #print(repr(w_inner), file=sys.stderr) rsakey.__init__(self,w_inner) -class pubkey_group(basetype): +class pubkey_group(inpub): "Public key group introducer" # appears in the site's list of keys mixed in with the keys def __init__(self,w,fallback): self.i=w[1].hexid(4,'pkg-id') self.fallback=fallback - def forsites(self,version,xcopy,fs): + def forpub(self,version,fs): fs.pkg=self.i if version < 2: return [] return ['pkgf' if self.fallback else 'pkg', self.i] + def okforonlykey(self,version,fs): + self.forpub(version,fs) + return False def somepubkey(w): #print(repr(w), file=sys.stderr) @@ -671,39 +674,42 @@ class sitelevel(level): self.indent(w,ind+2) w.write("name \"%s\";\n"%(np,)) self.indent(w,ind+2) + if pubkeys_install: pa=self.pubkeys_path() pw=open(pa+'~tmp','w') if 'serial' in self.properties: pw.write('serial %s\n' % self.properties['serial']) - fs=FilterState() - for k in self.properties["pub"].list: - debugrepr('pubkeys install', k) - wout=k.forsites(max_version,None,fs) + else: + outk = [] + + fs=FilterState() + for k in self.properties["pub"].list: + debugrepr('pubkeys ', k) + if pubkeys_install: + wout=k.forpub(output_version,fs) pw.write(' '.join(wout)) pw.write('\n') + else: + if k.okforonlykey(output_version,fs): + outk.append(k) + + if pubkeys_install: pw.close() os.rename(pa+'~tmp',pa+'~update') w.write("peer-keys \"%s\";\n"%pa); else: - use = None - indefault = True - for k in self.properties["pub"].list: - debugrepr('pub write', (use,indefault,k)) - if isinstance(k,pubkey): - if indefault: - use = k - break - if use is None: - use = k - elif isinstance(k,pubkey_group): - indefault = k.i == '00000000' - else: - raise RuntimeError('bad '+repr(k)) - if use is None: + if len(outk) == 0: complain("site with no public key"); - w.write("key %s;\n"%str(use)) + elif len(outk) != 1: + debugrepr('outk ', outk) + complain( + "site with multiple public keys, without --pubkeys-install (maybe --output-version=1 would help" + ) + else: + w.write("key %s;\n"%str(k)) + self.output_props(w,ind+2) self.indent(w,ind+2) w.write("link netlink {\n"); -- 2.30.2