make-secnet-sites

   1 #! /usr/bin/env python3
   2 #
   3 # This file is part of secnet.
   4 # See README for full list of copyright holders.
   5 #
   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.
  10 #
  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.
  15 #
  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.
  19
  20 """VPN sites file manipulation.
  21
  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.
  25
  26 A database file can be turned into a secnet configuration file simply:
  27 make-secnet-sites.py [infile [outfile]]
  28
  29 It would be wise to run secnet with the "--just-check-config" option
  30 before installing the output on a live system.
  31
  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:
  35
  36 make-secnet-sites.py -u header-filename groupfiles-directory output-file \
  37   group
  38
  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
  41 fragment is:
  42
  43 reset
  44 no-disconnect-hup
  45 no-suppress-args
  46 cd ~/secnet/sites-test/
  47 execute ~/secnet/make-secnet-sites.py -u vpnheader groupfiles sites
  48
  49 This program is part of secnet.
  50
  51 """
  52
  53 from __future__ import print_function
  54 from __future__ import unicode_literals
  55 from builtins import int
  56
  57 import string
  58 import time
  59 import sys
  60 import os
  61 import getopt
  62 import re
  63 import argparse
  64 import math
  65
  66 import ipaddress
  67
  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")
  72 import ipaddrset
  73 import base91
  74
  75 from argparseactionnoyes import ActionNoYes
  76
  77 VERSION="0.1.18"
  78
  79 max_version = 1
  80
  81 from sys import version_info
  82 if version_info.major == 2:  # for python2
  83     import codecs
  84     sys.stdin = codecs.getreader('utf-8')(sys.stdin)
  85     sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
  86     import io
  87     open=lambda f,m='r': io.open(f,m,encoding='utf-8')
  88
  89 max={'rsa_bits':8200,'name':33,'dh_bits':8200}
  90
  91 def debugrepr(*args):
  92         if debug_level > 0:
  93                 print(repr(args), file=sys.stderr)
  94
  95 def base91s_encode(bindata):
  96         return base91.encode(bindata).replace('"',"-")
  97
  98 def base91s_decode(string):
  99         return base91.decode(string.replace("-",'"'))
 100
 101 class Tainted:
 102         def __init__(self,s,tline=None,tfile=None):
 103                 self._s=s
 104                 self._ok=None
 105                 self._line=line if tline is None else tline
 106                 self._file=file if tfile is None else tfile
 107         def __eq__(self,e):
 108                 return self._s==e
 109         def __ne__(self,e):
 110                 # for Python2
 111                 return not self.__eq__(e)
 112         def __str__(self):
 113                 raise RuntimeError('direct use of Tainted value')
 114         def __repr__(self):
 115                 return 'Tainted(%s)' % repr(self._s)
 116
 117         def _bad(self,what,why):
 118                 assert(self._ok is not True)
 119                 self._ok=False
 120                 complain('bad parameter: %s: %s' % (what, why))
 121                 return False
 122
 123         def _max_ok(self,what,maxlen):
 124                 if len(self._s) > maxlen:
 125                         return self._bad(what,'too long (max %d)' % maxlen)
 126                 return True
 127
 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')
 135                 return True
 136
 137         def _rtnval(self, is_ok, ifgood, ifbad=''):
 138                 if is_ok:
 139                         assert(self._ok is not False)
 140                         self._ok=True
 141                         return ifgood
 142                 else:
 143                         assert(self._ok is not True)
 144                         self._ok=False
 145                         return ifbad
 146
 147         def _rtn(self, is_ok, ifbad=''):
 148                 return self._rtnval(is_ok, self._s, ifbad)
 149
 150         def raw(self):
 151                 return self._s
 152         def raw_mark_ok(self):
 153                 # caller promises to throw if syntax was dangeorus
 154                 return self._rtn(True)
 155
 156         def output(self):
 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),
 161                       file=sys.stderr)
 162                 sys.exit(1)
 163
 164         bad_name=re.compile(r'^[^a-zA-Z]|[^-_0-9a-zA-Z]')
 165         # secnet accepts _ at start of names, but we reserve that
 166         bad_name_counter=0
 167         def name(self,what='name'):
 168                 ok=self._re_ok(Tainted.bad_name,what)
 169                 return self._rtn(ok,
 170                                  '_line%d_%s' % (self._line, id(self)))
 171
 172         def keyword(self):
 173                 ok=self._s in keywords or self._s in levels
 174                 if not ok:
 175                         complain('unknown keyword %s' % self._s)
 176                 return self._rtn(ok)
 177
 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)
 182                 return self._rtn(ok)
 183
 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)
 188                 return self._rtn(ok)
 189
 190         def number(self,minn,maxx,what='number'):
 191                 # not for bignums
 192                 ok=self._re_ok(Tainted.bad_num,what,10)
 193                 if ok:
 194                         v=int(self._s)
 195                         if v<minn or v>maxx:
 196                                 ok=self._bad(what,'out of range %d..%d'
 197                                              % (minn,maxx))
 198                 return self._rtnval(ok,v,minn)
 199
 200         def hexid(self,byteslen,what):
 201                 ok=self._re_ok(Tainted.bad_hex,what,byteslen*2)
 202                 if ok:
 203                         if len(self._s) < byteslen*2:
 204                                 ok=self._bad(what,'too short')
 205                 return self._rtn(ok,ifbad='00'*byteslen)
 206
 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.
 212         def host(self):
 213                 ok=self._re_ok(Tainted.bad_host,'host/address',255)
 214                 return self._rtn(ok)
 215
 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).
 221         def email(self):
 222                 ok=self._re_ok(Tainted.bad_email,'email address',1023)
 223                 return self._rtn(ok)
 224
 225         bad_groupname=re.compile(r'^[^_A-Za-z]|[^-+_0-9A-Za-z]')
 226         def groupname(self):
 227                 ok=self._re_ok(Tainted.bad_groupname,'group name',64)
 228                 return self._rtn(ok)
 229
 230         bad_base91=re.compile(r'[^!-~]|[\'\"\\]')
 231         def base91(self,what='base91'):
 232                 ok=self._re_ok(Tainted.bad_base91,what,4096)
 233                 return self._rtn(ok)
 234
 235 class ArgActionLambda(argparse.Action):
 236         def __init__(self, fn, **kwargs):
 237                 self.fn=fn
 238                 argparse.Action.__init__(self,**kwargs)
 239         def __call__(self,ap,ns,values,option_string):
 240                 self.fn(values,ns,ap,option_string)
 241
 242 def parse_args():
 243         global service
 244         global inputfile
 245         global header
 246         global groupfiledir
 247         global sitesfile
 248         global outputfile
 249         global group
 250         global user
 251         global of
 252         global prefix
 253         global key_prefix
 254         global debug_level
 255         global output_version
 256
 257         ap = argparse.ArgumentParser(description='process secnet sites files')
 258         ap.add_argument('--userv', '-u', action='store_true',
 259                         help='userv service fragment update mode')
 260         ap.add_argument('--conf-key-prefix', action=ActionNoYes,
 261                         default=True,
 262                  help='prefix conf file key names derived from sites data')
 263         ap.add_argument('--output-version', nargs=1, type=int,
 264                         help='sites file output version',
 265                         default=[max_version])
 266         ap.add_argument('--prefix', '-P', nargs=1,
 267                         help='set prefix')
 268         ap.add_argument('--debug', '-D', action='count', default=0)
 269         ap.add_argument('arg',nargs=argparse.REMAINDER)
 270         av = ap.parse_args()
 271         debug_level = av.debug
 272         debugrepr('av',av)
 273         service = 1 if av.userv else 0
 274         prefix = '' if av.prefix is None else av.prefix[0]
 275         key_prefix = av.conf_key_prefix
 276         output_version = av.output_version[0]
 277         if service:
 278                 if len(av.arg)!=4:
 279                         print("Wrong number of arguments")
 280                         sys.exit(1)
 281                 (header, groupfiledir, sitesfile, group) = av.arg
 282                 group = Tainted(group,0,'command line')
 283                 # untrusted argument from caller
 284                 if "USERV_USER" not in os.environ:
 285                         print("Environment variable USERV_USER not found")
 286                         sys.exit(1)
 287                 user=os.environ["USERV_USER"]
 288                 # Check that group is in USERV_GROUP
 289                 if "USERV_GROUP" not in os.environ:
 290                         print("Environment variable USERV_GROUP not found")
 291                         sys.exit(1)
 292                 ugs=os.environ["USERV_GROUP"]
 293                 ok=0
 294                 for i in ugs.split():
 295                         if group==i: ok=1
 296                 if not ok:
 297                         print("caller not in group %s"%group)
 298                         sys.exit(1)
 299         else:
 300                 if len(av.arg)>3:
 301                         print("Too many arguments")
 302                         sys.exit(1)
 303                 (inputfile, outputfile) = (av.arg + [None]*2)[0:2]
 304
 305 parse_args()
 306
 307 # Classes describing possible datatypes in the configuration file
 308
 309 class basetype:
 310         "Common protocol for configuration types."
 311         def add(self,obj,w):
 312                 complain("%s %s already has property %s defined"%
 313                         (obj.type,obj.name,w[0].raw()))
 314         def forsites(self,version,copy,fs):
 315                 return copy
 316
 317 class conflist:
 318         "A list of some kind of configuration type."
 319         def __init__(self,subtype,w):
 320                 self.subtype=subtype
 321                 self.list=[subtype(w)]
 322         def add(self,obj,w):
 323                 self.list.append(self.subtype(w))
 324         def __str__(self):
 325                 return ', '.join(map(str, self.list))
 326         def forsites(self,version,copy,fs):
 327                 most_recent=self.list[len(self.list)-1]
 328                 return most_recent.forsites(version,copy,fs)
 329 def listof(subtype):
 330         return lambda w: conflist(subtype, w)
 331
 332 class single_ipaddr (basetype):
 333         "An IP address"
 334         def __init__(self,w):
 335                 self.addr=ipaddress.ip_address(w[1].raw_mark_ok())
 336         def __str__(self):
 337                 return '"%s"'%self.addr
 338
 339 class networks (basetype):
 340         "A set of IP addresses specified as a list of networks"
 341         def __init__(self,w):
 342                 self.set=ipaddrset.IPAddressSet()
 343                 for i in w[1:]:
 344                         x=ipaddress.ip_network(i.raw_mark_ok(),strict=True)
 345                         self.set.append([x])
 346         def __str__(self):
 347                 return ",".join(map((lambda n: '"%s"'%n), self.set.networks()))
 348
 349 class dhgroup (basetype):
 350         "A Diffie-Hellman group"
 351         def __init__(self,w):
 352                 self.mod=w[1].bignum_16('dh','dh mod')
 353                 self.gen=w[2].bignum_16('dh','dh gen')
 354         def __str__(self):
 355                 return 'diffie-hellman("%s","%s")'%(self.mod,self.gen)
 356
 357 class hash (basetype):
 358         "A choice of hash function"
 359         def __init__(self,w):
 360                 hname=w[1]
 361                 self.ht=hname.raw()
 362                 if (self.ht!='md5' and self.ht!='sha1'):
 363                         complain("unknown hash type %s"%(self.ht))
 364                         self.ht=None
 365                 else:
 366                         hname.raw_mark_ok()
 367         def __str__(self):
 368                 return '%s'%(self.ht)
 369
 370 class email (basetype):
 371         "An email address"
 372         def __init__(self,w):
 373                 self.addr=w[1].email()
 374         def __str__(self):
 375                 return '<%s>'%(self.addr)
 376
 377 class boolean (basetype):
 378         "A boolean"
 379         def __init__(self,w):
 380                 v=w[1]
 381                 if re.match('[TtYy1]',v.raw()):
 382                         self.b=True
 383                         v.raw_mark_ok()
 384                 elif re.match('[FfNn0]',v.raw()):
 385                         self.b=False
 386                         v.raw_mark_ok()
 387                 else:
 388                         complain("invalid boolean value");
 389         def __str__(self):
 390                 return ['False','True'][self.b]
 391
 392 class num (basetype):
 393         "A decimal number"
 394         def __init__(self,w):
 395                 self.n=w[1].number(0,0x7fffffff)
 396         def __str__(self):
 397                 return '%d'%(self.n)
 398
 399 class address (basetype):
 400         "A DNS name and UDP port number"
 401         def __init__(self,w):
 402                 self.adr=w[1].host()
 403                 self.port=w[2].number(1,65536,'port')
 404         def __str__(self):
 405                 return '"%s"; port %d'%(self.adr,self.port)
 406
 407 class rsakey (basetype):
 408         "An RSA public key"
 409         def __init__(self,w):
 410                 self.l=w[1].number(0,max['rsa_bits'],'rsa len')
 411                 self.e=w[2].bignum_10('rsa','rsa e')
 412                 self.n=w[3].bignum_10('rsa','rsa n')
 413                 if len(w) >= 5: w[4].email()
 414         def __str__(self):
 415                 return 'rsa-public("%s","%s")'%(self.e,self.n)
 416
 417 # Possible properties of configuration nodes
 418 keywords={
 419  'contact':(email,"Contact address"),
 420  'dh':(dhgroup,"Diffie-Hellman group"),
 421  'hash':(hash,"Hash function"),
 422  'key-lifetime':(num,"Maximum key lifetime (ms)"),
 423  'setup-timeout':(num,"Key setup timeout (ms)"),
 424  'setup-retries':(num,"Maximum key setup packet retries"),
 425  'wait-time':(num,"Time to wait after unsuccessful key setup (ms)"),
 426  'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"),
 427  'restrict-nets':(networks,"Allowable networks"),
 428  'networks':(networks,"Claimed networks"),
 429  'pubkey':(listof(rsakey),"RSA public site key"),
 430  'peer':(single_ipaddr,"Tunnel peer IP address"),
 431  'address':(address,"External contact address and port"),
 432  'mobile':(boolean,"Site is mobile"),
 433 }
 434
 435 def sp(name,value):
 436         "Simply output a property - the default case"
 437         return "%s %s;\n"%(name,value)
 438
 439 # All levels support these properties
 440 global_properties={
 441         'contact':(lambda name,value:"# Contact email address: %s\n"%(value)),
 442         'dh':sp,
 443         'hash':sp,
 444         'key-lifetime':sp,
 445         'setup-timeout':sp,
 446         'setup-retries':sp,
 447         'wait-time':sp,
 448         'renegotiate-time':sp,
 449         'restrict-nets':(lambda name,value:"# restrict-nets %s\n"%value),
 450 }
 451
 452 class level:
 453         "A level in the configuration hierarchy"
 454         depth=0
 455         leaf=0
 456         allow_properties={}
 457         require_properties={}
 458         def __init__(self,w):
 459                 self.type=w[0].keyword()
 460                 self.name=w[1].name()
 461                 self.properties={}
 462                 self.children={}
 463         def indent(self,w,t):
 464                 w.write("                 "[:t])
 465         def prop_out(self,n):
 466                 return self.allow_properties[n](n,str(self.properties[n]))
 467         def output_props(self,w,ind):
 468                 for i in sorted(self.properties.keys()):
 469                         if self.allow_properties[i]:
 470                                 self.indent(w,ind)
 471                                 w.write("%s"%self.prop_out(i))
 472         def kname(self):
 473                 return ((self.type[0].upper() if key_prefix else '')
 474                         + self.name)
 475         def output_data(self,w,path):
 476                 ind = 2*len(path)
 477                 self.indent(w,ind)
 478                 w.write("%s {\n"%(self.kname()))
 479                 self.output_props(w,ind+2)
 480                 if self.depth==1: w.write("\n");
 481                 for k in sorted(self.children.keys()):
 482                         c=self.children[k]
 483                         c.output_data(w,path+(c,))
 484                 self.indent(w,ind)
 485                 w.write("};\n")
 486
 487 class vpnlevel(level):
 488         "VPN level in the configuration hierarchy"
 489         depth=1
 490         leaf=0
 491         type="vpn"
 492         allow_properties=global_properties.copy()
 493         require_properties={
 494          'contact':"VPN admin contact address"
 495         }
 496         def __init__(self,w):
 497                 level.__init__(self,w)
 498         def output_vpnflat(self,w,path):
 499                 "Output flattened list of site names for this VPN"
 500                 ind=2*(len(path)+1)
 501                 self.indent(w,ind)
 502                 w.write("%s {\n"%(self.kname()))
 503                 for i in self.children.keys():
 504                         self.children[i].output_vpnflat(w,path+(self,))
 505                 w.write("\n")
 506                 self.indent(w,ind+2)
 507                 w.write("all-sites %s;\n"%
 508                         ','.join(map(lambda i: i.kname(),
 509                                      self.children.values())))
 510                 self.indent(w,ind)
 511                 w.write("};\n")
 512
 513 class locationlevel(level):
 514         "Location level in the configuration hierarchy"
 515         depth=2
 516         leaf=0
 517         type="location"
 518         allow_properties=global_properties.copy()
 519         require_properties={
 520          'contact':"Location admin contact address",
 521         }
 522         def __init__(self,w):
 523                 level.__init__(self,w)
 524                 self.group=w[2].groupname()
 525         def output_vpnflat(self,w,path):
 526                 ind=2*(len(path)+1)
 527                 self.indent(w,ind)
 528                 # The "path=path,self=self" abomination below exists because
 529                 # Python didn't support nested_scopes until version 2.1
 530                 #
 531                 #"/"+self.name+"/"+i
 532                 w.write("%s %s;\n"%(self.kname(),','.join(
 533                         map(lambda x,path=path,self=self:
 534                             '/'.join([prefix+"vpn-data"] + list(map(
 535                                     lambda i: i.kname(),
 536                                     path+(self,x)))),
 537                             self.children.values()))))
 538
 539 class sitelevel(level):
 540         "Site level (i.e. a leafnode) in the configuration hierarchy"
 541         depth=3
 542         leaf=1
 543         type="site"
 544         allow_properties=global_properties.copy()
 545         allow_properties.update({
 546          'address':sp,
 547          'networks':None,
 548          'peer':None,
 549          'pubkey':None,
 550          'mobile':sp,
 551         })
 552         require_properties={
 553          'dh':"Diffie-Hellman group",
 554          'contact':"Site admin contact address",
 555          'networks':"Networks claimed by the site",
 556          'hash':"hash function",
 557          'peer':"Gateway address of the site",
 558          'pubkey':"RSA public key of the site",
 559         }
 560         def __init__(self,w):
 561                 level.__init__(self,w)
 562         def output_data(self,w,path):
 563                 ind=2*len(path)
 564                 np='/'.join(map(lambda i: i.name, path))
 565                 self.indent(w,ind)
 566                 w.write("%s {\n"%(self.kname()))
 567                 self.indent(w,ind+2)
 568                 w.write("name \"%s\";\n"%(np,))
 569                 self.indent(w,ind+2)
 570                 w.write("key %s;\n"%str(self.properties["pubkey"].list[0]))
 571                 self.output_props(w,ind+2)
 572                 self.indent(w,ind+2)
 573                 w.write("link netlink {\n");
 574                 self.indent(w,ind+4)
 575                 w.write("routes %s;\n"%str(self.properties["networks"]))
 576                 self.indent(w,ind+4)
 577                 w.write("ptp-address %s;\n"%str(self.properties["peer"]))
 578                 self.indent(w,ind+2)
 579                 w.write("};\n")
 580                 self.indent(w,ind)
 581                 w.write("};\n")
 582
 583 # Levels in the configuration file
 584 # (depth,properties)
 585 levels={'vpn':vpnlevel, 'location':locationlevel, 'site':sitelevel}
 586
 587 def complain(msg):
 588         "Complain about a particular input line"
 589         moan(("%s line %d: "%(file,line))+msg)
 590 def moan(msg):
 591         "Complain about something in general"
 592         global complaints
 593         print(msg);
 594         if complaints is None: sys.exit(1)
 595         complaints=complaints+1
 596
 597 class UntaintedRoot():
 598         def __init__(self,s): self._s=s
 599         def name(self): return self._s
 600         def keyword(self): return self._s
 601
 602 root=level([UntaintedRoot(x) for x in ['root','root']])
 603 # All vpns are children of this node
 604 obstack=[root]
 605 allow_defs=0   # Level above which new definitions are permitted
 606
 607 def set_property(obj,w):
 608         "Set a property on a configuration node"
 609         prop=w[0]
 610         propname=prop.raw_mark_ok()
 611         kw=keywords[propname]
 612         if len(kw) >= 3: propname=kw[2] # for aliases
 613         if propname in obj.properties:
 614                 obj.properties[propname].add(obj,w)
 615         else:
 616                 obj.properties[propname]=kw[0](w)
 617         return obj.properties[propname]
 618
 619 class FilterState:
 620         def __init__(self):
 621                 self.reset()
 622         def reset(self):
 623                 # called when we enter a new node,
 624                 # in particular, at the start of each site
 625                 pass
 626
 627 def pline(il,filterstate,allow_include=False):
 628         "Process a configuration file line"
 629         global allow_defs, obstack, root
 630         w=il.rstrip('\n').split()
 631         if len(w)==0: return ['']
 632         w=list([Tainted(x) for x in w])
 633         keyword=w[0]
 634         current=obstack[len(obstack)-1]
 635         copyout_core=lambda: ' '.join([ww.output() for ww in w])
 636         indent='    '*len(obstack)
 637         copyout=lambda: [indent + copyout_core() + '\n']
 638         if keyword=='end-definitions':
 639                 keyword.raw_mark_ok()
 640                 allow_defs=sitelevel.depth
 641                 obstack=[root]
 642                 return copyout()
 643         if keyword=='include':
 644                 if not allow_include:
 645                         complain("include not permitted here")
 646                         return []
 647                 if len(w) != 2:
 648                         complain("include requires one argument")
 649                         return []
 650                 newfile=os.path.join(os.path.dirname(file),w[1].raw_mark_ok())
 651                 # ^ user of "include" is trusted so raw_mark_ok is good
 652                 return pfilepath(newfile,allow_include=allow_include)
 653         if keyword.raw() in levels:
 654                 # We may go up any number of levels, but only down by one
 655                 newdepth=levels[keyword.raw_mark_ok()].depth
 656                 currentdepth=len(obstack) # actually +1...
 657                 if newdepth<=currentdepth:
 658                         obstack=obstack[:newdepth]
 659                 if newdepth>currentdepth:
 660                         complain("May not go from level %d to level %d"%
 661                                 (currentdepth-1,newdepth))
 662                 # See if it's a new one (and whether that's permitted)
 663                 # or an existing one
 664                 current=obstack[len(obstack)-1]
 665                 tname=w[1].name()
 666                 if tname in current.children:
 667                         # Not new
 668                         current=current.children[tname]
 669                         if service and group and current.depth==2:
 670                                 if group!=current.group:
 671                                         complain("Incorrect group!")
 672                                 w[2].groupname()
 673                 else:
 674                         # New
 675                         # Ignore depth check for now
 676                         nl=levels[keyword.raw()](w)
 677                         if nl.depth<allow_defs:
 678                                 complain("New definitions not allowed at "
 679                                         "level %d"%nl.depth)
 680                                 # we risk crashing if we continue
 681                                 sys.exit(1)
 682                         current.children[tname]=nl
 683                         current=nl
 684                 filterstate.reset()
 685                 obstack.append(current)
 686                 return copyout()
 687         if keyword.raw() not in current.allow_properties:
 688                 complain("Property %s not allowed at %s level"%
 689                         (keyword.raw(),current.type))
 690                 return []
 691         elif current.depth == vpnlevel.depth < allow_defs:
 692                 complain("Not allowed to set VPN properties here")
 693                 return []
 694         else:
 695                 prop=set_property(current,w)
 696                 out=[copyout_core()]
 697                 out=prop.forsites(output_version,out,filterstate)
 698                 if len(out)==0: return [indent + '#', copyout_core(), '\n']
 699                 return [indent + ' '.join(out) + '\n']
 700
 701         complain("unknown keyword '%s'"%(keyword.raw()))
 702
 703 def pfilepath(pathname,allow_include=False):
 704         f=open(pathname)
 705         outlines=pfile(pathname,f.readlines(),allow_include=allow_include)
 706         f.close()
 707         return outlines
 708
 709 def pfile(name,lines,allow_include=False):
 710         "Process a file"
 711         global file,line
 712         file=name
 713         line=0
 714         outlines=[]
 715         filterstate = FilterState()
 716         for i in lines:
 717                 line=line+1
 718                 if (i[0]=='#'): continue
 719                 outlines += pline(i,filterstate,allow_include=allow_include)
 720         return outlines
 721
 722 def outputsites(w):
 723         "Output include file for secnet configuration"
 724         w.write("# secnet sites file autogenerated by make-secnet-sites "
 725                 +"version %s\n"%VERSION)
 726         w.write("# %s\n"%time.asctime(time.localtime(time.time())))
 727         w.write("# Command line: %s\n\n"%' '.join(sys.argv))
 728
 729         # Raw VPN data section of file
 730         w.write(prefix+"vpn-data {\n")
 731         for i in root.children.values():
 732                 i.output_data(w,(i,))
 733         w.write("};\n")
 734
 735         # Per-VPN flattened lists
 736         w.write(prefix+"vpn {\n")
 737         for i in root.children.values():
 738                 i.output_vpnflat(w,())
 739         w.write("};\n")
 740
 741         # Flattened list of sites
 742         w.write(prefix+"all-sites %s;\n"%",".join(
 743                 map(lambda x:"%svpn/%s/all-sites"%(prefix,x.kname()),
 744                         root.children.values())))
 745
 746 line=0
 747 file=None
 748 complaints=0
 749
 750 # Sanity check section
 751 # Delete nodes where leaf=0 that have no children
 752
 753 def live(n):
 754         "Number of leafnodes below node n"
 755         if n.leaf: return 1
 756         for i in n.children.keys():
 757                 if live(n.children[i]): return 1
 758         return 0
 759 def delempty(n):
 760         "Delete nodes that have no leafnode children"
 761         for i in list(n.children.keys()):
 762                 delempty(n.children[i])
 763                 if not live(n.children[i]):
 764                         del n.children[i]
 765
 766 # Check that all constraints are met (as far as I can tell
 767 # restrict-nets/networks/peer are the only special cases)
 768
 769 def checkconstraints(n,p,ra):
 770         new_p=p.copy()
 771         new_p.update(n.properties)
 772         for i in n.require_properties.keys():
 773                 if i not in new_p:
 774                         moan("%s %s is missing property %s"%
 775                                 (n.type,n.name,i))
 776         for i in new_p.keys():
 777                 if i not in n.allow_properties:
 778                         moan("%s %s has forbidden property %s"%
 779                                 (n.type,n.name,i))
 780         # Check address range restrictions
 781         if "restrict-nets" in n.properties:
 782                 new_ra=ra.intersection(n.properties["restrict-nets"].set)
 783         else:
 784                 new_ra=ra
 785         if "networks" in n.properties:
 786                 if not n.properties["networks"].set <= new_ra:
 787                         moan("%s %s networks out of bounds"%(n.type,n.name))
 788                 if "peer" in n.properties:
 789                         if not n.properties["networks"].set.contains(
 790                                 n.properties["peer"].addr):
 791                                 moan("%s %s peer not in networks"%(n.type,n.name))
 792         for i in n.children.keys():
 793                 checkconstraints(n.children[i],new_p,new_ra)
 794
 795 if service:
 796         headerinput=pfilepath(header,allow_include=True)
 797         userinput=sys.stdin.readlines()
 798         pfile("user input",userinput)
 799 else:
 800         if inputfile is None:
 801                 pfile("stdin",sys.stdin.readlines())
 802         else:
 803                 pfilepath(inputfile)
 804
 805 delempty(root)
 806 checkconstraints(root,{},ipaddrset.complete_set())
 807
 808 if complaints>0:
 809         if complaints==1: print("There was 1 problem.")
 810         else: print("There were %d problems."%(complaints))
 811         sys.exit(1)
 812 complaints=None # arranges to crash if we complain later
 813
 814 if service:
 815         # Put the user's input into their group file, and rebuild the main
 816         # sites file
 817         f=open(groupfiledir+"/T"+group.groupname(),'w')
 818         f.write("# Section submitted by user %s, %s\n"%
 819                 (user,time.asctime(time.localtime(time.time()))))
 820         f.write("# Checked by make-secnet-sites version %s\n\n"%VERSION)
 821         for i in userinput: f.write(i)
 822         f.write("\n")
 823         f.close()
 824         os.rename(groupfiledir+"/T"+group.groupname(),
 825                   groupfiledir+"/R"+group.groupname())
 826         f=open(sitesfile+"-tmp",'w')
 827         f.write("# sites file autogenerated by make-secnet-sites\n")
 828         f.write("# generated %s, invoked by %s\n"%
 829                 (time.asctime(time.localtime(time.time())),user))
 830         f.write("# use make-secnet-sites to turn this file into a\n")
 831         f.write("# valid /etc/secnet/sites.conf file\n\n")
 832         for i in headerinput: f.write(i)
 833         files=os.listdir(groupfiledir)
 834         for i in files:
 835                 if i[0]=='R':
 836                         j=open(groupfiledir+"/"+i)
 837                         f.write(j.read())
 838                         j.close()
 839         f.write("# end of sites file\n")
 840         f.close()
 841         os.rename(sitesfile+"-tmp",sitesfile)
 842 else:
 843         if outputfile is None:
 844                 of=sys.stdout
 845         else:
 846                 tmp_outputfile=outputfile+'~tmp~'
 847                 of=open(tmp_outputfile,'w')
 848         outputsites(of)
 849         if outputfile is not None:
 850                 os.rename(tmp_outputfile,outputfile)