class OpBase():
# Base case is reading a sites file from self.inputfilee.
# And writing a sites file to self.sitesfile.
+ def positional_args(self, av):
+ if len(av.arg)>3:
+ print("Too many arguments")
+ sys.exit(1)
+ (self.inputfile, self.outputfile) = (av.arg + [None]*2)[0:2]
def read_in(self):
if self.inputfile is None:
self.inputlines = pfile("stdin",sys.stdin.readlines())
else:
self.inputlines = pfilepath(self.inputfile)
def write_out(self):
- f=open(self.sitesfile+"-tmp",'w')
+ if self.outputfile is None:
+ f=sys.stdout
+ else:
+ f=open(self.outputfile+"-tmp",'w')
f.write("# sites file autogenerated by make-secnet-sites\n")
- f.write("# generated %s, invoked by %s\n"%
- (time.asctime(time.localtime(time.time())),
- self.user))
+ self.write_out_heading(f)
f.write("# use make-secnet-sites to turn this file into a\n")
f.write("# valid /etc/secnet/sites.conf file\n\n")
self.write_out_contents(f)
f.write("# end of sites file\n")
- f.close()
- os.rename(self.sitesfile+"-tmp",self.sitesfile)
+ if self.outputfile is not None:
+ f.close()
+ os.rename(self.outputfile+"-tmp",self.outputfile)
class OpConf(OpBase):
opts = ['--conf']
help = 'sites.conf generation mode (default)'
- def is_service(self): return 0
- def positional_args(self, av):
- if len(av.arg)>3:
- print("Too many arguments")
- sys.exit(1)
- (self.inputfile, self.outputfile) = (av.arg + [None]*2)[0:2]
def check_group(self,group,w): pass
def write_out(self):
if self.outputfile is None:
class OpUserv(OpBase):
opts = ['--userv','-u']
help = 'userv service fragment update mode'
- def is_service(self): return 1
def positional_args(self, av):
if len(av.arg)!=4:
print("Wrong number of arguments")
sys.exit(1)
(self.header, self.groupfiledir,
- self.sitesfile, self.group) = av.arg
+ self.outputfile, self.group) = av.arg
self.group = Tainted(self.group,0,'command line')
# untrusted argument from caller
if "USERV_USER" not in os.environ:
os.rename(self.groupfiledir+"/T"+self.group.groupname(),
self.groupfiledir+"/R"+self.group.groupname())
OpBase.write_out(self)
+ def write_out_heading(self,f):
+ f.write("# generated %s, invoked by %s\n"%
+ (time.asctime(time.localtime(time.time())),
+ self.user))
def write_out_contents(self,f):
for i in self.headerinput: f.write(i)
files=os.listdir(self.groupfiledir)
def parse_args():
global opmode
- global service
global prefix
global key_prefix
global debug_level
debug_level = av.debug
debugrepr('av',av)
opmode = getattr(av,'opmode',OpConf)()
- service = opmode.is_service()
prefix = '' if av.prefix is None else av.prefix[0]
key_prefix = av.conf_key_prefix
output_version = av.output_version[0]