chiark / gitweb /
Static buffers: ipaddr_getbuf: Rename some variables
[secnet.git] / make-secnet-sites
index 4c6f0f4..ebf7468 100755 (executable)
@@ -56,11 +56,12 @@ import os
 import getopt
 import re
 
-# The ipaddr library is installed as part of secnet
-sys.path.append("/usr/local/share/secnet")
-sys.path.append("/usr/share/secnet")
 import ipaddr
 
+sys.path.insert(0,"/usr/local/share/secnet")
+sys.path.insert(0,"/usr/share/secnet")
+import ipaddrset
+
 VERSION="0.1.18"
 
 # Classes describing possible datatypes in the configuration file
@@ -68,22 +69,19 @@ VERSION="0.1.18"
 class single_ipaddr:
        "An IP address"
        def __init__(self,w):
-               self.addr=ipaddr.ipaddr(w[1])
+               self.addr=ipaddr.IPAddress(w[1])
        def __str__(self):
-               return '"%s"'%self.addr.ip_str()
+               return '"%s"'%self.addr
 
 class networks:
        "A set of IP addresses specified as a list of networks"
        def __init__(self,w):
-               self.set=ipaddr.ip_set()
+               self.set=ipaddrset.IPAddressSet()
                for i in w[1:]:
-                       x=string.split(i,"/")
-                       self.set.append(ipaddr.network(x[0],x[1],
-                               ipaddr.DEMAND_NETWORK))
+                       x=ipaddr.IPNetwork(i,strict=True)
+                       self.set.append([x])
        def __str__(self):
-               return string.join(map(lambda x:'"%s/%s"'%(x.ip_str(),
-                       x.mask.netmask_bits_str),
-                       self.set.as_list_of_networks()),",")
+               return ",".join(map((lambda n: '"%s"'%n), self.set.networks()))
 
 class dhgroup:
        "A Diffie-Hellman group"
@@ -267,12 +265,12 @@ class sitelevel(level):
         'networks':None,
         'peer':None,
         'pubkey':(lambda n,v:"key %s;\n"%v),
