X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/41c58dafe735d17b7d3241bf248ca8806a355926..c219fe5500b4294ba8dc0bce57b5c7d60b39065e:/src/plugins/bind.sml

diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml
index 46ecbc3..3d79cbf 100644
--- a/src/plugins/bind.sml
+++ b/src/plugins/bind.sml
@@ -50,6 +50,12 @@ datatype dns_record =
        | MX of int * string
        | NS of string
        | DefaultA of string
+       | AAAA of string * string
+       | DefaultAAAA of string
+       | TXT of string * string
+       | DefaultTXT of string
+       | AFSDB of string
+       | SRV of string * int * int * int * string
 
 val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) =>
 		(case (Env.string e1, Domain.ip e2) of
@@ -66,12 +72,31 @@ val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) =>
 	      | (EApp ((EVar "dnsNS", _), e), _) =>
 		Option.map NS (Env.string e)
 	      | (EApp ((EVar "dnsDefaultA", _), e), _) =>
-		Option.map DefaultA (Env.string e)
+		Option.map DefaultA (Domain.ip e)
+	      | (EApp ((EApp ((EVar "dnsAAAA", _), e1), _), e2), _) =>
+		(case (Env.string e1, Env.string e2) of
+		     (SOME v1, SOME v2) => SOME (AAAA (v1, v2))
+		   | _ => NONE)
+	      | (EApp ((EVar "dnsDefaultAAAA", _), e), _) =>
+		Option.map DefaultAAAA (Env.string e)
+	      | (EApp ((EApp ((EVar "dnsTXT", _), e1), _), e2), _) =>
+		(case (Env.string e1, Env.string e2) of
+		     (SOME v1, SOME v2) => SOME (TXT (v1, v2))
+		   | _ => NONE)
+	      | (EApp ((EVar "dnsDefaultTXT", _), e), _) =>
+		Option.map DefaultTXT (Env.string e)
+	      | (EApp ((EVar "dnsAFSDB", _), e), _) =>
+		Option.map AFSDB (Env.string e)
+	      | (EApp ((EApp ((EApp ((EApp ((EApp ((EVar "dnsSRV", _), e1), _), e2), _), e3), _), e4), _), e5), _) =>
+		(case (Env.string e1, Env.int e2, Env.int e3, Env.int e4, Env.string e5) of
+		     (SOME v1, SOME v2, SOME v3, SOME v4, SOME v5) => SOME (SRV (v1, v2, v3, v4, v5))
+		   | _ => NONE)
 	      | _ => NONE
 
 fun writeRecord (evs, r) =
     case !dns of
-	NONE => print "Warning: DNS directive ignored because no master DNS server is configured for this domain\n"
+	NONE => print ("Warning: DNS directive for " ^ Domain.currentDomain ()
+		       ^ " ignored because no master DNS server is configured for this domain\n")
       | SOME files =>
 	let
 	    fun write s = #write files s
@@ -115,6 +140,56 @@ fun writeRecord (evs, r) =
 			    write "\tIN\tNS\t";
 			    write host;
 			    write ".\n")
+	      | AAAA (from, to) => (write from;
+				    write ".";
+				    writeDom ();
+				    write ".\t";
+				    write (Int.toString ttl);
+				    write "\tIN\tAAAA\t";
+				    write to;
+				    write "\n")
+	      | DefaultAAAA to => (writeDom ();
+				   write ".\t";
+				   write (Int.toString ttl);
+				   write "\tIN\tAAAA\t";
+				   write to;
+				   write "\n")
+	      | TXT (from, to) => (write from;
+				   write ".";
+				   writeDom ();
+				   write ".\t";
+				   write (Int.toString ttl);
+				   write "\tIN\tTXT\t\"";
+				   write (String.translate (fn #"\"" => "\\\"" | ch => str ch) to);
+				   write "\"\n")
+	      | DefaultTXT to => (writeDom ();
+				  write ".\t";
+				  write (Int.toString ttl);
+				  write "\tIN\tTXT\t\"";
+				  write (String.translate (fn #"\"" => "\\\"" | ch => str ch) to);
+				  write "\"\n")
+	      | AFSDB host => (writeDom ();
+			       write ".\t";
+			       write (Int.toString ttl);
+			       write "\tIN\tAFSDB\t";
+			       write "1";
+			       write "\t";
+			       write host;
+			       write ".\n")
+	      | SRV (from, priority, weight, port, to) => (write from;
+							   write ".";
+							   writeDom ();
+							   write ".\t";
+							   write (Int.toString ttl);
+							   write "\tIN\tSRV\t";
+							   write (Int.toString priority);
+							   write "\t";
+							   write (Int.toString weight);
+							   write "\t";
+							   write (Int.toString port);
+							   write "\t";
+							   write to;
+							   write ".\n")
 	end
 
 val () = Env.actionV_one "dns"
@@ -163,7 +238,7 @@ val () = Slave.registerFileHandler (fn fs =>
 					   fun dnsChanged () =
 					       if #domain fs = !didDomain then
 						   ()
-					       else if #action fs = Slave.Delete then
+					       else if Slave.isDelete (#action fs) then
 						   let
 						       val fname = OS.Path.joinBaseExt {base = #domain fs,
 											ext = SOME "zone"}
@@ -284,10 +359,22 @@ val () = Domain.registerResetLocal (fn () =>
 
 val () = Domain.registerDescriber (Domain.considerAll
 				   [Domain.Filename {filename = "named.conf",
-						     heading = "named.conf addition",
+						     heading = "named.conf addition:",
 						     showEmpty = false},
 				    Domain.Filename {filename = "dns",
-						     heading = "DNS zonefile contents",
+						     heading = "DNS zonefile contents:",
 						     showEmpty = false}])
 
+fun validHost_ s =
+    size s > 0 andalso size s < 20
+    andalso CharVector.all (fn ch => Domain.isIdent ch orelse ch = #"-" orelse ch = #"_") s
+
+fun validSRVDomain s =
+    size s > 0 andalso size s < 100
+    andalso List.all validHost_ (String.fields (fn ch => ch = #".") s)
+
+val _ = Env.type_one "srv_domain"
+	Env.string
+	validSRVDomain
+
 end