-#! /usr/bin/env python
+#! /usr/bin/env python3
#
# This file is part of secnet.
# See README for full list of copyright holders.
cd ~/secnet/sites-test/
execute ~/secnet/make-secnet-sites.py -u vpnheader groupfiles sites
-This program is part of secnet. It relies on the "ipaddr" library from
-Cendio Systems AB.
+This program is part of secnet.
"""
from __future__ import print_function
+from __future__ import unicode_literals
+from builtins import int
import string
import time
import os
import getopt
import re
+import argparse
-import ipaddr
+import ipaddress
# entry 0 is "near the executable", or maybe from PYTHONPATH=.,
# which we don't want to preempt
VERSION="0.1.18"
-# Are we being invoked from userv?
-service=0
-# If we are, which group does the caller want to modify?
-group=None
-
-if len(sys.argv)<2:
- inputfile=None
- of=sys.stdout
-else:
- if sys.argv[1]=='-u':
- if len(sys.argv)!=6:
+from sys import version_info
+if version_info.major == 2: # for python2
+ import codecs
+ sys.stdin = codecs.getreader('utf-8')(sys.stdin)
+ sys.stdout = codecs.getwriter('utf-8')(sys.stdout)
+ import io
+ open=lambda f,m='r': io.open(f,m,encoding='utf-8')
+
+def parse_args():
+ global service
+ global inputfile
+ global header
+ global groupfiledir
+ global sitesfile
+ global group
+ global user
+ global of
+
+ ap = argparse.ArgumentParser(description='process secnet sites files')
+ ap.add_argument('--userv', '-u', action='store_true',
+ help='userv service fragment update mode')
+ ap.add_argument('--prefix', '-P', nargs=1,
+ help='set prefix')
+ ap.add_argument('arg',nargs=argparse.REMAINDER)
+ av = ap.parse_args()
+ #print(repr(av), file=sys.stderr)
+ service = 1 if av.userv else 0
+ if service:
+ if len(av.arg)!=4:
print("Wrong number of arguments")
sys.exit(1)
- service=1
- header=sys.argv[2]
- groupfiledir=sys.argv[3]
- sitesfile=sys.argv[4]
- group=sys.argv[5]
+ (header, groupfiledir, sitesfile, group) = av.arg
if "USERV_USER" not in os.environ:
print("Environment variable USERV_USER not found")
sys.exit(1)
sys.exit(1)
ugs=os.environ["USERV_GROUP"]
ok=0
- for i in string.split(ugs):
+ for i in ugs.split():
if group==i: ok=1
if not ok:
print("caller not in group %s"%group)
sys.exit(1)
else:
- if sys.argv[1]=='-P':
- prefix=sys.argv[2]
- sys.argv[1:3]=[]
- if len(sys.argv)>3:
+ if len(av.arg)>3:
print("Too many arguments")
sys.exit(1)
- inputfile=sys.argv[1]
- of=sys.stdout
- if len(sys.argv)>2:
- of=open(sys.argv[2],'w')
+ (inputfile, outputfile) = (av.arg + [None]*2)[0:2]
+ if outputfile is None: of=sys.stdout
+ else: of=open(sys.argv[2],'w')
+
+parse_args()
# Classes describing possible datatypes in the configuration file
class single_ipaddr (basetype):
"An IP address"
def __init__(self,w):
- self.addr=ipaddr.IPAddress(w[1])
+ self.addr=ipaddress.ip_address(w[1])
def __str__(self):
return '"%s"'%self.addr
def __init__(self,w):
self.set=ipaddrset.IPAddressSet()
for i in w[1:]:
- x=ipaddr.IPNetwork(i,strict=True)
+ x=ipaddress.ip_network(i,strict=True)
self.set.append([x])
def __str__(self):
return ",".join(map((lambda n: '"%s"'%n), self.set.networks()))
class num (basetype):
"A decimal number"
def __init__(self,w):
- self.n=string.atol(w[1])
+ self.n=int(w[1])
def __str__(self):
return '%d'%(self.n)
"A DNS name and UDP port number"
def __init__(self,w):
self.adr=w[1]
- self.port=string.atoi(w[2])
+ self.port=int(w[2])
if (self.port<1 or self.port>65535):
complain("invalid port number")
def __str__(self):
class rsakey (basetype):
"An RSA public key"
def __init__(self,w):
- self.l=string.atoi(w[1])
+ self.l=int(w[1])
self.e=w[2]
self.n=w[3]
def __str__(self):
allow_properties={}
require_properties={}
def __init__(self,w):
+ self.type=w[0]
self.name=w[1]
self.properties={}
self.children={}
w.write("\n")
self.indent(w,ind+2)
w.write("all-sites %s;\n"%
- string.join(self.children.keys(),','))
+ ','.join(self.children.keys()))
self.indent(w,ind)
w.write("};\n")
self.indent(w,ind)
# The "h=h,self=self" abomination below exists because
# Python didn't support nested_scopes until version 2.1
- w.write("%s %s;\n"%(self.name,string.join(
+ w.write("%s %s;\n"%(self.name,','.join(
map(lambda x,h=h,self=self:
- h+"/"+x,self.children.keys()),',')))
+ h+"/"+x,self.children.keys()))))
class sitelevel(level):
"Site level (i.e. a leafnode) in the configuration hierarchy"
def pline(i,allow_include=False):
"Process a configuration file line"
global allow_defs, obstack, root
- w=string.split(i.rstrip('\n'))
+ w=i.rstrip('\n').split()
if len(w)==0: return [i]
keyword=w[0]
current=obstack[len(obstack)-1]
w.write("# secnet sites file autogenerated by make-secnet-sites "
+"version %s\n"%VERSION)
w.write("# %s\n"%time.asctime(time.localtime(time.time())))
- w.write("# Command line: %s\n\n"%string.join(sys.argv))
+ w.write("# Command line: %s\n\n"%' '.join(sys.argv))
# Raw VPN data section of file
w.write(prefix+"vpn-data {\n")
w.write("};\n")
# Flattened list of sites
- w.write(prefix+"all-sites %s;\n"%string.join(
+ w.write(prefix+"all-sites %s;\n"%",".join(
map(lambda x:"%svpn/%s/all-sites"%(prefix,x),
- root.children.keys()),","))
+ root.children.keys())))
line=0
file=None
return 0
def delempty(n):
"Delete nodes that have no leafnode children"
- for i in n.children.keys():
+ for i in list(n.children.keys()):
delempty(n.children[i])
if not live(n.children[i]):
del n.children[i]