make-secnet-sites: Introduce a superclass for the config types.

[secnet] / make-secnet-sites

diff --git a/make-secnet-sites b/make-secnet-sites
index a7f14de..371c82e 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -5,7 +5,7 @@
 #
 # secnet is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version d of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 # 
 # secnet is distributed in the hope that it will be useful, but
@@ -68,14 +68,18 @@ VERSION="0.1.18"
 
 # Classes describing possible datatypes in the configuration file
 
-class single_ipaddr:
+class basetype:
+       "Common protocol for configuration types."
+       pass
+
+class single_ipaddr (basetype):
        "An IP address"
        def __init__(self,w):
                self.addr=ipaddr.IPAddress(w[1])
        def __str__(self):
                return '"%s"'%self.addr
 
-class networks:
+class networks (basetype):
        "A set of IP addresses specified as a list of networks"
        def __init__(self,w):
                self.set=ipaddrset.IPAddressSet()
@@ -85,7 +89,7 @@ class networks:
        def __str__(self):
                return ",".join(map((lambda n: '"%s"'%n), self.set.networks()))
 
-class dhgroup:
+class dhgroup (basetype):
        "A Diffie-Hellman group"
        def __init__(self,w):
                self.mod=w[1]
@@ -93,23 +97,23 @@ class dhgroup:
        def __str__(self):
                return 'diffie-hellman("%s","%s")'%(self.mod,self.gen)
 
-class hash:
+class hash (basetype):
        "A choice of hash function"
        def __init__(self,w):
                self.ht=w[1]
-               if (self.ht!='md5' and self.ht!='sha1'):
+               if (self.ht not in ('md5', 'sha1', 'sha512')):
                        complain("unknown hash type %s"%(self.ht))
        def __str__(self):
                return '%s'%(self.ht)
 
-class email:
+class email (basetype):
        "An email address"
        def __init__(self,w):
                self.addr=w[1]
        def __str__(self):
                return '<%s>'%(self.addr)
 
-class boolean:
+class boolean (basetype):
        "A boolean"
        def __init__(self,w):
                if re.match('[TtYy1]',w[1]):
@@ -121,14 +125,14 @@ class boolean:
        def __str__(self):
                return ['False','True'][self.b]
 
-class num:
+class num (basetype):
        "A decimal number"
        def __init__(self,w):
                self.n=string.atol(w[1])
        def __str__(self):
                return '%d'%(self.n)
 
-class address:
+class address (basetype):
        "A DNS name and UDP port number"
        def __init__(self,w):
                self.adr=w[1]
@@ -138,7 +142,7 @@ class address:
        def __str__(self):
                return '"%s"; port %d'%(self.adr,self.port)
 
-class rsakey:
+class rsakey (basetype):
        "An RSA public key"
        def __init__(self,w):
                self.l=string.atoi(w[1])
@@ -267,7 +271,6 @@ 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={
@@ -381,13 +384,16 @@ def pline(i,allow_include=False):
                        current=nl
                obstack.append(current)
                return [i]
-       if current.allow_properties.has_key(keyword):
-               set_property(current,w)
-               return [i]
-       else:
+       if not current.allow_properties.has_key(keyword):
                complain("Property %s not allowed at %s level"%
                        (keyword,current.type))
                return []
+       elif current.depth == vpnlevel.depth < allow_defs:
+               complain("Not allowed to set VPN properties here")
+               return []
+       else:
+               set_property(current,w)
+               return [i]
 
        complain("unknown keyword '%s'"%(keyword))