+        'address':(lambda n,v:"address %s;\n"%v),
         'mobile':sp,
        })
        require_properties={
         'dh':"Diffie-Hellman group",
         'contact':"Site admin contact address",
-        'address':"Site external access address",
         'networks':"Networks claimed by the site",
         'hash':"hash function",
         'peer':"Gateway address of the site",
@@ -320,6 +318,7 @@ def moan(msg):
 root=level(['root','root'])   # 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"
@@ -329,17 +328,26 @@ def set_property(obj,w):
        else:
                obj.properties[w[0]]=keywords[w[0]][0](w)
 
-def pline(i):
+def pline(i,allow_include=False):
        "Process a configuration file line"
        global allow_defs, obstack, root
-       w=string.split(i)
-       if len(w)==0: return
+       w=string.split(i.rstrip('\n'))
+       if len(w)==0: return [i]
        keyword=w[0]
        current=obstack[len(obstack)-1]
        if keyword=='end-definitions':
                allow_defs=sitelevel.depth
                obstack=[root]
-               return
+               return [i]
+       if keyword=='include':
+               if not allow_include:
+                       complain("include not permitted here")
+                       return []
+               if len(w) != 2:
+                       complain("include requires one argument")
+                       return []
+               newfile=os.path.join(os.path.dirname(file),w[1])
+               return pfilepath(newfile,allow_include=allow_include)
        if levels.has_key(keyword):
                # We may go up any number of levels, but only down by one
                newdepth=levels[keyword].depth
@@ -365,30 +373,39 @@ def pline(i):
                        if nl.depth<allow_defs:
                                complain("New definitions not allowed at "
                                        "level %d"%nl.depth)
+                               # we risk crashing if we continue
+                               sys.exit(1)
                        current.children[w[1]]=nl
                        current=nl
                obstack.append(current)
-               return
+               return [i]
        if current.allow_properties.has_key(keyword):
                set_property(current,w)
-               return
+               return [i]
        else:
                complain("Property %s not allowed at %s level"%
                        (keyword,current.type))
-               return
+               return []
 
        complain("unknown keyword '%s'"%(keyword))
 
-def pfile(name,lines):
+def pfilepath(pathname,allow_include=False):
+       f=open(pathname)
+       outlines=pfile(pathname,f.readlines(),allow_include=allow_include)
+       f.close()
+       return outlines
+
+def pfile(name,lines,allow_include=False):
        "Process a file"
        global file,line
        file=name
        line=0
+       outlines=[]
        for i in lines:
                line=line+1
                if (i[0]=='#'): continue
-               if (i[len(i)-1]=='\n'): i=i[:len(i)-1] # strip trailing LF
-               pline(i)
+               outlines += pline(i,allow_include=allow_include)
+       return outlines
 
 def outputsites(w):
        "Output include file for secnet configuration"
@@ -398,20 +415,21 @@ def outputsites(w):
        w.write("# Command line: %s\n\n"%string.join(sys.argv))
 
        # Raw VPN data section of file
-       w.write("vpn-data {\n")
+       w.write(prefix+"vpn-data {\n")
        for i in root.children.values():
                i.output_data(w,2,"")
        w.write("};\n")
 
        # Per-VPN flattened lists
-       w.write("vpn {\n")
+       w.write(prefix+"vpn {\n")
        for i in root.children.values():
-               i.output_vpnflat(w,2,"vpn-data")
+               i.output_vpnflat(w,2,prefix+"vpn-data")
        w.write("};\n")
 
        # Flattened list of sites
-       w.write("all-sites %s;\n"%string.join(map(lambda x:"vpn/%s/all-sites"%
-               x,root.children.keys()),","))
+       w.write(prefix+"all-sites %s;\n"%string.join(
+               map(lambda x:"%svpn/%s/all-sites"%(prefix,x),
+                       root.children.keys()),","))
 
 # Are we being invoked from userv?
 service=0
@@ -450,19 +468,17 @@ else:
                if not ok:
                        print "caller not in group %s"%group
                        sys.exit(1)
-               f=open(header)
-               headerinput=f.readlines()
-               f.close()
-               pfile(header,headerinput)
+               headerinput=pfilepath(header,allow_include=True)
                userinput=sys.stdin.readlines()
                pfile("user input",userinput)
        else:
+               if sys.argv[1]=='-P':
+                       prefix=sys.argv[2]
+                       sys.argv[1:3]=[]
                if len(sys.argv)>3:
                        print "Too many arguments"
                        sys.exit(1)
-               f=open(sys.argv[1])
-               pfile(sys.argv[1],f.readlines())
-               f.close()
+               pfilepath(sys.argv[1])
                of=sys.stdout
                if len(sys.argv)>2:
                        of=open(sys.argv[2],'w')
@@ -504,13 +520,7 @@ def checkconstraints(n,p,ra):
        else:
                new_ra=ra
        if n.properties.has_key("networks"):
-               # I'd like to do this:
-               # n.properties["networks"].set.is_subset(new_ra)
-               # but there isn't an is_subset() method
-               # Instead we see if we intersect with the complement of new_ra
-               rac=new_ra.complement()
-               i=rac.intersection(n.properties["networks"].set)
-               if not i.is_empty():
+               if not n.properties["networks"].set <= new_ra:
                        moan("%s %s networks out of bounds"%(n.type,n.name))
                if n.properties.has_key("peer"):
                        if not n.properties["networks"].set.contains(
@@ -519,7 +529,7 @@ def checkconstraints(n,p,ra):
        for i in n.children.keys():
                checkconstraints(n.children[i],new_p,new_ra)
 
-checkconstraints(root,{},ipaddr.complete_set)
+checkconstraints(root,{},ipaddrset.complete_set())
 
 if complaints>0:
        if complaints==1: print "There was 1 problem."