Merge pull request #320 from hannesm/uncensored-only-tls

dns-client: the uncensoreddns only provides service via TLS
mirage · Oct 5, 2022 · 17fca4a · 17fca4a
2 parents b7be3de + 7828f05
commit 17fca4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/lwt/client/dns_client_lwt.ml b/lwt/client/dns_client_lwt.ml
@@ -153,10 +153,7 @@ module Transport : Dns_client.S
     let authenticator = authenticator () in
     let peer_name = Dns_client.default_resolver_hostname in
     let tls_config = Tls.Config.client ~authenticator ~peer_name () in
-    List.flatten
-      (List.map (fun ip -> [
-             `Tls (tls_config, ip, 853); `Plaintext (ip, 53)
-           ]) Dns_client.default_resolvers)
+    List.map (fun ip -> `Tls (tls_config, ip, 853)) Dns_client.default_resolvers
 
   let maybe_resolv_conf t =
     match t.nameservers with

diff --git a/mirage/client/dns_client_mirage.ml b/mirage/client/dns_client_mirage.ml
@@ -145,10 +145,8 @@ module Make (R : Mirage_random.S) (T : Mirage_time.S) (M : Mirage_clock.MCLOCK)
             let peer_name = Dns_client.default_resolver_hostname in
             Tls.Config.client ~authenticator ~peer_name ()
           in
-          List.flatten
-            (List.map
-               (fun ip -> [ `Tls (tls_cfg, ip, 853) ; `Plaintext (ip, 53) ])
-               Dns_client.default_resolvers)
+          List.map (fun ip -> `Tls (tls_cfg, ip, 853))
+            Dns_client.default_resolvers
         | Some (`Udp, _) -> invalid_arg "UDP is not supported"
         | Some (`Tcp, ns) -> ns
       in

diff --git a/unix/client/dns_client_unix.ml b/unix/client/dns_client_unix.ml
@@ -46,8 +46,7 @@ module Transport : Dns_client.S
     | Ok ips -> Ok ips
     | Error _ as e -> e
 
-  let default_resolvers () =
-    List.map (fun ip -> ip, 53) Dns_client.default_resolvers
+  let default_resolvers () = [ Ipaddr.of_string_exn "1.1.1.1", 53 ]
 
   let maybe_resolv_conf t =
     match t.nameservers with