sys.path.insert(1,"/usr/share/secnet")
import ipaddrset
+from argparseactionnoyes import ActionNoYes
+
VERSION="0.1.18"
from sys import version_info
max={'rsa_bits':8200,'name':33,'dh_bits':8200}
+def debugrepr(*args):
+ if debug_level > 0:
+ print(repr(args), file=sys.stderr)
+
class Tainted:
def __init__(self,s,tline=None,tfile=None):
self._s=s
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 bad.search(self._s): return self._bad(what,'bad syntax')
- return self
+ if self._ok is False: return False
+ if bad.search(self._s):
+ #print(repr(self), file=sys.stderr)
+ return self._bad(what,'bad syntax')
+ return True
def _rtnval(self, is_ok, ifgood, ifbad=''):
if is_ok:
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)))
% (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
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
+ global debug_level
ap = argparse.ArgumentParser(description='process secnet sites files')
ap.add_argument('--userv', '-u', action='store_true',
help='userv service fragment update mode')
+ ap.add_argument('--conf-key-prefix', action=ActionNoYes,
+ default=True,
+ help='prefix conf file key names derived from sites data')
ap.add_argument('--prefix', '-P', nargs=1,
help='set prefix')
+ ap.add_argument('--debug', '-D', action='count', default=0)
ap.add_argument('arg',nargs=argparse.REMAINDER)
av = ap.parse_args()
- #print(repr(av), file=sys.stderr)
+ debug_level = av.debug
+ debugrepr('av',av)
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:
print("Wrong number of arguments")
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()
'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"),
'restrict-nets':(networks,"Allowable networks"),
'networks':(networks,"Claimed networks"),
- 'pubkey':(rsakey,"RSA public site key"),
+ 'pubkey':(listof(rsakey),"RSA public site key"),
'peer':(single_ipaddr,"Tunnel peer IP address"),
'address':(address,"External contact address and port"),
'mobile':(boolean,"Site is mobile"),
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))
- def output_data(self,w,ind,np):
+ def kname(self):
+ return ((self.type[0].upper() if key_prefix else '')
+ + self.name)
+ def output_data(self,w,path):
+ ind = 2*len(path)
self.indent(w,ind)
- w.write("%s {\n"%(self.name))
+ 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():
- c.output_data(w,ind+2,np+self.name+"/")
+ for k in sorted(self.children.keys()):
+ c=self.children[k]
+ c.output_data(w,path+(c,))
self.indent(w,ind)
w.write("};\n")
}
def __init__(self,w):
level.__init__(self,w)
- def output_vpnflat(self,w,ind,h):
+ def output_vpnflat(self,w,path):
"Output flattened list of site names for this VPN"
+ ind=2*(len(path)+1)
self.indent(w,ind)
- w.write("%s {\n"%(self.name))
+ w.write("%s {\n"%(self.kname()))
for i in self.children.keys():
- self.children[i].output_vpnflat(w,ind+2,
- h+"/"+self.name+"/"+i)
+ self.children[i].output_vpnflat(w,path+(self,))
w.write("\n")
self.indent(w,ind+2)
w.write("all-sites %s;\n"%
- ','.join(self.children.keys()))
+ ','.join(map(lambda i: i.kname(),
+ self.children.values())))
self.indent(w,ind)
w.write("};\n")
def __init__(self,w):
level.__init__(self,w)
self.group=w[2].groupname()
- def output_vpnflat(self,w,ind,h):
+ def output_vpnflat(self,w,path):
+ ind=2*(len(path)+1)
self.indent(w,ind)
- # The "h=h,self=self" abomination below exists because
+ # The "path=path,self=self" abomination below exists because
# Python didn't support nested_scopes until version 2.1
- w.write("%s %s;\n"%(self.name,','.join(
- map(lambda x,h=h,self=self:
- h+"/"+x,self.children.keys()))))
+ #
+ #"/"+self.name+"/"+i
+ w.write("%s %s;\n"%(self.kname(),','.join(
+ map(lambda x,path=path,self=self:
+ '/'.join([prefix+"vpn-data"] + list(map(
+ lambda i: i.kname(),
+ path+(self,x)))),
+ self.children.values()))))
class sitelevel(level):
"Site level (i.e. a leafnode) in the configuration hierarchy"
'address':sp,
'networks':None,
'peer':None,
- 'pubkey':(lambda n,v:"key %s;\n"%v),
+ 'pubkey':None,
'mobile':sp,
})
require_properties={
}
def __init__(self,w):
level.__init__(self,w)
- def output_data(self,w,ind,np):
+ def output_data(self,w,path):
+ ind=2*len(path)
+ np='/'.join(map(lambda i: i.name, path))
self.indent(w,ind)
- w.write("%s {\n"%(self.name))
+ w.write("%s {\n"%(self.kname()))
self.indent(w,ind+2)
- w.write("name \"%s\";\n"%(np+self.name))
+ w.write("name \"%s\";\n"%(np,))
+ self.indent(w,ind+2)
+ w.write("key %s;\n"%str(self.properties["pubkey"].list[0]))
self.output_props(w,ind+2)
self.indent(w,ind+2)
w.write("link netlink {\n");
# (depth,properties)
levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel}
-# Reserved vpn/location/site names
-reserved={'all-sites':None}
-reserved.update(keywords)
-reserved.update(levels)
-
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():
# 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 len(kw) >= 3: propname=kw[2] # for aliases
+ 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):
# Raw VPN data section of file
w.write(prefix+"vpn-data {\n")
for i in root.children.values():
- i.output_data(w,2,"")
+ i.output_data(w,(i,))
w.write("};\n")
# Per-VPN flattened lists
w.write(prefix+"vpn {\n")
for i in root.children.values():
- i.output_vpnflat(w,2,prefix+"vpn-data")
+ i.output_vpnflat(w,())
w.write("};\n")
# Flattened list of sites
w.write(prefix+"all-sites %s;\n"%",".join(
- map(lambda x:"%svpn/%s/all-sites"%(prefix,x),
- root.children.keys())))
+ map(lambda x:"%svpn/%s/all-sites"%(prefix,x.kname()),
+ root.children.values())))
line=0
file=None
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)
~ianmdlvl / secnet.git / blobdiff