make-secnet-sites: Taint the `group' parameter

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index 55c66cc91b41b1b4ff3838597d66a279bf1b977f..668dbf635b02ec9e98533e5e8b261297614074fb 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):
@@ -136,6 +136,14 @@ class Tainted:
                # caller promises to throw if syntax was dangeorus
                return self._rtn(True)
 
+       def output(self):
+               if self._ok is False: return ''
+               if self._ok is True: return self._s
+               print('%s:%d: unchecked/unknown additional data "%s"' %
+                     (self._file,self._line,self._s),
+                     file=sys.stderr)
+               sys.exit(1)
+
        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
@@ -219,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)
@@ -345,6 +355,7 @@ class rsakey (basetype):
                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()
        def __str__(self):
                return 'rsa-public("%s","%s")'%(self.e,self.n)
 
@@ -537,15 +548,18 @@ def set_property(obj,w):
        else:
                obj.properties[prop.raw()]=keywords[prop.raw_mark_ok()][0](w)
 
-def pline(i,allow_include=False):
+
+def pline(il,allow_include=False):
        "Process a configuration file line"
        global allow_defs, obstack, root
-       w=i.rstrip('\n').split()
-       if len(w)==0: return [i]
+       w=il.rstrip('\n').split()
+       if len(w)==0: return ['']
        w=list([Tainted(x) for x in w])
        keyword=w[0]
        current=obstack[len(obstack)-1]
-       copyout=lambda: [i]
+       copyout=lambda: ['    '*len(obstack) +
+                       ' '.join([ww.output() for ww in w]) +
+                       '\n']
        if keyword=='end-definitions':
                keyword.raw_mark_ok()
                allow_defs=sitelevel.depth
@@ -580,6 +594,7 @@ def pline(i,allow_include=False):
                        if service and group and current.depth==2:
                                if group!=current.group:
                                        complain("Incorrect group!")
+                               w[2].groupname()
                else:
                        # New
                        # Ignore depth check for now
@@ -719,14 +734,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"%