X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=4899dcf1820cf0813d3d57e75b34679d478b8392;hb=b8dd25e72950a8d9a997745f8855de369952bb14;hp=0f1e8bab8b7d99fc58788e833841a6d0f33a1286;hpb=1c31622d61a1382587f9478d0a36db34cfda8749;p=secnet.git

diff --git a/make-secnet-sites b/make-secnet-sites
index 0f1e8ba..4899dcf 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -76,7 +76,7 @@ from argparseactionnoyes import ActionNoYes
 
 VERSION="0.1.18"
 
-max_version = 1
+max_version = 2
 
 from sys import version_info
 if version_info.major == 2:  # for python2
@@ -86,7 +86,7 @@ if version_info.major == 2:  # for python2
     import io
     open=lambda f,m='r': io.open(f,m,encoding='utf-8')
 
-max={'rsa_bits':8200,'name':33,'dh_bits':8200}
+max={'rsa_bits':8200,'name':33,'dh_bits':8200,'algname':127}
 
 def debugrepr(*args):
 	if debug_level > 0:
@@ -253,6 +253,8 @@ def parse_args():
 	global key_prefix
 	global debug_level
 	global output_version
+	global pubkeys_dir
+	global pubkeys_install
 
 	ap = argparse.ArgumentParser(description='process secnet sites files')
 	ap.add_argument('--userv', '-u', action='store_true',
@@ -260,6 +262,11 @@ def parse_args():
 	ap.add_argument('--conf-key-prefix', action=ActionNoYes,
 			default=True,
 		 help='prefix conf file key names derived from sites data')
+	ap.add_argument('--pubkeys-install', action='store_true',
+			help='install public keys in public key directory')
+	ap.add_argument('--pubkeys-dir',  nargs=1,
+			help='public key directory',
+			default=['/var/lib/secnet/pubkeys'])
 	ap.add_argument('--output-version', nargs=1, type=int,
 			help='sites file output version',
 			default=[max_version])
@@ -274,6 +281,8 @@ def parse_args():
 	prefix = '' if av.prefix is None else av.prefix[0]
 	key_prefix = av.conf_key_prefix
 	output_version = av.output_version[0]
+	pubkeys_dir = av.pubkeys_dir[0]
+	pubkeys_install = av.pubkeys_install
 	if service:
 		if len(av.arg)!=4:
 			print("Wrong number of arguments")
@@ -413,15 +422,89 @@ class address (basetype):
 	def __str__(self):
 		return '"%s"; port %d'%(self.adr,self.port)
 
-class rsakey (basetype):
+class pubkey (basetype):
+	"Some kind of publie key"
+	def __init__(self,w):
+		self.a=w[1].name('algname')
+		self.d=w[2].base91();
+	def __str__(self):
+		return 'make-public("%s","%s")'%(self.a,self.d)
+	def forsites(self,version,xcopy,fs):
+		if version < 2: return []
+		return ['pub', self.a, self.d]
+	# forsites for properties which are from
+	# keywords with kw[2]=='pub' may not use copy.
+	# This is because the property values can be
+	# written out in sites file format during sites.conf
+	# construction (with --pubkeys-install), in which case
+	# the original input line is no longer available.
+
+class rsakey (pubkey):
 	"An RSA public key"
 	def __init__(self,w):
 		self.l=w[1].number(0,max['rsa_bits'],'rsa len')
 		self.e=w[2].bignum_10('rsa','rsa e')
 		self.n=w[3].bignum_10('rsa','rsa n')
 		if len(w) >= 5: w[4].email()
+		self.a='rsa1'
+		self.d=base91s_encode(b'%d %s %s' %
+				      (self.l,
+				       self.e.encode('ascii'),
+				       self.n.encode('ascii')))
+		# ^ this allows us to use the pubkey.forsites()
+		# method for output in versions>=2
 	def __str__(self):
 		return 'rsa-public("%s","%s")'%(self.e,self.n)
+		# this specialisation means we can generate files
+		# compatible with old secnet executables
+	def forsites(self,version,xcopy,fs):
+		if version < 2:
+			return ['pubkey', str(self.l), self.e, self.n]
+		return pubkey.forsites(self,version,xcopy,fs)
+
+class rsakey_newfmt(rsakey):
+	"An old-style RSA public key in new-style sites format"
+	# This is its own class simply to have its own constructor.
+	def __init__(self,w):
+		self.a=w[1].name()
+		assert(self.a == 'rsa1')
+		self.d=w[2].base91()
+		try:
+			w_inner=list(map(Tainted,
+					['X-PUB-RSA1'] +
+					base91s_decode(self.d)
+					.decode('ascii')
+					.split(' ')))
+		except UnicodeDecodeError:
+			complain('rsa1 key in new format has bad base91')
+		#print(repr(w_inner), file=sys.stderr)
+		rsakey.__init__(self,w_inner)
+
+class pubkey_group(basetype):
+	"Public key group introducer"
+	# appears in the site's list of keys mixed in with the keys
+	def __init__(self,w,fallback):
+		self.i=w[1].hexid(4,'pkg-id')
+		self.fallback=fallback
+	def forsites(self,version,xcopy,fs):
+		fs.pkg=self.i
+		if version < 2: return []
+		return ['pkgf' if self.fallback else 'pkg', self.i]
+	
+def somepubkey(w):
+	#print(repr(w), file=sys.stderr)
+	if w[0]=='pubkey':
+		return rsakey(w)
+	elif w[0]=='pub' and w[1]=='rsa1':
+		return rsakey_newfmt(w)
+	elif w[0]=='pub':
+		return pubkey(w)
+	elif w[0]=='pkg':
+		return pubkey_group(w,False)
+	elif w[0]=='pkgf':
+		return pubkey_group(w,True)
+	else:
+		assert(False)
 
 # Possible properties of configuration nodes
 keywords={
@@ -435,7 +518,11 @@ keywords={
  'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"),
  'restrict-nets':(networks,"Allowable networks"),
  'networks':(networks,"Claimed networks"),
- 'pubkey':(listof(rsakey),"RSA public site key"),
+ 'serial':(serial,"public key set serial"),
+ 'pkg':(listof(somepubkey),"start of public key group",'pub'),
+ 'pkgf':(listof(somepubkey),"start of fallback public key group",'pub'),
+ 'pub':(listof(somepubkey),"new style public site key"),
+ 'pubkey':(listof(somepubkey),"RSA public site key",'pub'),
  'peer':(single_ipaddr,"Tunnel peer IP address"),
  'address':(address,"External contact address and port"),
  'mobile':(boolean,"Site is mobile"),
@@ -555,6 +642,10 @@ class sitelevel(level):
 	 'address':sp,
 	 'networks':None,
 	 'peer':None,
+         'serial':None,
+	 'pkg':None,
+	 'pkgf':None,
+	 'pub':None,
 	 'pubkey':None,
 	 'mobile':sp,
 	})
@@ -564,8 +655,11 @@ class sitelevel(level):
 	 'networks':"Networks claimed by the site",
 	 'hash':"hash function",
 	 'peer':"Gateway address of the site",
-	 'pubkey':"RSA public key of the site",
 	}
