X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/zones/blobdiff_plain/92e992475fa9fae0b2b55f02142ee8df2e807a34..a1ab9d7efb02c2185980c2fd6a0a417a0f5a2b62:/distorted.lisp?ds=sidebyside

diff --git a/distorted.lisp b/distorted.lisp
index 416d98b..4a4b05a 100644
--- a/distorted.lisp
+++ b/distorted.lisp
@@ -3,188 +3,426 @@
 (load "hosts.lisp" :verbose nil)
 
 ;;;--------------------------------------------------------------------------
-;;; Network allocations
-;;; (RFC1918 addresses are allocated from Cambridge G-RIN.)
-
-(defnet inet 62.49.204.144/28)
-
-(defnet distorted.org.uk 172.29.198.0/23
-  (untrusted 256
-    (wireless 128)
-    (iodine 16))
-  (trusted 256
-    (fretwank 128
-      (unsafe 32)
-      (dhcp 32)
-      (safe 32))
-    (virtual 32)
-    (its 4)))
+;;; Anycast services.
+
+(defvar *anycast-routable-families* (list :ipv6))
+
+(defzoneparse :anycast (name data rec :prefix prefix :zname zname)
+  (destructuring-bind (any-provider default-provider &rest other-providers)
+      data
+
+    ;; First, the default address.  If the anycast network is preferred then
+    ;; this is easy; otherwise we have something complicated to do because
+    ;; IPv6 anycast addresses are globally routable, while IPv4 ones aren't.
+    (if (zone-preferred-subnet-p (car any-provider))
+	(zone-set-address #'rec (cdr any-provider) :make-ptr-p t)
+	(do-host (addr (cdr any-provider))
+	  (let ((family (ipaddr-family addr)))
+	    (if (member family *anycast-routable-families*)
+		(zone-set-address #'rec addr
+				  :family family :make-ptr-p t)
+		(zone-set-address #'rec (cdr default-provider)
+				  :family family :make-ptr-p nil)))))
+
+    ;; Now for all of the others.
+    (dolist (provider (list* any-provider default-provider other-providers))
+      (zone-set-address #'rec (cdr provider)
+			:make-ptr-p (eq provider any-provider)
+			:name (domain-name-concat prefix
+						  (zone-parse-host
+						   (car provider)
+						   zname))))))
 
 ;;;--------------------------------------------------------------------------
-;;; Host allocations
-
-;; External addresses.
-(defhost guvnor.inet (inet 1))
-(defhost radius.inet (inet 2))
-(defhost roadstar.inet (inet 3))
-(defhost jem.inet (inet 4))
-(defhost artist.inet (inet 5))
-(defhost vampire.inet (inet 6))
-(defhost ibanez.inet (inet 9))
-(defhost gate.inet (inet 13))
-(defhost nat.inet (inet 14))
-
-;; Unsafe network.
-(defhost radius (unsafe 1))
-(defhost roadstar (unsafe 2))
-(defhost jem (unsafe 3))
-(defhost artist (unsafe 4))
-(defhost vampire (unsafe 5))
-(defhost ibanez (unsafe 14))
-
-;; Safe network.
-(defhost tubescreamer (safe 1))
-(defhost obsidian (safe 2))
-
-;; Wireless network.
-(defhost radius.untrusted (untrusted 1))
-(defhost evolution (untrusted 2))
-(defhost vampire.untrusted (untrusted 3))
-
-;; Virtual private network.
-(defhost crybaby (virtual 1))
-(defhost terror (virtual 2))
-
-;; Iodine network.
-(defhost vampire.iodine (iodine 1))
-
-;; Special network for ITS.
-;; It doesn't understand point-to-point links, so we need a little net.
-(defhost gw (its 1))
-(defhost mz (its 2))
+;;; Hostname abbreviations.
+
+(defvar *abbrev-subdomain*
+  (make-domain-name :labels '("abbrev") :absolutep nil))
+(defparameter *abbrev-used* (make-hash-table :test #'equal))
+
+(defzoneparse :abbrev (name data rec :zname zname)
+  (let* ((domain (zone-parse-host data
+				  (domain-name-concat *abbrev-subdomain*
+						      zname)))
+	 (key (princ-to-string domain))
+	 (existing (gethash key *abbrev-used*)))
+    (when existing
+      (error "Abbrev collision for ~A between ~A and ~A."
+	     domain existing name))
+    (setf (gethash key *abbrev-used*) name)
+    (rec :name domain
+	 :type :cname
+	 :data name)))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other definitions.
 
 (setf *default-zone-admin* "hostmaster@distorted.org.uk")
 
-(setf *default-zone-source* 'vampire.distorted.org.uk.)
-(preferred-subnet-case
-  (fretwank
-   (defhost www-frontend vampire)
-   (defhost dns-frontend vampire))
-  (t
-   (defhost www-frontend vampire.inet)
-   (defhost dns-frontend vampire.inet)))
+(setf *default-zone-source* 'radius.distorted.org.uk.)
 
 ;;;--------------------------------------------------------------------------
 ;;; Main zone definition.
 
 (defzone distorted.org.uk
-  ;;
+
   ;; Nameservers.
-  :ns #+subnet/fretwank ((vampire.ns :ip vampire))
-      #-subnet/fretwank ((mythic-beasts-1.ns :ip mythic-ns1)
-			 (mythic-beasts-2.ns :ip mythic-ns2)
-			 (chiark.ns :ip chiark.greenend.org.uk)
-			 (radius.ns :ip radius.inet)
-			 (vampire.ns :ip vampire.inet))
-  ;;
+  :ns #+view/inside ((radius.ns :ip radius)
+		     (precision.ns :ip precision)
+		     (telecaster.ns :ip telecaster)
+		     (vampire.ns :ip vampire))
+      #-view/inside ((radius.ns :ip radius)
+		     (precision.ns :ip precision)
+		     (telecaster.ns :ip telecaster)
+		     (mythic-beasts-1.ns :ip mythic-ns1)
+		     (mythic-beasts-2.ns :ip mythic-ns2)
+		     (chiark.ns :ip chiark.greenend.org.uk))
+
   ;; Mail servers.
-  ((@ mail lists bugs cryptomail)
+  ((@ mail blackhole)
    :mx mail
    :srv ((:smtp mail)))
-  ;;
+  ((lists bugs cryptomail)
+   :ttl 300
+   :mx mail
+   :srv ((:smtp old-mail)))
+
+  (stratocaster.20140403._domainkey
+   :dkim ("stratocaster-20140403"
+	  :v "DKIM1" :k "rsa" :h "sha256" :s "email"))
+
+  ;; Anycast services.
+  (dns0 :anycast ((any dns0.any)
+		  (jump precision.jump)
+		  (colo precision.colo)
+		  (dmz radius.dmz)
+		  (unsafe radius.unsafe)))
+  (dns1 :anycast ((any dns1.any)
+		  (jump telecaster.jump)
+		  (dmz vampire.dmz)
+		  (unsafe vampire.unsafe)
+		  (colo telecaster.colo)))
+  (dns :cname dns0)
+
+  (ntp0 :anycast ((any ntp0.any)
+		  (jump fender.jump)
+		  (dmz ibanez.dmz)
+		  (unsafe ibanez.unsafe)
+		  (colo  fender.colo)))
+  (ntp1 :anycast ((any ntp1.any)
+		  (dmz vampire.dmz)
+		  (unsafe vampire.unsafe)))
+  (ntp :cname ntp0)
+
+  (www-cache :anycast ((any www-cache.any)
+		       (jump telecaster.jump)
+		       (dmz roadstar.dmz)
+		       (unsafe roadstar.unsafe)
+		       (colo telecaster.colo)))
+  (wpad :cname www-cache)
+
+  (_kerberos :txt "DISTORTED.ORG.UK")
+  (krb0 :anycast ((any krb0.any)
+		  (jump precision.jump)
+		  (dmz radius.dmz)
+		  (unsafe radius.unsafe)
+		  (colo precision.colo)))
+  (krb1 :anycast ((any krb1.any)
+		  (dmz vampire.dmz)
+		  (unsafe vampire.unsafe)))
+  (krb-master (unsafe :svc radius.unsafe)
+	      (dmz :svc radius.dmz))
+  :srv (((:kerberos :protocol :udp)
+	 krb0
+	 (krb1 :prio 100))
+	((:kerberos-master :protocol :udp :port 88) krb-master)
+	(:kerberos-adm krb-master)
+	((:kpasswd :protocol :udp) krb-master))
+  (krb :cname krb0)
+
   ;; Other services.
   :srv ((:http www)
 	(:ftp ftp))
-  ;;
-  ;; Entry is via little router box.
-  (inet :net inet)
-  (guvnor (inet :a guvnor.inet) (fretwank :svc gate.inet))
-  (gate (inet :a gate.inet))
-  (nat (inet :a nat.inet))
-  ;;
-  ;; Wireless gateway.
-  (untrusted :net untrusted)
-  (evolution (untrusted :a evolution))
-  ;;
+
+  ;; Colocated services.
+  ((irc vox keys) (colo :svc jazz.colo :sshfp "jazz")
+		  (jump :svc jazz.jump :sshfp "jazz"))
+  ((git www mail) (colo :svc stratocaster.colo :sshfp "stratocaster")
+		  (jump :svc stratocaster.jump :sshfp "stratocaster"))
+  ((www @) :tlsa (:https (:service-certificate-constraint
+			  :certificate :sha-256 #p"http-server-www#1")))
+  (git :tlsa (:https (:trust-anchor-assertion
+		      :certificate :sha-256 #p"distorted-ca")))
+  (www-cache :tlsa (3127 (:trust-anchor-assertion
+			  :certificate :sha-256 #p"distorted-ca")))
+  (mail :tlsa ((:smtp :submission :imap)
+	       (:trust-anchor-assertion
+		:certificate :sha-256 #p"distorted-ca")))
+  :svc #+view/inside stratocaster.colo
+       #-view/inside stratocaster.jump
+  (cabal :svc stratocaster.colo :sshfp "stratocaster")
+  ((db ftp) (colo :svc telecaster.colo :sshfp "telecaster")
+	    (jump :svc telecaster.jump :sshfp "telecaster"))
+  (dyndns :svc telecaster.jump :sshfp "telecaster")
+
   ;; Local services.
-  (@ :svc www-frontend)
-  ((www ftp wiki git bugs mail db tor i2p rawk vox www-cache)
-   (inet :svc vampire.inet)
-   (fretwank :svc vampire))
-  ;;
+  ((rawk pifi) (unsafe :svc artist.unsafe)
+	       (dmz :svc artist.dmz))
+  (mirror (dmz :svc roadstar.dmz :sshfp "roadstar")
+	  (unsafe :svc roadstar.unsafe :sshfp "roadstar"))
+  ((wiki bugs old-mail i2p) :svc vampire :sshfp "vampire")
+
   ;; Internal services.
-  ((ntp) (fretwank :svc ibanez))
-  ((wpad ntp1 news) (fretwank :svc vampire))
-  ;;
+  #+view/inside ((news lpr) :svc vampire.unsafe :sshfp "vampire")
+
+  ;; Anonymity services.
+  (anon (colo :svc jazz.colo)
+	(unsafe :svc vampire.unsafe)
+	(jump :addr anon.jump)
+	(dmz :addr anon.dmz))
+
+  ;; Fancy connectivity.
+  (iodine (jump :svc jazz.jump))
+
+  ;; Colocated hosts.
+  (colo :net colo)
+  (jump :net jump)
+  (gate (jump :addr gate.jump :sshfp "precision"))
+  (fender :abbrev f (colo :abbrev fc) (jump :abbrev fj))
+  (fender (colo :addr fender.colo :sshfp "fender")
+	  (jump :addr fender.jump :sshfp "fender"))
+  (precision :abbrev p (colo :abbrev pc) (jump :abbrev pj) (vpn :abbrev pv))
+  (precision (colo :addr precision.colo :sshfp "precision")
+	     (jump :addr precision.jump :sshfp "precision")
+	     (vpn :addr precision.vpn :sshfp "precision"))
+  (telecaster :alias tele :abbrev t
+	      (colo :alias tele.colo :abbrev tc)
+	      (jump :alias tele.jump :abbrev tj))
+  (telecaster (colo :addr telecaster.colo :sshfp "telecaster")
+	      (jump :addr telecaster.jump :sshfp "telecaster"))
+  (stratocaster :alias strat :abbrev s
+		(colo :alias strat.colo :abbrev sc)
+		(jump :alias strat.jump :abbrev sj))
+  (stratocaster (colo :addr stratocaster.colo :sshfp "stratocaster")
+		(jump :addr stratocaster.jump :sshfp "stratocaster"))
+  (jazz :abbrev z (colo :abbrev zc) (jump :abbrev zj) (vpn :abbrev :zv))
+  (jazz (colo :addr jazz.colo :sshfp "jazz")
+	(jump :addr jazz.jump :sshfp "jazz")
+	(vpn :addr jazz.vpn :sshfp "jazz")
+	(iodine :addr jazz.iodine :sshfp "jazz"))
+
+  ;; Media server (on loan to Good Technology HSTG).
+  (jaguar :abbrev jag)
+  (jaguar (jump :addr jaguar.jump :sshfp "jaguar"))
+
+  ;; Nicko's server.
+  (richmond (jump :svc richmond.jump))
+
+  ;; Entry is via little router box.
+  (dmz :net dmz)
+  (guvnor (dmz :addr guvnor.dmz))
+  (nat (dmz :addr nat.dmz))
+
+  ;; Wireless gateway.
+  (wireless :net wireless)
+  (evolution (safe :addr evolution.safe))
+  (evolution :alias evo)
+
+  ;; Switches.
+  (grigsby :alias tp0)
+  (grigsby (safe :addr grigsby.safe))
+  (carling :alias tp1)
+  (carling (safe :addr carling.safe))
+  (tritan :alias tp2)
+  (tritan (safe :addr tritan.safe))
+
   ;; Wired ethernet.
-  (fretwank :net fretwank)
-  (vampire (fretwank :a vampire)
-	   (inet :a vampire.inet)
-	   (untrusted :a vampire.untrusted)
-	   (iodine :a vampire.iodine))
-  (obsidian (fretwank :a obsidian))
-  (ibanez (fretwank :a ibanez)
-	  (inet :a ibanez.inet))
-  (radius (fretwank :a radius)
-	  (inet :a radius.inet)
-	  (untrusted :a radius.untrusted))
-  (roadstar (fretwank :a roadstar)
-	    (inet :a roadstar.inet))
-  (jem (fretwank :a jem)
-       (inet :a jem.inet))
-  (artist (fretwank :a artist)
-	  (inet :a artist.inet))
-  (gibson :cname gibson.dhcp)
+  (unsafe :net unsafe)
+  (safe :net safe)
+  (untrusted :net untrusted)
+  (vampire :abbrev v
+	   (unsafe :abbrev vu) (dmz :abbrev vd) (vpn :abbrev vv)
+	   (safe :abbrev vs) (untrusted :abbrev vx))
+  (vampire (unsafe :addr vampire.unsafe :sshfp "vampire")
+	   (dmz :addr vampire.dmz :sshfp "vampire")
+	   (vpn :addr vampire.vpn :sshfp "vampire")
+	   (safe :addr vampire.safe :sshfp "vampire")
+	   (untrusted :addr vampire.untrusted :sshfp "vampire"))
+  (ibanez :abbrev i (unsafe :abbrev iu) (dmz :abbrev id))
+  (ibanez (unsafe :addr ibanez.unsafe :sshfp "ibanez")
+	  (dmz :addr ibanez.dmz :sshfp "ibanez"))
+  (radius :abbrev r
+	  (unsafe :abbrev ru) (dmz :abbrev rd) (vpn :abbrev rv)
+	  (safe :abbrev rs) (untrusted :abbrev rx))
+  (radius (unsafe :addr radius.unsafe :sshfp "radius")
+	  (dmz :addr radius.dmz :sshfp "radius")
+	  (vpn :addr radius.vpn :sshfp "radius")
+	  (safe :addr radius.safe :sshfp "radius")
+	  (untrusted :addr radius.untrusted :sshfp "radius"))
+  (roadstar :abbrev rg (unsafe :abbrev rgu) (dmz :abbrev rgd))
+  (roadstar (unsafe :addr roadstar.unsafe :sshfp "roadstar")
+	    (dmz :addr roadstar.dmz :sshfp "roadstar"))
+  (jem :abbrev j (unsafe :abbrev ju) (dmz :abbrev jd))
+  (jem (unsafe :addr jem.unsafe :sshfp "jem")
+       (dmz :addr jem.dmz :sshfp "jem"))
+  (artist :abbrev a
+	  (unsafe :abbrev au) (dmz :abbrev ad) (untrusted :abbrev ax))
+  (artist (unsafe :addr artist.unsafe :sshfp "artist")
+	  (dmz :addr artist.dmz :sshfp "artist")
+	  (untrusted :addr artist.untrusted :sshfp "artist"))
+  (groove :abbrev gr)
+  (groove (unsafe :addr groove.unsafe :sshfp "groove"))
+
+  ;; DHCP hosts.
+  (gibson :cname gibson.dhcp :abbrev g)
   (lespaul :cname lespaul.dhcp)
   (firebird :cname firebird.dhcp)
   (marauder :cname marauder.dhcp)
   (invader :cname invader.dhcp)
-  ;;
+  (gretsch :cname gretsch.dhcp)
+
   ;; Virtual network.
-  (virtual :net virtual)
-  (crybaby (virtual :a crybaby))
-  (terror (virtual :a terror))
+  (vpn :net vpn)
+  (crybaby :abbrev cb)
+  (crybaby (vpn :addr crybaby.vpn :sshfp "crybaby"))
+  (terror (vpn :addr terror.vpn :sshfp "terror"))
+  (orange :abbrev o)
+  (orange (vpn :addr orange.vpn :sshfp "orange"))
+  (haze :abbrev h)
+  (haze (vpn :addr haze.vpn :sshfp "haze"))
   (iodine :net iodine)
-  ;;
+
   ;; ITS.
   (its :net its)
-  (gw (its :a gw))
-  (mz (its :a mz))
-  ;;
+  (gw (its :addr gw.its))
+  (mz (its :addr mz.its))
+
+  ;; Strange things.
+  (blackhole (jump :addr blackhole.jump))
+
   ;; Delegations.
-  #+subnet/fretwank (dhcp :ns (vampire.ns))
-  (io :ns ((ns.io :ip dns-frontend))))
+  (dhcp :ns ((radius.ns.dhcp :ip radius)
+	     (precision.ns.dhcp :ip precision)
+	     (telecaster.ns.dhcp :ip telecaster)
+	     (vampire.ns.dhcp :ip vampire))
+	:ds ((55966 :rsasha256 :sha1
+	     "95b05c1f4e84f950f29630004bac447f8a87ca33")
+	     (55966 :rsasha256 :sha256
+	      #.(concatenate 'string "31696bf54b577362b2eb75793adeb9ec"
+				     "2e8440ec671371b35d8d978cd9ca3007"))))
+  (dyn :ns ((radius.ns.dyn :ip radius)
+	    (precision.ns.dyn :ip precision)
+	    (telecaster.ns.dyn :ip telecaster)
+	    (vampire.ns.dyn :ip vampire))
+       :ds ((11335 :rsasha256 :sha1
+	    "7ed2b843b0bfb38ceca68617dfacbeafab1d1ea9")
+	    (11335 :rsasha256 :sha256
+	     #.(concatenate 'string "6eb15eb587c48f5b84ca128a656a4cce"
+				    "0a41cf040d3d0f15a44dffd6476b2b55"))))
+  (dnserr :ns ((radius.ns.dnserr :ip radius.dmz)
+	       (precision.ns.dnserr :ip precision.jump)
+	       (telecaster.ns.dnserr :ip telecaster)
+	       (vampire.ns.dnserr :ip vampire.dmz))
+	  :ds ((40945 :rsasha256 :sha1
+		"f35b5d0b877b940e63ad1b3afc21d6ba83cd1b3b")
+	       (40945 :rsasha256 :sha256
+		#.(concatenate 'string "fb171d206d4d64c5a7a6c290ce6e20df"
+				       "44f1db7f41e2260f1fe8d7c55d524c11"))))
+  (io :ns ((ns.io :ip jazz.jump))))
 
 ;;;--------------------------------------------------------------------------
 ;;; Other subsidiary zones.
 
+(defzone dhcp.distorted.org.uk
+  :ns ((radius.ns :ip radius.dmz)
+       (precision.ns :ip precision.jump)
+       (telecaster.ns :ip telecaster.jump)
+       (vampire.ns :ip vampire.dmz))
+  (gibson :addr gibson.unsafe)
+  (crybaby :addr crybaby.unsafe)
+  (lespaul :addr lespaul.safe)
+  (invader :addr invader.safe)
+  (marauder :addr marauder.safe)
+  (haze :addr haze.unsafe)
+  (gretsch :addr gretsch.unsafe))
+
+(defzone nicko.org
+  (richmond :addr richmond.jump))
+
 (defrevzone trusted
-  :ns ((vampire.ns :ip vampire))
-  :reverse trusted
-  #+subnet/fretwank (dhcp :ns (metalzone.ns vampire.ns))
-  #+subnet/fretwank (@ :cidr-delegation
-		       (dhcp
-			(dhcp 199.29.172.dhcp.199.29.172.in-addr.arpa))))
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse unsafe
+  :reverse vpn
+  :reverse colo
+  :reverse its
+  :reverse any
+  (dhcp :ns (radius.distorted.org.uk.
+	     precision.distorted.org.uk.
+	     telecaster.distorted.org.uk.
+	     vampire.distorted.org.uk.))
+  :multi (((dhcp safe) :family :ipv4 :suffix "199.29.172.dhcp") :cname *))
 
-(defrevzone untrusted
-  :ns ((vampire.ns :ip vampire))
-  :reverse untrusted)
+(defrevzone (dmz :family :ipv6)
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse dmz)
 
-(defrevzone inet
-  :reverse inet)
+(defrevzone (dmz :family :ipv4)
+  (144-159 :ns (radius.distorted.org.uk.
+		precision.distorted.org.uk.
+		telecaster.distorted.org.uk.
+		vampire.distorted.org.uk.))
+  :multi ((dmz :suffix "144-159") :cname *))
 
-(defzone dhcp.distorted.org.uk
-  :ns ((vampire.ns :ip vampire))
-  :net dhcp)
+(defzone 144-159.204.49.62.in-addr.arpa
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse ((((:ipv4 dmz)))))
+
+(defrevzone (jump :family :ipv6)
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse jump)
+
+(defrevzone (jump :family :ipv4)
+  (64-79 :ns (radius.distorted.org.uk.
+	      precision.distorted.org.uk.
+	      telecaster.distorted.org.uk.
+	      vampire.distorted.org.uk.))
+  :multi ((jump :suffix "64-79") :cname *))
+
+(defzone 64-79.198.13.212.in-addr.arpa
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse ((((:ipv4 jump)))))
+
+(defrevzone distorted.org.uk-he
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse distorted.org.uk-he)
+
+(defrevzone distorted.org.uk-jump
+  :ns (radius.distorted.org.uk.
+       precision.distorted.org.uk.
+       telecaster.distorted.org.uk.
+       vampire.distorted.org.uk.)
+  :reverse distorted.org.uk-jump)
 
 (defzone io.distorted.org.uk
-  :ns ((ns :ip dns-frontend))
+  :ns ((ns :ip jazz.jump))
   (about :txt "Fake zone used for IP-over-DNS tunnelling."))
 
-(defzone dhcp.199.29.172.in-addr.arpa
-  :ns ((vampire.ns :ip vampire)))
-
 ;;;----- That's all, folks --------------------------------------------------