util: priomsg: Allow passing priomsg_update_p a null pm

[secnet.git] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index 845cdd5e42a48d9f2d4459840859ee5fe7e6a383..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):
@@ -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)
@@ -732,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"%