+	def mangle_name(self):
+		return self.name.replace('/',',')
+	def pubkeys_path(self):
+		return pubkeys_dir + '/peer.' + self.mangle_name()
 	def __init__(self,w):
 		level.__init__(self,w)
 	def output_data(self,w,path):
@@ -576,7 +670,37 @@ class sitelevel(level):
 		self.indent(w,ind+2)
 		w.write("name \"%s\";\n"%(np,))
 		self.indent(w,ind+2)
-		w.write("key %s;\n"%str(self.properties["pubkey"].list[0]))
+		if pubkeys_install:
+			pa=self.pubkeys_path()
+			pw=open(pa+'~tmp','w')
+			if 'serial' in self.properties:
+				pw.write('serial %s\n' %
+					 self.properties['serial'])
+			fs=FilterState()
+			for k in self.properties["pub"].list:
+				debugrepr('pubkeys install', k)
+				wout=k.forsites(max_version,None,fs)
+				pw.write(' '.join(wout))
+				pw.write('\n')
+			pw.close()
+			os.rename(pa+'~tmp',pa+'~update')
+			w.write("peer-keys \"%s\";\n"%pa);
+		else:
+			use = None
+			indefault = True
+			for k in self.properties["pub"].list:
+				debugrepr('pub write', (use,indefault,k))
+				if isinstance(k,pubkey):
+					if indefault:
+						use = k
+						break
+					if use is None:
+						use = k
+				else:
+					raise RuntimeError('bad '+repr(k))
+			if use is None:
+				complain("site with no public key");
+			w.write("key %s;\n"%str(use))
 		self.output_props(w,ind+2)
 		self.indent(w,ind+2)
 		w.write("link netlink {\n");
@@ -631,7 +755,7 @@ class FilterState:
 	def reset(self):
 		# called when we enter a new node,
 		# in particular, at the start of each site
-		pass
+		self.pkg = '00000000'
 
 def pline(il,filterstate,allow_include=False):
 	"Process a configuration file line"