make-secnet-sites: set_property: Break out propname

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index d7a849468cd9c7823cb1d781abdd05ade47b15e6..3d7d75597ec475ade7493bc61030381a4d837973 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -105,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:
@@ -149,8 +149,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)))
 
@@ -182,6 +182,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
@@ -205,15 +212,22 @@ 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)
+
 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
 
        ap = argparse.ArgumentParser(description='process secnet sites files')
@@ -228,6 +242,7 @@ def parse_args():
        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:
@@ -256,8 +271,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(outputfile,'w')
 
 parse_args()
 
@@ -417,7 +430,7 @@ 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))
@@ -430,7 +443,8 @@ class level:
                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():
+               for k in sorted(self.children.keys()):
+                       c=self.children[k]
                        c.output_data(w,path+(c,))
                self.indent(w,ind)
                w.write("};\n")
@@ -535,13 +549,12 @@ levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel}
 
 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():
@@ -553,15 +566,16 @@ 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 propname in obj.properties:
+               obj.properties[propname].add(obj,w)
        else:
-               obj.properties[prop.raw()]=keywords[prop.raw_mark_ok()][0](w)
+               obj.properties[propname]=kw[0](w)
 
 
 def pline(il,allow_include=False):
@@ -775,4 +789,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)