X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=16b124c9df5b9bc7d03e030d4c377d28d387cc02;hb=9da1f13b367a9e3cc6f65a16cb319708fd5f4dbf;hp=64459475d904b91fb4d825c0fcafe006ff388a25;hpb=a1645be43c2f8fc9f167bb9a9cc1259158d68ce6;p=secnet.git

diff --git a/make-secnet-sites b/make-secnet-sites
index 6445947..16b124c 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:
@@ -239,6 +239,51 @@ class ArgActionLambda(argparse.Action):
 	def __call__(self,ap,ns,values,option_string):
 		self.fn(values,ns,ap,option_string)
 
+class PkmBase():
+	def site_start(self,pubkeys_path):
+		self._pa=pubkeys_path
+		self._fs = FilterState()
+	def site_serial(self,serial): pass
+	def write_key(self,k): pass
+	def site_finish(self,confw): pass
+
+class PkmSingle(PkmBase):
+	opt = 'single'
+	help = 'write one public key per site to sites.conf'
+	def site_start(self,pubkeys_path):
+		PkmBase.site_start(self,pubkeys_path)
+		self._outk = []
+	def write_key(self,k):
+		if k.okforonlykey(output_version,self._fs):
+			self._outk.append(k)
+	def site_finish(self,confw):
+		if len(self._outk) == 0:
+			complain("site with no public key");
+		elif len(self._outk) != 1:
+			debugrepr('outk ', self._outk)
+			complain(
+ "site with multiple public keys, without --pubkeys-install (maybe --output-version=1 would help"
+			)
+		else:
+			confw.write("key %s;\n"%str(self._outk[0]))
+
+class PkmInstall(PkmBase):
+	opt = 'install'
+	help = 'install public keys in public key directory'
+	def site_start(self,pubkeys_path):
+		PkmBase.site_start(self,pubkeys_path)
+		self._pw=open(self._pa+'~tmp','w')
+	def site_serial(self,serial):
+		self._pw.write('serial %s\n' % serial)
+	def write_key(self,k):
+		wout=k.forpub(output_version,self._fs)
+		self._pw.write(' '.join(wout))
+		self._pw.write('\n')
+	def site_finish(self,confw):
+		self._pw.close()
+		os.rename(self._pa+'~tmp',self._pa+'~update')
+		confw.write("peer-keys \"%s\";\n"%self._pa);
+
 def parse_args():
 	global service
 	global inputfile
@@ -253,6 +298,8 @@ def parse_args():
 	global key_prefix
 	global debug_level
 	global output_version
+	global pubkeys_dir
+	global pubkeys_mode
 
 	ap = argparse.ArgumentParser(description='process secnet sites files')
 	ap.add_argument('--userv', '-u', action='store_true',
@@ -260,6 +307,16 @@ def parse_args():
 	ap.add_argument('--conf-key-prefix', action=ActionNoYes,
 			default=True,
 		 help='prefix conf file key names derived from sites data')
+	def add_pkm(how):
+		ap.add_argument('--pubkeys-'+how().opt, action=ArgActionLambda,
+			nargs=0,
+			fn=(lambda v,ns,*x: setattr(ns,'pkm',how)),
+			help=how().help)
+	add_pkm(PkmInstall)
+	add_pkm(PkmSingle)
+	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 +331,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_mode = getattr(av,'pkm',PkmSingle)
 	if service:
 		if len(av.arg)!=4:
 			print("Wrong number of arguments")
@@ -396,6 +455,15 @@ class num (basetype):
 	def __str__(self):
 		return '%d'%(self.n)
 
+class serial (basetype):
+	def __init__(self,w):
+		self.i=w[1].hexid(4,'serial')
+	def __str__(self):
+		return self.i
+	def forsites(self,version,copy,fs):
+		if version < 2: return []
+		return copy
+
 class address (basetype):
 	"A DNS name and UDP port number"
 	def __init__(self,w):
@@ -404,15 +472,93 @@ class address (basetype):
 	def __str__(self):
 		return '"%s"; port %d'%(self.adr,self.port)
 
-class rsakey (basetype):
+class inpub (basetype):
+	def forsites(self,version,xcopy,fs):
+		return self.forpub(version,fs)
+
+class pubkey (inpub):
+	"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 forpub(self,version,fs):
+		if version < 2: return []
+		return ['pub', self.a, self.d]
+	def okforonlykey(self,version,fs):
+		return len(self.forpub(version,fs)) != 0
+
+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 forpub(self,version,fs):
+		if version < 2:
+			if fs.pkg != '00000000': return []
+			return ['pubkey', str(self.l), self.e, self.n]
+		return pubkey.forpub(self,version,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(inpub):
+	"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 forpub(self,version,fs):
+		fs.pkg=self.i
+		if version < 2: return []
+		return ['pkgf' if self.fallback else 'pkg', self.i]
+	def okforonlykey(self,version,fs):
+		self.forpub(version,fs)
+		return False
+	
+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={
@@ -426,7 +572,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"),
@@ -546,6 +696,10 @@ class sitelevel(level):
 	 'address':sp,
 	 'networks':None,
 	 'peer':None,
+         'serial':None,
+	 'pkg':None,
+	 'pkgf':None,
+	 'pub':None,
 	 'pubkey':None,
 	 'mobile':sp,
 	})
@@ -555,8 +709,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):
@@ -567,7 +724,19 @@ 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]))
+
+		pkm = pubkeys_mode()
+		debugrepr('pkm ',pkm)
+		pkm.site_start(self.pubkeys_path())
+		if 'serial' in self.properties:
+			pkm.site_serial(self.properties['serial'])
+
+		for k in self.properties["pub"].list:
+			debugrepr('pubkeys ', k)
+			pkm.write_key(k)
+
+		pkm.site_finish(w)
+
 		self.output_props(w,ind+2)
 		self.indent(w,ind+2)
 		w.write("link netlink {\n");
@@ -622,7 +791,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"