make-secnet-sites: output_data: Change recursive variables

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index 845cdd5e42a48d9f2d4459840859ee5fe7e6a383..cd8f5dbb6fa01f03bae571a765b2a81e3b41e384 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -84,11 +84,11 @@ if version_info.major == 2:  # for python2
 max={'rsa_bits':8200,'name':33,'dh_bits':8200}
 
 class Tainted:
-       def __init__(self,s):
+       def __init__(self,s,tline=None,tfile=None):
                self._s=s
                self._ok=None
-               self._line=line
-               self._file=file
+               self._line=line if tline is None else tline
+               self._file=file if tfile is None else tfile
        def __eq__(self,e):
                return self._s==e
        def __ne__(self,e):
@@ -227,6 +227,8 @@ def parse_args():
                        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)
@@ -248,7 +250,7 @@ def parse_args():
                        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')
+               else: of=open(outputfile,'w')
 
 parse_args()
 
@@ -412,13 +414,14 @@ class level:
                        if self.allow_properties[i]:
                                self.indent(w,ind)
                                w.write("%s"%self.prop_out(i))
-       def output_data(self,w,ind,np):
+       def output_data(self,w,path):
+               ind = 2*len(path)
                self.indent(w,ind)
                w.write("%s {\n"%(self.name))
                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+"/")
+                       c.output_data(w,path+(c,))
                self.indent(w,ind)
                w.write("};\n")
 
@@ -433,13 +436,13 @@ 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))
                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"%
@@ -459,13 +462,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
+               #
+               #"/"+self.name+"/"+i
                w.write("%s %s;\n"%(self.name,','.join(
-                       map(lambda x,h=h,self=self:
-                               h+"/"+x,self.children.keys()))))
+                       map(lambda x,path=path,self=self:
+                           '/'.join([prefix+"vpn-data"] + list(map(
+                                   lambda i: i.name,
+                                   path+(self,x)))),
+                           self.children.values()))))
 
 class sitelevel(level):
        "Site level (i.e. a leafnode) in the configuration hierarchy"
@@ -490,11 +499,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))
                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");
@@ -647,13 +658,13 @@ 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
@@ -732,14 +743,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"%