def __call__(self,ap,ns,values,option_string):
self.fn(values,ns,ap,option_string)
+class PkmBase():
+ def site_start(self,pubkeys_path):
+ self._pa=pubkeys_path
+ self._fs = FilterState()
+ def site_serial(self,serial): pass
+ def write_key(self,k): pass
+ def site_finish(self,confw): pass
+
+class PkmSingle(PkmBase):
+ opt = 'single'
+ help = 'write one public key per site to sites.conf'
+ def site_start(self,pubkeys_path):
+ PkmBase.site_start(self,pubkeys_path)
+ self._outk = []
+ def write_key(self,k):
+ if k.okforonlykey(output_version,self._fs):
+ self._outk.append(k)
+ def site_finish(self,confw):
+ if len(self._outk) == 0:
+ complain("site with no public key");
+ elif len(self._outk) != 1:
+ debugrepr('outk ', self._outk)
+ complain(
+ "site with multiple public keys, without --pubkeys-install (maybe --output-version=1 would help"
+ )
+ else:
+ confw.write("key %s;\n"%str(self._outk[0]))
+
+class PkmInstall(PkmBase):
+ opt = 'install'
+ help = 'install public keys in public key directory'
+ def site_start(self,pubkeys_path):
+ PkmBase.site_start(self,pubkeys_path)
+ self._pw=open(self._pa+'~tmp','w')
+ def site_serial(self,serial):
+ self._pw.write('serial %s\n' % serial)
+ def write_key(self,k):
+ wout=k.forpub(output_version,self._fs)
+ self._pw.write(' '.join(wout))
+ self._pw.write('\n')
+ def site_finish(self,confw):
+ self._pw.close()
+ os.rename(self._pa+'~tmp',self._pa+'~update')
+ PkmElide.site_finish(self,confw)
+
+class PkmElide(PkmBase):
+ opt = 'elide'
+ help = 'no public keys in sites.conf output nor in directory'
+ def site_finish(self,confw):
+ confw.write("peer-keys \"%s\";\n"%self._pa);
+
def parse_args():
global service
global inputfile
global debug_level
global output_version
global pubkeys_dir
+ global pubkeys_mode
ap = argparse.ArgumentParser(description='process secnet sites files')
ap.add_argument('--userv', '-u', action='store_true',
ap.add_argument('--conf-key-prefix', action=ActionNoYes,
default=True,
help='prefix conf file key names derived from sites data')
+ def add_pkm(how):
+ ap.add_argument('--pubkeys-'+how().opt, action=ArgActionLambda,
+ nargs=0,
+ fn=(lambda v,ns,*x: setattr(ns,'pkm',how)),
+ help=how().help)
+ add_pkm(PkmInstall)
+ add_pkm(PkmSingle)
+ add_pkm(PkmElide)
ap.add_argument('--pubkeys-dir', nargs=1,
help='public key directory',
default=['/var/lib/secnet/pubkeys'])
key_prefix = av.conf_key_prefix
output_version = av.output_version[0]
pubkeys_dir = av.pubkeys_dir[0]
+ pubkeys_mode = getattr(av,'pkm',PkmSingle)
if service:
if len(av.arg)!=4:
print("Wrong number of arguments")
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]
+ def okforonlykey(self,version,fs):
+ return len(self.forpub(version,fs)) != 0
class rsakey (pubkey):
- "An RSA public key"
+ "An old-style RSA public key"
def __init__(self,w):
self.l=w[1].number(0,max['rsa_bits'],'rsa len')
self.e=w[2].bignum_10('rsa','rsa e')
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"
complain('rsa1 key in new format has bad base91')
#print(repr(w_inner), file=sys.stderr)
rsakey.__init__(self,w_inner)
+
+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 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)
if w[0]=='pubkey':
return rsakey(w)
elif w[0]=='pub' and w[1]=='rsa1':
return rsakey_newfmt(w)
elif w[0]=='pub':
return pubkey(w)
+ elif w[0]=='pkg':
+ return pubkey_group(w,False)
+ elif w[0]=='pkgf':
+ return pubkey_group(w,True)
else:
assert(False)
'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"),
'restrict-nets':(networks,"Allowable networks"),
'networks':(networks,"Claimed networks"),
+ 'serial':(serial,"public key set serial"),
+ 'pkg':(listof(somepubkey),"start of public key group",'pub'),
+ 'pkgf':(listof(somepubkey),"start of fallback public key group",'pub'),
'pub':(listof(somepubkey),"new style public site key"),
- 'pubkey':(listof(somepubkey),"RSA public site key",'pub'),
+ 'pubkey':(listof(somepubkey),"Old-style RSA public site key",'pub'),
'peer':(single_ipaddr,"Tunnel peer IP address"),
'address':(address,"External contact address and port"),
'mobile':(boolean,"Site is mobile"),
'address':sp,
'networks':None,
'peer':None,
+ 'serial':None,
+ 'pkg':None,
+ 'pkgf':None,
'pub':None,
'pubkey':None,
'mobile':sp,
'networks':"Networks claimed by the site",
'hash':"hash function",
'peer':"Gateway address of the site",
- 'pub':"public key of the site",
}
def mangle_name(self):
return self.name.replace('/',',')
self.indent(w,ind+2)
w.write("name \"%s\";\n"%(np,))
self.indent(w,ind+2)
- w.write("key %s;\n"%str(self.properties["pub"].list[0]))
+
+ pkm = pubkeys_mode()
+ debugrepr('pkm ',pkm)
+ pkm.site_start(self.pubkeys_path())
+ if 'serial' in self.properties:
+ pkm.site_serial(self.properties['serial'])
+
+ for k in self.properties["pub"].list:
+ debugrepr('pubkeys ', k)
+ pkm.write_key(k)
+
+ pkm.site_finish(w)
+
self.output_props(w,ind+2)
self.indent(w,ind+2)
w.write("link netlink {\n");
def reset(self):
# called when we enter a new node,
# in particular, at the start of each site
- pass
+ self.pkg = '00000000'
def pline(il,filterstate,allow_include=False):
"Process a configuration file line"
~ian / secnet.git / blobdiff