sys.path.insert(1,"/usr/local/share/secnet")
sys.path.insert(1,"/usr/share/secnet")
import ipaddrset
+import base91
from argparseactionnoyes import ActionNoYes
VERSION="0.1.18"
+max_version = 1
+
from sys import version_info
if version_info.major == 2: # for python2
import codecs
import io
open=lambda f,m='r': io.open(f,m,encoding='utf-8')
-max={'rsa_bits':8200,'name':33,'dh_bits':8200}
+max={'rsa_bits':8200,'name':33,'dh_bits':8200,'algname':127}
def debugrepr(*args):
if debug_level > 0:
print(repr(args), file=sys.stderr)
+def base91s_encode(bindata):
+ return base91.encode(bindata).replace('"',"-")
+
+def base91s_decode(string):
+ return base91.decode(string.replace("-",'"'))
+
class Tainted:
def __init__(self,s,tline=None,tfile=None):
self._s=s
ok=self._re_ok(Tainted.bad_base91,what,4096)
return self._rtn(ok)
+class ArgActionLambda(argparse.Action):
+ def __init__(self, fn, **kwargs):
+ self.fn=fn
+ argparse.Action.__init__(self,**kwargs)
+ def __call__(self,ap,ns,values,option_string):
+ self.fn(values,ns,ap,option_string)
+
def parse_args():
global service
global inputfile
global prefix
global key_prefix
global debug_level
+ global output_version
ap = argparse.ArgumentParser(description='process secnet sites files')
ap.add_argument('--userv', '-u', action='store_true',
ap.add_argument('--conf-key-prefix', action=ActionNoYes,
default=True,
help='prefix conf file key names derived from sites data')
+ ap.add_argument('--output-version', nargs=1, type=int,
+ help='sites file output version',
+ default=[max_version])
ap.add_argument('--prefix', '-P', nargs=1,
help='set prefix')
ap.add_argument('--debug', '-D', action='count', default=0)
service = 1 if av.userv else 0
prefix = '' if av.prefix is None else av.prefix[0]
key_prefix = av.conf_key_prefix
+ output_version = av.output_version[0]
if service:
if len(av.arg)!=4:
print("Wrong number of arguments")
def add(self,obj,w):
complain("%s %s already has property %s defined"%
(obj.type,obj.name,w[0].raw()))
+ def forsites(self,version,copy,fs):
+ return copy
class conflist:
"A list of some kind of configuration type."
self.list.append(self.subtype(w))
def __str__(self):
return ', '.join(map(str, self.list))
+ def forsites(self,version,copy,fs):
+ most_recent=self.list[len(self.list)-1]
+ return most_recent.forsites(version,copy,fs)
def listof(subtype):
return lambda w: conflist(subtype, w)
def __str__(self):
return '%d'%(self.n)
+class serial (basetype):
+ def __init__(self,w):
+ self.i=w[1].hexid(4,'serial')
+ def __str__(self):
+ return self.i
+ def forsites(self,version,copy,fs):
+ if version < 2: return []
+ return copy
+
class address (basetype):
"A DNS name and UDP port number"
def __init__(self,w):
def __str__(self):
return '"%s"; port %d'%(self.adr,self.port)
-class rsakey (basetype):
+class pubkey (basetype):
+ "Some kind of publie key"
+ def __init__(self,w):
+ self.a=w[1].name('algname')
+ self.d=w[2].base91();
+ def __str__(self):
+ return 'make-public("%s","%s")'%(self.a,self.d)
+
+class rsakey (pubkey):
"An RSA public key"
def __init__(self,w):
self.l=w[1].number(0,max['rsa_bits'],'rsa len')
if len(w) >= 5: w[4].email()
def __str__(self):
return 'rsa-public("%s","%s")'%(self.e,self.n)
+ # this specialisation means we can generate files
+ # compatible with old secnet executables
+
+def somepubkey(w):
+ if w[0]=='pubkey':
+ return rsakey(w)
+ elif w[0]=='pub':
+ return pubkey(w)
+ else:
+ assert(False)
# Possible properties of configuration nodes
keywords={
'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"),
'restrict-nets':(networks,"Allowable networks"),
'networks':(networks,"Claimed networks"),
- 'pubkey':(listof(rsakey),"RSA public site key"),
+ 'pub':(listof(somepubkey),"new style public site key"),
+ 'pubkey':(listof(somepubkey),"RSA public site key",'pub'),
'peer':(single_ipaddr,"Tunnel peer IP address"),
'address':(address,"External contact address and port"),
'mobile':(boolean,"Site is mobile"),
'address':sp,
'networks':None,
'peer':None,
+ 'pub':None,
'pubkey':None,
'mobile':sp,
})
'networks':"Networks claimed by the site",
'hash':"hash function",
'peer':"Gateway address of the site",
- 'pubkey':"RSA public key of the site",
+ 'pub':"public key of the site",
}
def __init__(self,w):
level.__init__(self,w)
self.indent(w,ind+2)
w.write("name \"%s\";\n"%(np,))
self.indent(w,ind+2)
- w.write("key %s;\n"%str(self.properties["pubkey"].list[0]))
+ w.write("key %s;\n"%str(self.properties["pub"].list[0]))
self.output_props(w,ind+2)
self.indent(w,ind+2)
w.write("link netlink {\n");
obj.properties[propname].add(obj,w)
else:
obj.properties[propname]=kw[0](w)
+ return obj.properties[propname]
+class FilterState:
+ def __init__(self):
+ self.reset()
+ def reset(self):
+ # called when we enter a new node,
+ # in particular, at the start of each site
+ pass
-def pline(il,allow_include=False):
+def pline(il,filterstate,allow_include=False):
"Process a configuration file line"
global allow_defs, obstack, root
w=il.rstrip('\n').split()
w=list([Tainted(x) for x in w])
keyword=w[0]
current=obstack[len(obstack)-1]
- copyout=lambda: [' '*len(obstack) +
- ' '.join([ww.output() for ww in w]) +
- '\n']
+ copyout_core=lambda: ' '.join([ww.output() for ww in w])
+ indent=' '*len(obstack)
+ copyout=lambda: [indent + copyout_core() + '\n']
if keyword=='end-definitions':
keyword.raw_mark_ok()
allow_defs=sitelevel.depth
sys.exit(1)
current.children[tname]=nl
current=nl
+ filterstate.reset()
obstack.append(current)
return copyout()
if keyword.raw() not in current.allow_properties:
complain("Not allowed to set VPN properties here")
return []
else:
- set_property(current,w)
- return copyout()
+ prop=set_property(current,w)
+ out=[copyout_core()]
+ out=prop.forsites(output_version,out,filterstate)
+ if len(out)==0: return [indent + '#', copyout_core(), '\n']
+ return [indent + ' '.join(out) + '\n']
complain("unknown keyword '%s'"%(keyword.raw()))
file=name
line=0
outlines=[]
+ filterstate = FilterState()
for i in lines:
line=line+1
if (i[0]=='#'): continue
- outlines += pline(i,allow_include=allow_include)
+ outlines += pline(i,filterstate,allow_include=allow_include)
return outlines
def outputsites(w):
~ianmdlvl / secnet.git / blobdiff