X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/c219fe5500b4294ba8dc0bce57b5c7d60b39065e..6b00a070a7ab57acce9cb0da7dc6d68f6b75e924:/src/plugins/bind.sml diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml index 3d79cbf..7dbc1fa 100644 --- a/src/plugins/bind.sml +++ b/src/plugins/bind.sml @@ -35,7 +35,7 @@ val dns : Domain.files option ref = ref NONE val _ = Domain.registerBefore (fn _ => dns := Option.map (fn node => Domain.domainsFile {node = node, - name = "dns"}) + name = "dns.conf"}) (Domain.dnsMaster ())) val _ = Domain.registerAfter @@ -44,25 +44,47 @@ val _ = Domain.registerAfter val dl = ErrorMsg.dummyLoc +datatype host = + Literal of string + | Wildcard + | Default + datatype dns_record = - A of string * string - | CNAME of string * string + A of host * string + | CNAME of host * string | MX of int * string | NS of string - | DefaultA of string - | AAAA of string * string - | DefaultAAAA of string - | TXT of string * string - | DefaultTXT of string + | AAAA of host * string + | TXT of host * string | AFSDB of string - | SRV of string * int * int * int * string + | SRV of host * int * int * int * string + +fun hostS (Literal s) = s ^ "." + | hostS Wildcard = "*." + | hostS Default = "" + +val host = fn (EApp ((EVar "literal", _), e), _) => + Option.map Literal (Env.string e) + | (EVar "wildcard", _) => + SOME Wildcard + | (EVar "default", _) => + SOME Default + | _ => NONE + +val srv_host = fn (EApp ((EVar "srv_literal", _), e), _) => + Option.map Literal (Env.string e) + | (EVar "srv_wildcard", _) => + SOME Wildcard + | (EVar "srv_default", _) => + SOME Default + | _ => NONE val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) => - (case (Env.string e1, Domain.ip e2) of + (case (host e1, Domain.ip e2) of (SOME v1, SOME v2) => SOME (A (v1, v2)) | _ => NONE) | (EApp ((EApp ((EVar "dnsCNAME", _), e1), _), e2), _) => - (case (Env.string e1, Env.string e2) of + (case (host e1, Env.string e2) of (SOME v1, SOME v2) => SOME (CNAME (v1, v2)) | _ => NONE) | (EApp ((EApp ((EVar "dnsMX", _), e1), _), e2), _) => @@ -71,32 +93,26 @@ val record = fn (EApp ((EApp ((EVar "dnsA", _), e1), _), e2), _) => | _ => NONE) | (EApp ((EVar "dnsNS", _), e), _) => Option.map NS (Env.string e) - | (EApp ((EVar "dnsDefaultA", _), e), _) => - Option.map DefaultA (Domain.ip e) | (EApp ((EApp ((EVar "dnsAAAA", _), e1), _), e2), _) => - (case (Env.string e1, Env.string e2) of + (case (host 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 + (case (srv_host 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 + (case (srv_host 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 for " ^ Domain.currentDomain () - ^ " 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 @@ -104,22 +120,14 @@ fun writeRecord (evs, r) = val ttl = Env.env Env.int (evs, "TTL") in case r of - A (from, to) => (write from; - write "."; + A (from, to) => (write (hostS from); writeDom (); write ".\t"; write (Int.toString ttl); write "\tIN\tA\t"; write to; write "\n") - | DefaultA to => (writeDom (); - write ".\t"; - write (Int.toString ttl); - write "\tIN\tA\t"; - write to; - write "\n") - | CNAME (from, to) => (write from; - write "."; + | CNAME (from, to) => (write (hostS from); writeDom (); write ".\t"; write (Int.toString ttl); @@ -140,34 +148,20 @@ fun writeRecord (evs, r) = write "\tIN\tNS\t"; write host; write ".\n") - | AAAA (from, to) => (write from; - write "."; + | AAAA (from, to) => (write (hostS from); 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 "."; + | TXT (from, to) => (write (hostS from); 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); @@ -176,8 +170,7 @@ fun writeRecord (evs, r) = write "\t"; write host; write ".\n") - | SRV (from, priority, weight, port, to) => (write from; - write "."; + | SRV (from, priority, weight, port, to) => (write (hostS from); writeDom (); write ".\t"; write (Int.toString ttl); @@ -251,7 +244,7 @@ val () = Slave.registerFileHandler (fn fs => else let val inf = TextIO.openIn (OS.Path.joinDirFile {dir = #dir fs, - file = "soa"}) + file = "soa.conf"}) val kind = readLine inf val ttl = readILine inf val ns = readLine inf @@ -299,7 +292,7 @@ val () = Slave.registerFileHandler (fn fs => val _ = TextIO.closeOut outf val dns = OS.Path.joinDirFile {dir = #dir fs, - file = "dns"} + file = "dns.conf"} val fname = OS.Path.joinBaseExt {base = #domain fs, ext = SOME "zone"} @@ -336,8 +329,8 @@ val () = Slave.registerFileHandler (fn fs => end in case file of - "soa" => dnsChanged () - | "dns" => dnsChanged () + "soa.conf" => dnsChanged () + | "dns.conf" => dnsChanged () | "named.conf" => namedChanged := true | _ => () end) @@ -361,20 +354,24 @@ val () = Domain.registerDescriber (Domain.considerAll [Domain.Filename {filename = "named.conf", heading = "named.conf addition:", showEmpty = false}, - Domain.Filename {filename = "dns", + Domain.Filename {filename = "dns.conf", heading = "DNS zonefile contents:", showEmpty = false}]) -fun validHost_ s = +fun validSrvHost s = size s > 0 andalso size s < 20 andalso CharVector.all (fn ch => Domain.isIdent ch orelse ch = #"-" orelse ch = #"_") s -fun validSRVDomain s = +fun validSrvDomain s = size s > 0 andalso size s < 100 - andalso List.all validHost_ (String.fields (fn ch => ch = #".") s) + andalso List.all validSrvHost (String.fields (fn ch => ch = #".") s) + +val _ = Env.type_one "srv_host" + Env.string + validSrvHost val _ = Env.type_one "srv_domain" Env.string - validSRVDomain + validSrvDomain end