mobileconfig: Init

README.md

@@ -22,12 +22,13 @@ Read [Dohna NS Documentation](https://dohna.ovh/) to learn how to install Dohna
 ## Environment Variables
 
 | Key                 | Default                                                                                                                                         | Description                                                                 |
-| ----------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
 | DNS                 | ["https://8.8.8.8/dns-query","https://8.8.4.4/dns-query","https://[2001:4860:4860::8888]/dns-query","https://[2001:4860:4860::8888]/dns-query"] | Specify a DNS over HTTPS server as the upstream.                            |
 | API                 | ["https://8.8.8.8/resolve","https://8.8.4.4/resolve","https://[2001:4860:4860::8888]/resolve","https://[2001:4860:4860::8888]/resolve"]         | Specify a JSON API server as the upstream.                                  |
 | IPV4_PREFIX         | 32                                                                                                                                              | Specify the EDNS client subnet IPv4 prefix length.                          |
 | IPV6_PREFIX         | 128                                                                                                                                             | Specify the EDNS client subnet IPv6 prefix length.                          |
 | CONCURRENT          | false                                                                                                                                           | Whether it concurrently queries all servers and returns the fastest result. |
+| ENABLE_MOBILECONFIG | false                                                                                                                                           | Whether to enable the [Apple MobileConfig API](#apple-mobileconfig-api).    |
 
 ## Self-hosted
 
@@ -36,3 +37,15 @@ You can use [Netlify CLI](https://cli.netlify.com/commands/serve/) or [`workerd`
 Make sure you can connect to upstream servers.
 
 If you find a bug on self-hosted, try to reproduce it at `dohna.ovh` before reporting it.
+
+## Apple MobileConfig API
+
+MobileConfig can configure system-level DNS over HTTPS for Apple devices.
+
+`dohna.ovh` has already enabled this API; you only need to edit a few parameters to point the URL to your domain, so there is no need to enable this API for your self-hosted instance.
+
+| Query Parameter | Default                           | Description                                            |
+| --------------- | --------------------------------- | ------------------------------------------------------ |
+| domain          | dohna.ovh                         | Specify the DNS over HTTPS domain.                     |
+| name            | Dohna NS                          | Specify the name of the generated MobileConfig.        |
+| desc            | Yet another DNS over HTTPS relay. | Specify the description of the generated MobileConfig. |

_worker.js

@@ -1,4 +1,4 @@
-import handler from "./common";
+import handler from "./handler/dns";
 
 export default {
   fetch: async (request, env) =>
@@ -10,5 +10,6 @@ export default {
       env.IPV6_PREFIX,
       env.CONCURRENT,
       request.headers.get("cf-connecting-ip"),
+      env.ENABLE_MOBILE_CONFIG,
     ),
 };

handler/dns.js

@@ -45,19 +45,16 @@ export default async function handler(
   }
 
   const { method, headers, url } = request;
-  const { search, searchParams, pathname } = new URL(url);
+  const { search, searchParams } = new URL(url);
 
   const ip =
     rawIP ||
     headers.get("x-forwarded-for").split(",")[0].trim() ||
     headers.get("x-real-ip");
 
-  let res = new Response(null, { status: 404 });
+  let res = new Response(null, { status: 400 });
 
   // JSON API
-  if (pathname === "/resolve") {
-    res = new Response(null, { status: 400 });
-
   if (method === "GET" && searchParams.has("name")) {
     if (concurrent) {
       res = await Promise.any(
@@ -101,12 +98,8 @@ export default async function handler(
       res = new Response(null, { status: 500 });
     }
   }
-  }
 
   // DNS Query
-  if (pathname === "/dns-query") {
-    res = new Response(null, { status: 400 });
-
   let queryData;
 
   // GET
@@ -158,7 +151,6 @@ export default async function handler(
       concurrent,
     );
   }
-  }
 
   return res;
 }

handler/entrypoint.js

@@ -0,0 +1,36 @@
+import dnsHandler from "./dns";
+import mobileconfigHandler from "./mobileconfig";
+
+export default async function handler(
+  request,
+  dns,
+  api,
+  ipv4Prefix = 32,
+  ipv6Prefix = 128,
+  concurrent = false,
+  rawIP,
+  enableMobileConfig = false,
+) {
+  const { pathname } = new URL(request.url);
+  let res = new Response(null, { status: 404 });
+
+  // DNS over HTTPS & JSON API
+  if (pathname === "/dns-query" || pathname === "/resolve") {
+    res = dnsHandler(
+      request,
+      dns,
+      api,
+      ipv4Prefix,
+      ipv6Prefix,
+      concurrent,
+      rawIP,
+    );
+  }
+
+  // Apple Mobile Config
+  if (enableMobileConfig && pathname === "/mobileconfig") {
+    res = mobileconfigHandler(request);
+  }
+
+  return res;
+}

handler/mobileconfig.js

@@ -0,0 +1,61 @@
+export default async function handler(request) {
+  const { headers, searchParams } = new URL(request.url);
+  const domain = searchParams.get("domain") || headers.get("domain") || "dohna.ovh";
+  const name = decodeURIComponent(searchParams.get("name")) || "Dohna NS";
+  const desc =
+    decodeURIComponent(searchParams.get("desc")) ||
+    "Yet another DNS over HTTPS relay.";
+  return new Response(
+    `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+<key>PayloadContent</key>
+<array>
+<dict>
+<key>DNSSettings</key>
+<dict>
+<key>DNSProtocol</key>
+<string>HTTPS</string>
+<key>ServerURL</key>
+<string>https://${domain}/dns-query</string>
+</dict>
+<key>PayloadDisplayName</key>
+<string>${name}</string>
+<key>PayloadDescription</key>
+<string>${desc}</string>
+<key>PayloadIdentifier</key>
+<string>com.apple.dnsSettings.managed.${String(Crypto.randomUUID()).toUpperCase()}</string>
+<key>PayloadType</key>
+<string>com.apple.dnsSettings.managed</string>
+<key>PayloadUUID</key>
+<string>${String(Crypto.randomUUID()).toUpperCase()}</string>
+<key>PayloadVersion</key>
+<integer>1</integer>
+<key>ProhibitDisablement</key>
+<false/>
+ </dict>
+</array>
+<key>PayloadDisplayName</key>
+<string>${name}</string>
+<key>PayloadDescription</key>
+<string>${desc}</string>
+<key>PayloadIdentifier</key>
+<string>${domain}</string>
+<key>PayloadRemovalDisallowed</key>
+<false/>
+<key>PayloadType</key>
+<string>Configuration</string>
+<key>PayloadUUID</key>
+<string>${String(Crypto.randomUUID()).toUpperCase()}</string>
+<key>PayloadVersion</key>
+<integer>1</integer>
+</dict>
+</plist>`,
+    {
+      headers: {
+        "Content-Type": "application/x-apple-aspen-config",
+      },
+    },
+  );
+}

middleware.js

@@ -1,4 +1,4 @@
-import handler from "./common";
+import handler from "./handler/dns";
 
 export default middleware = async (request) => {
   return handler(
@@ -8,5 +8,7 @@ export default middleware = async (request) => {
     process.env.IPV4_PREFIX,
     process.env.IPV6_PREFIX,
     process.env.CONCURRENT,
+    undefined,
+    process.env.ENABLE_MOBILE_CONFIG,
   );
 };

netlify/edge-functions/middleware.js

@@ -1,4 +1,4 @@
-import handler from "../../common.js";
+import handler from "../../handler/dns.js";
 export default async (request) =>
   handler(
     request,
@@ -8,5 +8,6 @@ export default async (request) =>
     Netlify.env.get("IPV6_PREFIX"),
     Netlify.env.get("CONCURRENT"),
     Netlify.context.ip,
+    Netlify.env.get("ENABLE_MOBILE_CONFIG"),
   );
 export const config = { path: "*" };