X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=820d272cad726bb8b451780ebaef4de87daf59a0;hb=b2920262e82ea5939511ea841eb33a094cea566d;hp=f14a72524d5c9580ddac78b34f524eadd0dccbfa;hpb=fcfa19e603539af0e3c97635dead1ec4e4816756;p=secnet.git diff --git a/make-secnet-sites b/make-secnet-sites index f14a725..820d272 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -70,9 +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 = 1 + from sys import version_info if version_info.major == 2: # for python2 import codecs @@ -81,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): @@ -103,19 +118,21 @@ class Tainted: assert(self._ok is not True) self._ok=False complain('bad parameter: %s: %s' % (what, why)) - return self + return False def _max_ok(self,what,maxlen): if len(self._s) > maxlen: - self._bad(what,'too long (max %d)' % maxlen) - return self + return self._bad(what,'too long (max %d)' % maxlen) + return True def _re_ok(self,bad,what,maxlen=None): if maxlen is None: maxlen=max[what] self._max_ok(what,maxlen) - if self._ok is False: return self - if bad.search(self._s): return self._bad(what,'bad syntax') - return self + if self._ok is False: return False + 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=''): if is_ok: @@ -147,8 +164,8 @@ class Tainted: bad_name=re.compile(r'^[^a-zA-Z]|[^-_0-9a-zA-Z]') # secnet accepts _ at start of names, but we reserve that bad_name_counter=0 - def name(self): - ok=self._re_ok(Tainted.bad_name,'name') + def name(self,what='name'): + ok=self._re_ok(Tainted.bad_name,what) return self._rtn(ok, '_line%d_%s' % (self._line, id(self))) @@ -180,6 +197,13 @@ class Tainted: % (minn,maxx)) return self._rtnval(ok,v,minn) + def hexid(self,byteslen,what): + ok=self._re_ok(Tainted.bad_hex,what,byteslen*2) + if ok: + if len(self._s) < byteslen*2: + ok=self._bad(what,'too short') + return self._rtn(ok,ifbad='00'*byteslen) + bad_host=re.compile(r'[^-\][_.:0-9a-zA-Z]') # We permit _ so we can refer to special non-host domains # which have A and AAAA RRs. This is a crude check and we may @@ -203,30 +227,60 @@ class Tainted: ok=self._re_ok(Tainted.bad_groupname,'group name',64) return self._rtn(ok) + bad_base91=re.compile(r'[^!-~]|[\'\"\\]') + def base91(self,what='base91'): + 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 global header global groupfiledir global sitesfile + global outputfile global group global user global of + global prefix + global key_prefix + global debug_level + global output_version ap = argparse.ArgumentParser(description='process secnet sites files') ap.add_argument('--userv', '-u', action='store_true', help='userv service fragment update mode') + ap.add_argument('--conf-key-prefix', action=ActionNoYes, + default=True, + help='prefix conf file key names derived from sites data') + 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] if service: if len(av.arg)!=4: print("Wrong number of arguments") sys.exit(1) (header, groupfiledir, sitesfile, group) = av.arg + group = Tainted(group,0,'command line') + # untrusted argument from caller if "USERV_USER" not in os.environ: print("Environment variable USERV_USER not found") sys.exit(1) @@ -247,8 +301,6 @@ def parse_args(): print("Too many arguments") sys.exit(1) (inputfile, outputfile) = (av.arg + [None]*2)[0:2] - if outputfile is None: of=sys.stdout - else: of=open(sys.argv[2],'w') parse_args() @@ -259,6 +311,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." @@ -269,6 +323,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) @@ -339,6 +396,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): @@ -347,7 +413,15 @@ 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) + +class rsakey (pubkey): "An RSA public key" def __init__(self,w): self.l=w[1].number(0,max['rsa_bits'],'rsa len') @@ -356,6 +430,16 @@ class rsakey (basetype): if len(w) >= 5: w[4].email() 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 somepubkey(w): + if w[0]=='pubkey': + return rsakey(w) + elif w[0]=='pub': + return pubkey(w) + else: + assert(False) # Possible properties of configuration nodes keywords={ @@ -369,7 +453,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'), + 'pubkey':(listof(somepubkey),"RSA public site key"), 'peer':(single_ipaddr,"Tunnel peer IP address"), 'address':(address,"External contact address and port"), 'mobile':(boolean,"Site is mobile"), @@ -408,17 +493,22 @@ class level: def prop_out(self,n): return self.allow_properties[n](n,str(self.properties[n])) def output_props(self,w,ind): - for i in self.properties.keys(): + for i in sorted(self.properties.keys()): if self.allow_properties[i]: self.indent(w,ind) w.write("%s"%self.prop_out(i)) - def output_data(self,w,ind,np): + def kname(self): + return ((self.type[0].upper() if key_prefix else '') + + self.name) + def output_data(self,w,path): + ind = 2*len(path) self.indent(w,ind) - w.write("%s {\n"%(self.name)) + w.write("%s {\n"%(self.kname())) self.output_props(w,ind+2) if self.depth==1: w.write("\n"); - for c in self.children.values(): - c.output_data(w,ind+2,np+self.name+"/") + for k in sorted(self.children.keys()): + c=self.children[k] + c.output_data(w,path+(c,)) self.indent(w,ind) w.write("};\n") @@ -433,17 +523,18 @@ class vpnlevel(level): } def __init__(self,w): level.__init__(self,w) - def output_vpnflat(self,w,ind,h): + def output_vpnflat(self,w,path): "Output flattened list of site names for this VPN" + ind=2*(len(path)+1) self.indent(w,ind) - w.write("%s {\n"%(self.name)) + w.write("%s {\n"%(self.kname())) for i in self.children.keys(): - self.children[i].output_vpnflat(w,ind+2, - h+"/"+self.name+"/"+i) + self.children[i].output_vpnflat(w,path+(self,)) w.write("\n") self.indent(w,ind+2) w.write("all-sites %s;\n"% - ','.join(self.children.keys())) + ','.join(map(lambda i: i.kname(), + self.children.values()))) self.indent(w,ind) w.write("};\n") @@ -459,13 +550,19 @@ class locationlevel(level): def __init__(self,w): level.__init__(self,w) self.group=w[2].groupname() - def output_vpnflat(self,w,ind,h): + def output_vpnflat(self,w,path): + ind=2*(len(path)+1) self.indent(w,ind) - # The "h=h,self=self" abomination below exists because + # The "path=path,self=self" abomination below exists because # Python didn't support nested_scopes until version 2.1 - w.write("%s %s;\n"%(self.name,','.join( - map(lambda x,h=h,self=self: - h+"/"+x,self.children.keys())))) + # + #"/"+self.name+"/"+i + w.write("%s %s;\n"%(self.kname(),','.join( + map(lambda x,path=path,self=self: + '/'.join([prefix+"vpn-data"] + list(map( + lambda i: i.kname(), + path+(self,x)))), + self.children.values())))) class sitelevel(level): "Site level (i.e. a leafnode) in the configuration hierarchy" @@ -477,7 +574,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={ @@ -490,11 +588,15 @@ class sitelevel(level): } def __init__(self,w): level.__init__(self,w) - def output_data(self,w,ind,np): + def output_data(self,w,path): + ind=2*len(path) + np='/'.join(map(lambda i: i.name, path)) self.indent(w,ind) - w.write("%s {\n"%(self.name)) + w.write("%s {\n"%(self.kname())) + self.indent(w,ind+2) + w.write("name \"%s\";\n"%(np,)) self.indent(w,ind+2) - w.write("name \"%s\";\n"%(np+self.name)) + w.write("key %s;\n"%str(self.properties["pubkey"].list[0])) self.output_props(w,ind+2) self.indent(w,ind+2) w.write("link netlink {\n"); @@ -511,20 +613,14 @@ class sitelevel(level): # (depth,properties) levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel} -# Reserved vpn/location/site names -reserved={'all-sites':None} -reserved.update(keywords) -reserved.update(levels) - def complain(msg): "Complain about a particular input line" - global complaints - print(("%s line %d: "%(file,line))+msg) - complaints=complaints+1 + moan(("%s line %d: "%(file,line))+msg) def moan(msg): "Complain about something in general" global complaints print(msg); + if complaints is None: sys.exit(1) complaints=complaints+1 class UntaintedRoot(): @@ -536,18 +632,28 @@ root=level([UntaintedRoot(x) for x in ['root','root']]) # All vpns are children of this node obstack=[root] allow_defs=0 # Level above which new definitions are permitted -prefix='' def set_property(obj,w): "Set a property on a configuration node" prop=w[0] - if prop.raw() in obj.properties: - obj.properties[prop.raw_mark_ok()].add(obj,w) + 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[prop.raw()]=keywords[prop.raw_mark_ok()][0](w) - - -def pline(il,allow_include=False): + 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,filterstate,allow_include=False): "Process a configuration file line" global allow_defs, obstack, root w=il.rstrip('\n').split() @@ -555,9 +661,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 @@ -604,6 +710,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: @@ -614,8 +721,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())) @@ -631,10 +741,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): @@ -647,19 +758,19 @@ def outputsites(w): # Raw VPN data section of file w.write(prefix+"vpn-data {\n") for i in root.children.values(): - i.output_data(w,2,"") + i.output_data(w,(i,)) w.write("};\n") # Per-VPN flattened lists w.write(prefix+"vpn {\n") for i in root.children.values(): - i.output_vpnflat(w,2,prefix+"vpn-data") + i.output_vpnflat(w,()) w.write("};\n") # Flattened list of sites w.write(prefix+"all-sites %s;\n"%",".join( - map(lambda x:"%svpn/%s/all-sites"%(prefix,x), - root.children.keys()))) + map(lambda x:"%svpn/%s/all-sites"%(prefix,x.kname()), + root.children.values()))) line=0 file=None @@ -732,14 +843,15 @@ complaints=None # arranges to crash if we complain later if service: # Put the user's input into their group file, and rebuild the main # sites file - f=open(groupfiledir+"/T"+group,'w') + f=open(groupfiledir+"/T"+group.groupname(),'w') f.write("# Section submitted by user %s, %s\n"% (user,time.asctime(time.localtime(time.time())))) f.write("# Checked by make-secnet-sites version %s\n\n"%VERSION) for i in userinput: f.write(i) f.write("\n") f.close() - os.rename(groupfiledir+"/T"+group,groupfiledir+"/R"+group) + os.rename(groupfiledir+"/T"+group.groupname(), + groupfiledir+"/R"+group.groupname()) f=open(sitesfile+"-tmp",'w') f.write("# sites file autogenerated by make-secnet-sites\n") f.write("# generated %s, invoked by %s\n"% @@ -757,4 +869,11 @@ if service: f.close() os.rename(sitesfile+"-tmp",sitesfile) else: + if outputfile is None: + of=sys.stdout + else: + tmp_outputfile=outputfile+'~tmp~' + of=open(tmp_outputfile,'w') outputsites(of) + if outputfile is not None: + os.rename(tmp_outputfile,outputfile)