X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=make-secnet-sites;h=0bdb6943bb93fa8e33b5d29a97e6c4ad226ba636;hb=db4b8821ec4768cc0b33ffaa83fdc1f9d96ea497;hp=4d8aacdb9d2b01da078dc4092bbfa21470cd40ff;hpb=c9fb510e23e466f2b040c8325ec96fe68b2cb8d4;p=secnet.git

diff --git a/make-secnet-sites b/make-secnet-sites
index 4d8aacd..0bdb694 100755
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -422,22 +422,22 @@ class address (basetype):
 	def __str__(self):
 		return '"%s"; port %d'%(self.adr,self.port)
 
-class pubkey (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 forsites(self,version,xcopy,fs):
+	def forpub(self,version,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.
+	def okforonlykey(self,version,fs):
+		return len(self.forpub(version,fs)) != 0
 
 class rsakey (pubkey):
 	"An RSA public key"
@@ -457,10 +457,11 @@ class rsakey (pubkey):
 		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):
+	def forpub(self,version,fs):
 		if version < 2:
+			if fs.pkg != '00000000': return []
 			return ['pubkey', str(self.l), self.e, self.n]
-		return pubkey.forsites(self,version,xcopy,fs)
+		return pubkey.forpub(self,version,fs)
 
 class rsakey_newfmt(rsakey):
 	"An old-style RSA public key in new-style sites format"
@@ -479,13 +480,33 @@ class rsakey_newfmt(rsakey):
 			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)
 
@@ -501,6 +522,9 @@ keywords={
  'renegotiate-time':(num,"Time after key setup to begin renegotiation (ms)"),
  'restrict-nets':(networks,"Allowable networks"),
  'networks':(networks,"Claimed networks"),
+ '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"),
@@ -622,6 +646,9 @@ class sitelevel(level):
 	 'address':sp,
 	 'networks':None,
 	 'peer':None,
+         'serial':None,
+	 'pkg':None,
+	 'pkgf':None,
 	 'pub':None,
 	 'pubkey':None,
 	 'mobile':sp,
@@ -647,34 +674,42 @@ class sitelevel(level):
 		self.indent(w,ind+2)
 		w.write("name \"%s\";\n"%(np,))
 		self.indent(w,ind+2)
+
 		if pubkeys_install:
 			pa=self.pubkeys_path()
 			pw=open(pa+'~tmp','w')
-			fs=FilterState()
-			for k in self.properties["pub"].list:
-				debugrepr('pubkeys install', k)
-				wout=k.forsites(max_version,None,fs)
+			if 'serial' in self.properties:
+				pw.write('serial %s\n' %
+					 self.properties['serial'])
+		else:
+			outk = []
+
+		fs=FilterState()
+		for k in self.properties["pub"].list:
+			debugrepr('pubkeys ', k)
+			if pubkeys_install:
+				wout=k.forpub(output_version,fs)
 				pw.write(' '.join(wout))
 				pw.write('\n')
+			else:
+				if k.okforonlykey(output_version,fs):
+					outk.append(k)
+
+		if pubkeys_install:
 			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:
+			if len(outk) == 0:
 				complain("site with no public key");
-			w.write("key %s;\n"%str(use))
+			elif len(outk) != 1:
+				debugrepr('outk ', outk)
+				complain(
+ "site with multiple public keys, without --pubkeys-install (maybe --output-version=1 would help"
+				)
+			else:
+				w.write("key %s;\n"%str(k))
+
 		self.output_props(w,ind+2)
 		self.indent(w,ind+2)
 		w.write("link netlink {\n");
@@ -729,7 +764,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"