X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=4d8aacdb9d2b01da078dc4092bbfa21470cd40ff;hb=c9fb510e23e466f2b040c8325ec96fe68b2cb8d4;hp=3d7d75597ec475ade7493bc61030381a4d837973;hpb=c8e3385687277ff6b165a2d025914aeaf74e45d0;p=secnet.git diff --git a/make-secnet-sites b/make-secnet-sites index 3d7d755..4d8aacd 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -70,11 +70,14 @@ import ipaddress sys.path.insert(1,"/usr/local/share/secnet") sys.path.insert(1,"/usr/share/secnet") import ipaddrset +import base91 from argparseactionnoyes import ActionNoYes VERSION="0.1.18" +max_version = 2 + from sys import version_info if version_info.major == 2: # for python2 import codecs @@ -83,7 +86,17 @@ if version_info.major == 2: # for python2 import io open=lambda f,m='r': io.open(f,m,encoding='utf-8') -max={'rsa_bits':8200,'name':33,'dh_bits':8200} +max={'rsa_bits':8200,'name':33,'dh_bits':8200,'algname':127} + +def debugrepr(*args): + if debug_level > 0: + print(repr(args), file=sys.stderr) + +def base91s_encode(bindata): + return base91.encode(bindata).replace('"',"-") + +def base91s_decode(string): + return base91.decode(string.replace("-",'"')) class Tainted: def __init__(self,s,tline=None,tfile=None): @@ -116,7 +129,9 @@ class Tainted: if maxlen is None: maxlen=max[what] self._max_ok(what,maxlen) if self._ok is False: return False - if bad.search(self._s): return self._bad(what,'bad syntax') + if bad.search(self._s): + #print(repr(self), file=sys.stderr) + return self._bad(what,'bad syntax') return True def _rtnval(self, is_ok, ifgood, ifbad=''): @@ -217,6 +232,13 @@ class Tainted: ok=self._re_ok(Tainted.bad_base91,what,4096) return self._rtn(ok) +class ArgActionLambda(argparse.Action): + def __init__(self, fn, **kwargs): + self.fn=fn + argparse.Action.__init__(self,**kwargs) + def __call__(self,ap,ns,values,option_string): + self.fn(values,ns,ap,option_string) + def parse_args(): global service global inputfile @@ -229,6 +251,10 @@ def parse_args(): global of global prefix global key_prefix + global debug_level + global output_version + global pubkeys_dir + global pubkeys_install ap = argparse.ArgumentParser(description='process secnet sites files') ap.add_argument('--userv', '-u', action='store_true', @@ -236,14 +262,27 @@ def parse_args(): ap.add_argument('--conf-key-prefix', action=ActionNoYes, default=True, help='prefix conf file key names derived from sites data') + ap.add_argument('--pubkeys-install', action='store_true', + help='install public keys in public key directory') + ap.add_argument('--pubkeys-dir', nargs=1, + help='public key directory', + default=['/var/lib/secnet/pubkeys']) + ap.add_argument('--output-version', nargs=1, type=int, + help='sites file output version', + default=[max_version]) ap.add_argument('--prefix', '-P', nargs=1, help='set prefix') + ap.add_argument('--debug', '-D', action='count', default=0) ap.add_argument('arg',nargs=argparse.REMAINDER) av = ap.parse_args() - #print(repr(av), file=sys.stderr) + debug_level = av.debug + debugrepr('av',av) service = 1 if av.userv else 0 prefix = '' if av.prefix is None else av.prefix[0] key_prefix = av.conf_key_prefix + output_version = av.output_version[0] + pubkeys_dir = av.pubkeys_dir[0] + pubkeys_install = av.pubkeys_install if service: if len(av.arg)!=4: print("Wrong number of arguments") @@ -281,6 +320,8 @@ class basetype: def add(self,obj,w): complain("%s %s already has property %s defined"% (obj.type,obj.name,w[0].raw())) + def forsites(self,version,copy,fs): + return copy class conflist: "A list of some kind of configuration type." @@ -291,6 +332,9 @@ class conflist: self.list.append(self.subtype(w)) def __str__(self): return ', '.join(map(str, self.list)) + def forsites(self,version,copy,fs): + most_recent=self.list[len(self.list)-1] + return most_recent.forsites(version,copy,fs) def listof(subtype): return lambda w: conflist(subtype, w) @@ -361,6 +405,15 @@ class num (basetype): def __str__(self): return '%d'%(self.n) +class serial (basetype): + def __init__(self,w): + self.i=w[1].hexid(4,'serial') + def __str__(self): + return self.i + def forsites(self,version,copy,fs): + if version < 2: return [] + return copy + class address (basetype): "A DNS name and UDP port number" def __init__(self,w): @@ -369,15 +422,72 @@ class address (basetype): def __str__(self): return '"%s"; port %d'%(self.adr,self.port) -class rsakey (basetype): +class pubkey (basetype): + "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): + 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. + +class rsakey (pubkey): "An 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') self.n=w[3].bignum_10('rsa','rsa n') if len(w) >= 5: w[4].email() + self.a='rsa1' + self.d=base91s_encode(b'%d %s %s' % + (self.l, + self.e.encode('ascii'), + self.n.encode('ascii'))) + # ^ this allows us to use the pubkey.forsites() + # method for output in versions>=2 def __str__(self): 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): + if version < 2: + return ['pubkey', str(self.l), self.e, self.n] + return pubkey.forsites(self,version,xcopy,fs) + +class rsakey_newfmt(rsakey): + "An old-style RSA public key in new-style sites format" + # This is its own class simply to have its own constructor. + def __init__(self,w): + self.a=w[1].name() + assert(self.a == 'rsa1') + self.d=w[2].base91() + try: + w_inner=list(map(Tainted, + ['X-PUB-RSA1'] + + base91s_decode(self.d) + .decode('ascii') + .split(' '))) + except UnicodeDecodeError: + complain('rsa1 key in new format has bad base91') + #print(repr(w_inner), file=sys.stderr) + rsakey.__init__(self,w_inner) +def somepubkey(w): + 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) + else: + assert(False) # Possible properties of configuration nodes keywords={ @@ -391,7 +501,8 @@ keywords={ 'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"), 'restrict-nets':(networks,"Allowable networks"), 'networks':(networks,"Claimed networks"), - 'pubkey':(rsakey,"RSA public site key"), + 'pub':(listof(somepubkey),"new style public site key"), + 'pubkey':(listof(somepubkey),"RSA public site key",'pub'), 'peer':(single_ipaddr,"Tunnel peer IP address"), 'address':(address,"External contact address and port"), 'mobile':(boolean,"Site is mobile"), @@ -511,7 +622,8 @@ class sitelevel(level): 'address':sp, 'networks':None, 'peer':None, - 'pubkey':(lambda n,v:"key %s;\n"%v), + 'pub':None, + 'pubkey':None, 'mobile':sp, }) require_properties={ @@ -520,8 +632,11 @@ class sitelevel(level): 'networks':"Networks claimed by the site", 'hash':"hash function", 'peer':"Gateway address of the site", - 'pubkey':"RSA public key of the site", } + def mangle_name(self): + return self.name.replace('/',',') + def pubkeys_path(self): + return pubkeys_dir + '/peer.' + self.mangle_name() def __init__(self,w): level.__init__(self,w) def output_data(self,w,path): @@ -531,6 +646,35 @@ class sitelevel(level): w.write("%s {\n"%(self.kname())) 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') + fs=FilterState() + for k in self.properties["pub"].list: + debugrepr('pubkeys install', k) + wout=k.forsites(max_version,None,fs) + pw.write(' '.join(wout)) + pw.write('\n') + 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 + else: + raise RuntimeError('bad '+repr(k)) + if use is None: + complain("site with no public key"); + w.write("key %s;\n"%str(use)) self.output_props(w,ind+2) self.indent(w,ind+2) w.write("link netlink {\n"); @@ -572,13 +716,22 @@ def set_property(obj,w): prop=w[0] propname=prop.raw_mark_ok() kw=keywords[propname] + if len(kw) >= 3: propname=kw[2] # for aliases if propname in obj.properties: obj.properties[propname].add(obj,w) else: obj.properties[propname]=kw[0](w) + return obj.properties[propname] +class FilterState: + def __init__(self): + self.reset() + def reset(self): + # called when we enter a new node, + # in particular, at the start of each site + pass -def pline(il,allow_include=False): +def pline(il,filterstate,allow_include=False): "Process a configuration file line" global allow_defs, obstack, root w=il.rstrip('\n').split() @@ -586,9 +739,9 @@ def pline(il,allow_include=False): w=list([Tainted(x) for x in w]) keyword=w[0] current=obstack[len(obstack)-1] - copyout=lambda: [' '*len(obstack) + - ' '.join([ww.output() for ww in w]) + - '\n'] + copyout_core=lambda: ' '.join([ww.output() for ww in w]) + indent=' '*len(obstack) + copyout=lambda: [indent + copyout_core() + '\n'] if keyword=='end-definitions': keyword.raw_mark_ok() allow_defs=sitelevel.depth @@ -635,6 +788,7 @@ def pline(il,allow_include=False): sys.exit(1) current.children[tname]=nl current=nl + filterstate.reset() obstack.append(current) return copyout() if keyword.raw() not in current.allow_properties: @@ -645,8 +799,11 @@ def pline(il,allow_include=False): complain("Not allowed to set VPN properties here") return [] else: - set_property(current,w) - return copyout() + prop=set_property(current,w) + out=[copyout_core()] + out=prop.forsites(output_version,out,filterstate) + if len(out)==0: return [indent + '#', copyout_core(), '\n'] + return [indent + ' '.join(out) + '\n'] complain("unknown keyword '%s'"%(keyword.raw())) @@ -662,10 +819,11 @@ def pfile(name,lines,allow_include=False): file=name line=0 outlines=[] + filterstate = FilterState() for i in lines: line=line+1 if (i[0]=='#'): continue - outlines += pline(i,allow_include=allow_include) + outlines += pline(i,filterstate,allow_include=allow_include) return outlines def outputsites(w):