dhcp-server: implement captive portal option (RFC8910)

Clients observing the URI value "urn:ietf:params:capport:unrestricted" may forego time-consuming forms of captive portal detection. Clients obsering a different URI will check that for infos. https://datatracker.ietf.org/doc/html/rfc8910
freifunkMUC · Jan 7, 2025 · 4debad6 · 4debad6
1 parent 9a9d749
commit 4debad6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/dhcp-server/dhcpd.conf b/dhcp-server/dhcpd.conf
@@ -8,6 +8,7 @@ option space ubnt;
 option space omada;
 option ubnt.unifi-address code 1 = ip-address;
 option omada-controller-address code 138 = ip-address;
+option captive-portal-url code 114 = text;
 
 class "ubnt" {
         match if substring (option vendor-class-identifier, 0, 4) = "ubnt";
@@ -44,6 +45,7 @@ shared-network "{{ name }}" {
                         option omada-controller-address 5.1.66.255;
                 }
 		option interface-mtu            1280;
+		option captive-portal-url "{% if net['network'] == "10.86.8.0" %}https://ffmuc.net/captive{% else %}urn:ietf:params:capport:unrestricted{% endif %}";
 		{%- endif  %}
 		{%- endfor  %}
 	}

diff --git a/nginx/domains/ffmuc.net.include b/nginx/domains/ffmuc.net.include
@@ -14,6 +14,10 @@ location /favicon.ico {
 	root /srv/www/ffmuc.net/_site/assets/;
 }
 
+location = /captive {
+	default_type application/captive+json;
+}
+
 # Point SSID-URL to ffmuc.net
 rewrite ^/(uml_.*|muc_.*|gauting|freising|augsburg|welt|ulm)$ https://ffmuc.net redirect;