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)
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"%