X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=b4cd9afb80ac404c03b6f3575718cbf0863e3005;hb=1b8af2f7f86131a5364f2270865895ea597c591e;hp=3fc6fcdbe55a069344ed6c8dfe057cbc1bdbfe19;hpb=f5c5fb86331aac7ec034dd5a7c4feaf8cec1bc56;p=secnet.git diff --git a/make-secnet-sites b/make-secnet-sites index 3fc6fcd..b4cd9af 100755 --- a/make-secnet-sites +++ b/make-secnet-sites @@ -71,6 +71,8 @@ sys.path.insert(1,"/usr/local/share/secnet") sys.path.insert(1,"/usr/share/secnet") import ipaddrset +from argparseactionnoyes import ActionNoYes + VERSION="0.1.18" from sys import version_info @@ -103,19 +105,19 @@ 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 self._ok is False: return False if bad.search(self._s): return self._bad(what,'bad syntax') - return self + return True def _rtnval(self, is_ok, ifgood, ifbad=''): if is_ok: @@ -212,16 +214,23 @@ def parse_args(): global group global user global of + global prefix + global key_prefix 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('--prefix', '-P', nargs=1, help='set prefix') ap.add_argument('arg',nargs=argparse.REMAINDER) av = ap.parse_args() #print(repr(av), file=sys.stderr) service = 1 if av.userv else 0 + prefix = '' if av.prefix is None else av.prefix[0] + key_prefix = av.conf_key_prefix if service: if len(av.arg)!=4: print("Wrong number of arguments") @@ -410,17 +419,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") @@ -435,17 +449,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") @@ -461,13 +476,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" @@ -492,11 +513,13 @@ 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.name)) + w.write("name \"%s\";\n"%(np,)) self.output_props(w,ind+2) self.indent(w,ind+2) w.write("link netlink {\n"); @@ -513,11 +536,6 @@ 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 @@ -538,7 +556,6 @@ 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" @@ -649,19 +666,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