1 #! /usr/bin/env python3
3 # This file is part of secnet.
4 # See README for full list of copyright holders.
6 # secnet is free software; you can redistribute it and/or modify it
7 # under the terms of the GNU General Public License as published by
8 # the Free Software Foundation; either version 3 of the License, or
9 # (at your option) any later version.
11 # secnet is distributed in the hope that it will be useful, but
12 # WITHOUT ANY WARRANTY; without even the implied warranty of
13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 # General Public License for more details.
16 # You should have received a copy of the GNU General Public License
17 # version 3 along with secnet; if not, see
18 # https://www.gnu.org/licenses/gpl.html.
20 """VPN sites file manipulation.
22 This program enables VPN site descriptions to be submitted for
23 inclusion in a central database, and allows the resulting database to
24 be turned into a secnet configuration file.
26 A database file can be turned into a secnet configuration file simply:
27 make-secnet-sites.py [infile [outfile]]
29 It would be wise to run secnet with the "--just-check-config" option
30 before installing the output on a live system.
32 The program expects to be invoked via userv to manage the database; it
33 relies on the USERV_USER and USERV_GROUP environment variables. The
34 command line arguments for this invocation are:
36 make-secnet-sites.py -u header-filename groupfiles-directory output-file \
39 All but the last argument are expected to be set by userv; the 'group'
40 argument is provided by the user. A suitable userv configuration file
46 cd ~/secnet/sites-test/
47 execute ~/secnet/make-secnet-sites.py -u vpnheader groupfiles sites
49 This program is part of secnet.
53 from __future__ import print_function
54 from __future__ import unicode_literals
55 from builtins import int
68 # entry 0 is "near the executable", or maybe from PYTHONPATH=.,
69 # which we don't want to preempt
70 sys.path.insert(1,"/usr/local/share/secnet")
71 sys.path.insert(1,"/usr/share/secnet")
75 from argparseactionnoyes import ActionNoYes
81 from sys import version_info
82 if version_info.major == 2: # for python2
84 sys.stdin = codecs.getreader('utf-8')(sys.stdin)
85 sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
87 open=lambda f,m='r': io.open(f,m,encoding='utf-8')
89 max={'rsa_bits':8200,'name':33,'dh_bits':8200,'algname':127}
93 print(repr(args), file=sys.stderr)
95 def base91s_encode(bindata):
96 return base91.encode(bindata).replace('"',"-")
98 def base91s_decode(string):
99 return base91.decode(string.replace("-",'"'))
102 def __init__(self,s,tline=None,tfile=None):
105 self._line=line if tline is None else tline
106 self._file=file if tfile is None else tfile
111 return not self.__eq__(e)
113 raise RuntimeError('direct use of Tainted value')
115 return 'Tainted(%s)' % repr(self._s)
117 def _bad(self,what,why):
118 assert(self._ok is not True)
120 complain('bad parameter: %s: %s' % (what, why))
123 def _max_ok(self,what,maxlen):
124 if len(self._s) > maxlen:
125 return self._bad(what,'too long (max %d)' % maxlen)
128 def _re_ok(self,bad,what,maxlen=None):
129 if maxlen is None: maxlen=max[what]
130 self._max_ok(what,maxlen)
131 if self._ok is False: return False
132 if bad.search(self._s):
133 #print(repr(self), file=sys.stderr)
134 return self._bad(what,'bad syntax')
137 def _rtnval(self, is_ok, ifgood, ifbad=''):
139 assert(self._ok is not False)
143 assert(self._ok is not True)
147 def _rtn(self, is_ok, ifbad=''):
148 return self._rtnval(is_ok, self._s, ifbad)
152 def raw_mark_ok(self):
153 # caller promises to throw if syntax was dangeorus
154 return self._rtn(True)
157 if self._ok is False: return ''
158 if self._ok is True: return self._s
159 print('%s:%d: unchecked/unknown additional data "%s"' %
160 (self._file,self._line,self._s),
164 bad_name=re.compile(r'^[^a-zA-Z]|[^-_0-9a-zA-Z]')
165 # secnet accepts _ at start of names, but we reserve that
167 def name(self,what='name'):
168 ok=self._re_ok(Tainted.bad_name,what)
170 '_line%d_%s' % (self._line, id(self)))
173 ok=self._s in keywords or self._s in levels
175 complain('unknown keyword %s' % self._s)
178 bad_hex=re.compile(r'[^0-9a-fA-F]')
179 def bignum_16(self,kind,what):
180 maxlen=(max[kind+'_bits']+3)/4
181 ok=self._re_ok(Tainted.bad_hex,what,maxlen)
184 bad_num=re.compile(r'[^0-9]')
185 def bignum_10(self,kind,what):
186 maxlen=math.ceil(max[kind+'_bits'] / math.log10(2))
187 ok=self._re_ok(Tainted.bad_num,what,maxlen)
190 def number(self,minn,maxx,what='number'):
192 ok=self._re_ok(Tainted.bad_num,what,10)
196 ok=self._bad(what,'out of range %d..%d'
198 return self._rtnval(ok,v,minn)
200 def hexid(self,byteslen,what):
201 ok=self._re_ok(Tainted.bad_hex,what,byteslen*2)
203 if len(self._s) < byteslen*2:
204 ok=self._bad(what,'too short')
205 return self._rtn(ok,ifbad='00'*byteslen)
207 bad_host=re.compile(r'[^-\][_.:0-9a-zA-Z]')
208 # We permit _ so we can refer to special non-host domains
209 # which have A and AAAA RRs. This is a crude check and we may
210 # still produce config files with syntactically invalid
211 # domains or addresses, but that is OK.
213 ok=self._re_ok(Tainted.bad_host,'host/address',255)
216 bad_email=re.compile(r'[^-._0-9a-z@!$%^&*=+~/]')
217 # ^ This does not accept all valid email addresses. That's
218 # not really possible with this input syntax. It accepts
219 # all ones that don't require quoting anywhere in email
220 # protocols (and also accepts some invalid ones).
222 ok=self._re_ok(Tainted.bad_email,'email address',1023)
225 bad_groupname=re.compile(r'^[^_A-Za-z]|[^-+_0-9A-Za-z]')
227 ok=self._re_ok(Tainted.bad_groupname,'group name',64)
230 bad_base91=re.compile(r'[^!-~]|[\'\"\\]')
231 def base91(self,what='base91'):
232 ok=self._re_ok(Tainted.bad_base91,what,4096)
235 class ArgActionLambda(argparse.Action):
236 def __init__(self, fn, **kwargs):
238 argparse.Action.__init__(self,**kwargs)
239 def __call__(self,ap,ns,values,option_string):
240 self.fn(values,ns,ap,option_string)
243 def site_start(self,pubkeys_path):
244 self._pa=pubkeys_path
245 self._fs = FilterState()
246 def site_serial(self,serial): pass
247 def write_key(self,k): pass
248 def site_finish(self,confw): pass
250 class PkmSingle(PkmBase):
252 help = 'write one public key per site to sites.conf'
253 def site_start(self,pubkeys_path):
254 PkmBase.site_start(self,pubkeys_path)
256 def write_key(self,k):
257 if k.okforonlykey(output_version,self._fs):
259 def site_finish(self,confw):
260 if len(self._outk) == 0:
261 complain("site with no public key");
262 elif len(self._outk) != 1:
263 debugrepr('outk ', self._outk)
265 "site with multiple public keys, without --pubkeys-install (maybe --output-version=1 would help"
268 confw.write("key %s;\n"%str(self._outk[0]))
270 class PkmInstall(PkmBase):
272 help = 'install public keys in public key directory'
273 def site_start(self,pubkeys_path):
274 PkmBase.site_start(self,pubkeys_path)
275 self._pw=open(self._pa+'~tmp','w')
276 def site_serial(self,serial):
277 self._pw.write('serial %s\n' % serial)
278 def write_key(self,k):
279 wout=k.forpub(output_version,self._fs)
280 self._pw.write(' '.join(wout))
282 def site_finish(self,confw):
284 os.rename(self._pa+'~tmp',self._pa+'~update')
285 PkmElide.site_finish(self,confw)
287 class PkmElide(PkmBase):
289 help = 'no public keys in sites.conf output nor in directory'
290 def site_finish(self,confw):
291 confw.write("peer-keys \"%s\";\n"%self._pa);
294 # Base case is reading a sites file from self.inputfilee.
295 # And writing a sites file to self.sitesfile.
296 def positional_args(self, av):
298 print("Too many arguments")
300 (self.inputfile, self.outputfile) = (av.arg + [None]*2)[0:2]
302 if self.inputfile is None:
303 self.inputlines = pfile("stdin",sys.stdin.readlines())
305 self.inputlines = pfilepath(self.inputfile)
307 if self.outputfile is None:
310 f=open(self.outputfile+"-tmp",'w')
311 f.write("# sites file autogenerated by make-secnet-sites\n")
312 self.write_out_heading(f)
313 f.write("# use make-secnet-sites to turn this file into a\n")
314 f.write("# valid /etc/secnet/sites.conf file\n\n")
315 self.write_out_contents(f)
316 f.write("# end of sites file\n")
317 if self.outputfile is not None:
319 os.rename(self.outputfile+"-tmp",self.outputfile)
321 class OpConf(OpBase):
323 help = 'sites.conf generation mode (default)'
324 def check_group(self,group,w): pass
326 if self.outputfile is None:
329 tmp_outputfile=self.outputfile+'~tmp~'
330 of=open(tmp_outputfile,'w')
332 if self.outputfile is not None:
333 os.rename(tmp_outputfile,self.outputfile)
335 class OpUserv(OpBase):
336 opts = ['--userv','-u']
337 help = 'userv service fragment update mode'
338 def positional_args(self, av):
340 print("Wrong number of arguments")
342 (self.header, self.groupfiledir,
343 self.outputfile, self.group) = av.arg
344 self.group = Tainted(self.group,0,'command line')
345 # untrusted argument from caller
346 if "USERV_USER" not in os.environ:
347 print("Environment variable USERV_USER not found")
349 self.user=os.environ["USERV_USER"]
350 # Check that group is in USERV_GROUP
351 if "USERV_GROUP" not in os.environ:
352 print("Environment variable USERV_GROUP not found")
354 ugs=os.environ["USERV_GROUP"]
356 for i in ugs.split():
357 if self.group==i: ok=1
359 print("caller not in group %s"%group)
361 def check_group(self,group,w):
362 if group!=self.group: complain("Incorrect group!")
365 self.headerinput=pfilepath(self.header,allow_include=True)
366 self.userinput=sys.stdin.readlines()
367 pfile("user input",self.userinput)
369 # Put the user's input into their group file, and
370 # rebuild the main sites file
371 f=open(self.groupfiledir+"/T"+self.group.groupname(),'w')
372 f.write("# Section submitted by user %s, %s\n"%
373 (self.user,time.asctime(time.localtime(time.time()))))
374 f.write("# Checked by make-secnet-sites version %s\n\n"
376 for i in self.userinput: f.write(i)
379 os.rename(self.groupfiledir+"/T"+self.group.groupname(),
380 self.groupfiledir+"/R"+self.group.groupname())
381 OpBase.write_out(self)
382 def write_out_heading(self,f):
383 f.write("# generated %s, invoked by %s\n"%
384 (time.asctime(time.localtime(time.time())),
386 def write_out_contents(self,f):
387 for i in self.headerinput: f.write(i)
388 files=os.listdir(self.groupfiledir)
391 j=open(self.groupfiledir+"/"+i)
400 global output_version
404 ap = argparse.ArgumentParser(description='process secnet sites files')
406 ap.add_argument(*how().opts, action=ArgActionLambda,
408 fn=(lambda v,ns,*x: setattr(ns,'opmode',how)),
412 ap.add_argument('--conf-key-prefix', action=ActionNoYes,
414 help='prefix conf file key names derived from sites data')
416 ap.add_argument('--pubkeys-'+how().opt, action=ArgActionLambda,
418 fn=(lambda v,ns,*x: setattr(ns,'pkm',how)),
423 ap.add_argument('--pubkeys-dir', nargs=1,
424 help='public key directory',
425 default=['/var/lib/secnet/pubkeys'])
426 ap.add_argument('--output-version', nargs=1, type=int,
427 help='sites file output version',
428 default=[max_version])
429 ap.add_argument('--prefix', '-P', nargs=1,
431 ap.add_argument('--debug', '-D', action='count', default=0)
432 ap.add_argument('arg',nargs=argparse.REMAINDER)
434 debug_level = av.debug
436 opmode = getattr(av,'opmode',OpConf)()
437 prefix = '' if av.prefix is None else av.prefix[0]
438 key_prefix = av.conf_key_prefix
439 output_version = av.output_version[0]
440 pubkeys_dir = av.pubkeys_dir[0]
441 pubkeys_mode = getattr(av,'pkm',PkmSingle)
442 opmode.positional_args(av)
446 # Classes describing possible datatypes in the configuration file
449 "Common protocol for configuration types."
451 complain("%s %s already has property %s defined"%
452 (obj.type,obj.name,w[0].raw()))
453 def forsites(self,version,copy,fs):
457 "A list of some kind of configuration type."
458 def __init__(self,subtype,w):
460 self.list=[subtype(w)]
462 self.list.append(self.subtype(w))
464 return ', '.join(map(str, self.list))
465 def forsites(self,version,copy,fs):
466 most_recent=self.list[len(self.list)-1]
467 return most_recent.forsites(version,copy,fs)
469 return lambda w: conflist(subtype, w)
471 class single_ipaddr (basetype):
473 def __init__(self,w):
474 self.addr=ipaddress.ip_address(w[1].raw_mark_ok())
476 return '"%s"'%self.addr
478 class networks (basetype):
479 "A set of IP addresses specified as a list of networks"
480 def __init__(self,w):
481 self.set=ipaddrset.IPAddressSet()
483 x=ipaddress.ip_network(i.raw_mark_ok(),strict=True)
486 return ",".join(map((lambda n: '"%s"'%n), self.set.networks()))
488 class dhgroup (basetype):
489 "A Diffie-Hellman group"
490 def __init__(self,w):
491 self.mod=w[1].bignum_16('dh','dh mod')
492 self.gen=w[2].bignum_16('dh','dh gen')
494 return 'diffie-hellman("%s","%s")'%(self.mod,self.gen)
496 class hash (basetype):
497 "A choice of hash function"
498 def __init__(self,w):
501 if (self.ht!='md5' and self.ht!='sha1'):
502 complain("unknown hash type %s"%(self.ht))
507 return '%s'%(self.ht)
509 class email (basetype):
511 def __init__(self,w):
512 self.addr=w[1].email()
514 return '<%s>'%(self.addr)
516 class boolean (basetype):
518 def __init__(self,w):
520 if re.match('[TtYy1]',v.raw()):
523 elif re.match('[FfNn0]',v.raw()):
527 complain("invalid boolean value");
529 return ['False','True'][self.b]
531 class num (basetype):
533 def __init__(self,w):
534 self.n=w[1].number(0,0x7fffffff)
538 class serial (basetype):
539 def __init__(self,w):
540 self.i=w[1].hexid(4,'serial')
543 def forsites(self,version,copy,fs):
544 if version < 2: return []
547 class address (basetype):
548 "A DNS name and UDP port number"
549 def __init__(self,w):
551 self.port=w[2].number(1,65536,'port')
553 return '"%s"; port %d'%(self.adr,self.port)
555 class inpub (basetype):
556 def forsites(self,version,xcopy,fs):
557 return self.forpub(version,fs)
559 class pubkey (inpub):
560 "Some kind of publie key"
561 def __init__(self,w):
562 self.a=w[1].name('algname')
563 self.d=w[2].base91();
565 return 'make-public("%s","%s")'%(self.a,self.d)
566 def forpub(self,version,fs):
567 if version < 2: return []
568 return ['pub', self.a, self.d]
569 def okforonlykey(self,version,fs):
570 return len(self.forpub(version,fs)) != 0
572 class rsakey (pubkey):
573 "An old-style RSA public key"
574 def __init__(self,w):
575 self.l=w[1].number(0,max['rsa_bits'],'rsa len')
576 self.e=w[2].bignum_10('rsa','rsa e')
577 self.n=w[3].bignum_10('rsa','rsa n')
578 if len(w) >= 5: w[4].email()
580 self.d=base91s_encode(b'%d %s %s' %
582 self.e.encode('ascii'),
583 self.n.encode('ascii')))
584 # ^ this allows us to use the pubkey.forsites()
585 # method for output in versions>=2
587 return 'rsa-public("%s","%s")'%(self.e,self.n)
588 # this specialisation means we can generate files
589 # compatible with old secnet executables
590 def forpub(self,version,fs):
592 if fs.pkg != '00000000': return []
593 return ['pubkey', str(self.l), self.e, self.n]
594 return pubkey.forpub(self,version,fs)
596 class rsakey_newfmt(rsakey):
597 "An old-style RSA public key in new-style sites format"
598 # This is its own class simply to have its own constructor.
599 def __init__(self,w):
601 assert(self.a == 'rsa1')
604 w_inner=list(map(Tainted,
606 base91s_decode(self.d)
609 except UnicodeDecodeError:
610 complain('rsa1 key in new format has bad base91')
611 #print(repr(w_inner), file=sys.stderr)
612 rsakey.__init__(self,w_inner)
614 class pubkey_group(inpub):
615 "Public key group introducer"
616 # appears in the site's list of keys mixed in with the keys
617 def __init__(self,w,fallback):
618 self.i=w[1].hexid(4,'pkg-id')
619 self.fallback=fallback
620 def forpub(self,version,fs):
622 if version < 2: return []
623 return ['pkgf' if self.fallback else 'pkg', self.i]
624 def okforonlykey(self,version,fs):
625 self.forpub(version,fs)
629 #print(repr(w), file=sys.stderr)
632 elif w[0]=='pub' and w[1]=='rsa1':
633 return rsakey_newfmt(w)
637 return pubkey_group(w,False)
639 return pubkey_group(w,True)
643 # Possible properties of configuration nodes
645 'contact':(email,"Contact address"),
646 'dh':(dhgroup,"Diffie-Hellman group"),
647 'hash':(hash,"Hash function"),
648 'key-lifetime':(num,"Maximum key lifetime (ms)"),
649 'setup-timeout':(num,"Key setup timeout (ms)"),
650 'setup-retries':(num,"Maximum key setup packet retries"),
651 'wait-time':(num,"Time to wait after unsuccessful key setup (ms)"),
652 'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"),
653 'restrict-nets':(networks,"Allowable networks"),
654 'networks':(networks,"Claimed networks"),
655 'serial':(serial,"public key set serial"),
656 'pkg':(listof(somepubkey),"start of public key group",'pub'),
657 'pkgf':(listof(somepubkey),"start of fallback public key group",'pub'),
658 'pub':(listof(somepubkey),"new style public site key"),
659 'pubkey':(listof(somepubkey),"Old-style RSA public site key",'pub'),
660 'peer':(single_ipaddr,"Tunnel peer IP address"),
661 'address':(address,"External contact address and port"),
662 'mobile':(boolean,"Site is mobile"),
666 "Simply output a property - the default case"
667 return "%s %s;\n"%(name,value)
669 # All levels support these properties
671 'contact':(lambda name,value:"# Contact email address: %s\n"%(value)),
678 'renegotiate-time':sp,
679 'restrict-nets':(lambda name,value:"# restrict-nets %s\n"%value),
683 "A level in the configuration hierarchy"
687 require_properties={}
688 def __init__(self,w):
689 self.type=w[0].keyword()
690 self.name=w[1].name()
693 def indent(self,w,t):
695 def prop_out(self,n):
696 return self.allow_properties[n](n,str(self.properties[n]))
697 def output_props(self,w,ind):
698 for i in sorted(self.properties.keys()):
699 if self.allow_properties[i]:
701 w.write("%s"%self.prop_out(i))
703 return ((self.type[0].upper() if key_prefix else '')
705 def output_data(self,w,path):
708 w.write("%s {\n"%(self.kname()))
709 self.output_props(w,ind+2)
710 if self.depth==1: w.write("\n");
711 for k in sorted(self.children.keys()):
713 c.output_data(w,path+(c,))
717 class vpnlevel(level):
718 "VPN level in the configuration hierarchy"
722 allow_properties=global_properties.copy()
724 'contact':"VPN admin contact address"
726 def __init__(self,w):
727 level.__init__(self,w)
728 def output_vpnflat(self,w,path):
729 "Output flattened list of site names for this VPN"
732 w.write("%s {\n"%(self.kname()))
733 for i in self.children.keys():
734 self.children[i].output_vpnflat(w,path+(self,))
737 w.write("all-sites %s;\n"%
738 ','.join(map(lambda i: i.kname(),
739 self.children.values())))
743 class locationlevel(level):
744 "Location level in the configuration hierarchy"
748 allow_properties=global_properties.copy()
750 'contact':"Location admin contact address",
752 def __init__(self,w):
753 level.__init__(self,w)
754 self.group=w[2].groupname()
755 def output_vpnflat(self,w,path):
758 # The "path=path,self=self" abomination below exists because
759 # Python didn't support nested_scopes until version 2.1
762 w.write("%s %s;\n"%(self.kname(),','.join(
763 map(lambda x,path=path,self=self:
764 '/'.join([prefix+"vpn-data"] + list(map(
767 self.children.values()))))
769 class sitelevel(level):
770 "Site level (i.e. a leafnode) in the configuration hierarchy"
774 allow_properties=global_properties.copy()
775 allow_properties.update({
787 'dh':"Diffie-Hellman group",
788 'contact':"Site admin contact address",
789 'networks':"Networks claimed by the site",
790 'hash':"hash function",
791 'peer':"Gateway address of the site",
793 def mangle_name(self):
794 return self.name.replace('/',',')
795 def pubkeys_path(self):
796 return pubkeys_dir + '/peer.' + self.mangle_name()
797 def __init__(self,w):
798 level.__init__(self,w)
799 def output_data(self,w,path):
801 np='/'.join(map(lambda i: i.name, path))
803 w.write("%s {\n"%(self.kname()))
805 w.write("name \"%s\";\n"%(np,))
809 debugrepr('pkm ',pkm)
810 pkm.site_start(self.pubkeys_path())
811 if 'serial' in self.properties:
812 pkm.site_serial(self.properties['serial'])
814 for k in self.properties["pub"].list:
815 debugrepr('pubkeys ', k)
820 self.output_props(w,ind+2)
822 w.write("link netlink {\n");
824 w.write("routes %s;\n"%str(self.properties["networks"]))
826 w.write("ptp-address %s;\n"%str(self.properties["peer"]))
832 # Levels in the configuration file
834 levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel}
837 "Complain about a particular input line"
838 moan(("%s line %d: "%(file,line))+msg)
840 "Complain about something in general"
843 if complaints is None: sys.exit(1)
844 complaints=complaints+1
846 class UntaintedRoot():
847 def __init__(self,s): self._s=s
848 def name(self): return self._s
849 def keyword(self): return self._s
851 root=level([UntaintedRoot(x) for x in ['root','root']])
852 # All vpns are children of this node
854 allow_defs=0 # Level above which new definitions are permitted
856 def set_property(obj,w):
857 "Set a property on a configuration node"
859 propname=prop.raw_mark_ok()
860 kw=keywords[propname]
861 if len(kw) >= 3: propname=kw[2] # for aliases
862 if propname in obj.properties:
863 obj.properties[propname].add(obj,w)
865 obj.properties[propname]=kw[0](w)
866 return obj.properties[propname]
872 # called when we enter a new node,
873 # in particular, at the start of each site
874 self.pkg = '00000000'
876 def pline(il,filterstate,allow_include=False):
877 "Process a configuration file line"
878 global allow_defs, obstack, root
879 w=il.rstrip('\n').split()
880 if len(w)==0: return ['']
881 w=list([Tainted(x) for x in w])
883 current=obstack[len(obstack)-1]
884 copyout_core=lambda: ' '.join([ww.output() for ww in w])
885 indent=' '*len(obstack)
886 copyout=lambda: [indent + copyout_core() + '\n']
887 if keyword=='end-definitions':
888 keyword.raw_mark_ok()
889 allow_defs=sitelevel.depth
892 if keyword=='include':
893 if not allow_include:
894 complain("include not permitted here")
897 complain("include requires one argument")
899 newfile=os.path.join(os.path.dirname(file),w[1].raw_mark_ok())
900 # ^ user of "include" is trusted so raw_mark_ok is good
901 return pfilepath(newfile,allow_include=allow_include)
902 if keyword.raw() in levels:
903 # We may go up any number of levels, but only down by one
904 newdepth=levels[keyword.raw_mark_ok()].depth
905 currentdepth=len(obstack) # actually +1...
906 if newdepth<=currentdepth:
907 obstack=obstack[:newdepth]
908 if newdepth>currentdepth:
909 complain("May not go from level %d to level %d"%
910 (currentdepth-1,newdepth))
911 # See if it's a new one (and whether that's permitted)
913 current=obstack[len(obstack)-1]
915 if tname in current.children:
917 current=current.children[tname]
919 opmode.check_group(current.group, w)
922 # Ignore depth check for now
923 nl=levels[keyword.raw()](w)
924 if nl.depth<allow_defs:
925 complain("New definitions not allowed at "
927 # we risk crashing if we continue
929 current.children[tname]=nl
932 obstack.append(current)
934 if keyword.raw() not in current.allow_properties:
935 complain("Property %s not allowed at %s level"%
936 (keyword.raw(),current.type))
938 elif current.depth == vpnlevel.depth < allow_defs:
939 complain("Not allowed to set VPN properties here")
942 prop=set_property(current,w)
944 out=prop.forsites(output_version,out,filterstate)
945 if len(out)==0: return [indent + '#', copyout_core(), '\n']
946 return [indent + ' '.join(out) + '\n']
948 complain("unknown keyword '%s'"%(keyword.raw()))
950 def pfilepath(pathname,allow_include=False):
952 outlines=pfile(pathname,f.readlines(),allow_include=allow_include)
956 def pfile(name,lines,allow_include=False):
962 filterstate = FilterState()
965 if (i[0]=='#'): continue
966 outlines += pline(i,filterstate,allow_include=allow_include)
970 "Output include file for secnet configuration"
971 w.write("# secnet sites file autogenerated by make-secnet-sites "
972 +"version %s\n"%VERSION)
973 w.write("# %s\n"%time.asctime(time.localtime(time.time())))
974 w.write("# Command line: %s\n\n"%' '.join(sys.argv))
976 # Raw VPN data section of file
977 w.write(prefix+"vpn-data {\n")
978 for i in root.children.values():
979 i.output_data(w,(i,))
982 # Per-VPN flattened lists
983 w.write(prefix+"vpn {\n")
984 for i in root.children.values():
985 i.output_vpnflat(w,())
988 # Flattened list of sites
989 w.write(prefix+"all-sites %s;\n"%",".join(
990 map(lambda x:"%svpn/%s/all-sites"%(prefix,x.kname()),
991 root.children.values())))
997 # Sanity check section
998 # Delete nodes where leaf=0 that have no children
1001 "Number of leafnodes below node n"
1003 for i in n.children.keys():
1004 if live(n.children[i]): return 1
1007 "Delete nodes that have no leafnode children"
1008 for i in list(n.children.keys()):
1009 delempty(n.children[i])
1010 if not live(n.children[i]):
1013 # Check that all constraints are met (as far as I can tell
1014 # restrict-nets/networks/peer are the only special cases)
1016 def checkconstraints(n,p,ra):
1018 new_p.update(n.properties)
1019 for i in n.require_properties.keys():
1021 moan("%s %s is missing property %s"%
1023 for i in new_p.keys():
1024 if i not in n.allow_properties:
1025 moan("%s %s has forbidden property %s"%
1027 # Check address range restrictions
1028 if "restrict-nets" in n.properties:
1029 new_ra=ra.intersection(n.properties["restrict-nets"].set)
1032 if "networks" in n.properties:
1033 if not n.properties["networks"].set <= new_ra:
1034 moan("%s %s networks out of bounds"%(n.type,n.name))
1035 if "peer" in n.properties:
1036 if not n.properties["networks"].set.contains(
1037 n.properties["peer"].addr):
1038 moan("%s %s peer not in networks"%(n.type,n.name))
1039 for i in n.children.keys():
1040 checkconstraints(n.children[i],new_p,new_ra)
1045 checkconstraints(root,{},ipaddrset.complete_set())
1048 if complaints==1: print("There was 1 problem.")
1049 else: print("There were %d problems."%(complaints))
1051 complaints=None # arranges to crash if we complain later