mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-11-06 02:06:46 +01:00
d9f7bac91f
Fixes the broken metrics evaluation which was caused by a `trace` warning in stdout which confused `jq` in `pkgs/top-level/metrics.nix`. Also made the `bind-device` feature optional as suggested after the merge.
123 lines
4.7 KiB
Nix
123 lines
4.7 KiB
Nix
{ config, lib, pkgs, ... }:
|
|
|
|
with lib;
|
|
|
|
let
|
|
cfg = config.programs.captive-browser;
|
|
in
|
|
{
|
|
###### interface
|
|
|
|
options = {
|
|
programs.captive-browser = {
|
|
enable = mkEnableOption "captive browser";
|
|
|
|
package = mkOption {
|
|
type = types.package;
|
|
default = pkgs.captive-browser;
|
|
defaultText = "pkgs.captive-browser";
|
|
description = "Which package to use for captive-browser";
|
|
};
|
|
|
|
interface = mkOption {
|
|
type = types.str;
|
|
description = "your public network interface (wlp3s0, wlan0, eth0, ...)";
|
|
};
|
|
|
|
# the options below are the same as in "captive-browser.toml"
|
|
browser = mkOption {
|
|
type = types.str;
|
|
default = concatStringsSep " " [ ''${pkgs.chromium}/bin/chromium''
|
|
''--user-data-dir=$HOME/.chromium-captive''
|
|
''--proxy-server="socks5://$PROXY"''
|
|
''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"''
|
|
''--no-first-run''
|
|
''--new-window''
|
|
''--incognito''
|
|
''http://cache.nixos.org/''
|
|
];
|
|
description = ''
|
|
The shell (/bin/sh) command executed once the proxy starts.
|
|
When browser exits, the proxy exits. An extra env var PROXY is available.
|
|
|
|
Here, we use a separate Chrome instance in Incognito mode, so that
|
|
it can run (and be waited for) alongside the default one, and that
|
|
it maintains no state across runs. To configure this browser open a
|
|
normal window in it, settings will be preserved.
|
|
|
|
@volth: chromium is to open a plain HTTP (not HTTPS nor redirect to HTTPS!) website.
|
|
upstream uses http://example.com but I have seen captive portals whose DNS server resolves "example.com" to 127.0.0.1
|
|
'';
|
|
};
|
|
|
|
dhcp-dns = mkOption {
|
|
type = types.str;
|
|
description = ''
|
|
The shell (/bin/sh) command executed to obtain the DHCP
|
|
DNS server address. The first match of an IPv4 regex is used.
|
|
IPv4 only, because let's be real, it's a captive portal.
|
|
'';
|
|
};
|
|
|
|
socks5-addr = mkOption {
|
|
type = types.str;
|
|
default = "localhost:1666";
|
|
description = ''the listen address for the SOCKS5 proxy server'';
|
|
};
|
|
|
|
bindInterface = mkOption {
|
|
default = true;
|
|
type = types.bool;
|
|
description = ''
|
|
Binds <package>captive-browser</package> to the network interface declared in
|
|
<literal>cfg.interface</literal>. This can be used to avoid collisions
|
|
with private subnets.
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
|
|
###### implementation
|
|
|
|
config = mkIf cfg.enable {
|
|
|
|
programs.captive-browser.dhcp-dns = mkOptionDefault (
|
|
if config.networking.networkmanager.enable then
|
|
"${pkgs.networkmanager}/bin/nmcli dev show ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS"
|
|
else if config.networking.dhcpcd.enable then
|
|
"${pkgs.dhcpcd}/bin/dhcpcd -U ${escapeShellArg cfg.interface} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers"
|
|
else if config.networking.useNetworkd then
|
|
"${cfg.package}/bin/systemd-networkd-dns ${escapeShellArg cfg.interface}"
|
|
else
|
|
"${config.security.wrapperDir}/udhcpc --quit --now -f -i ${escapeShellArg cfg.interface} -O dns --script ${
|
|
pkgs.writeScript "udhcp-script" ''
|
|
#!/bin/sh
|
|
if [ "$1" = bound ]; then
|
|
echo "$dns"
|
|
fi
|
|
''}"
|
|
);
|
|
|
|
security.wrappers.udhcpc = {
|
|
capabilities = "cap_net_raw+p";
|
|
source = "${pkgs.busybox}/bin/udhcpc";
|
|
};
|
|
|
|
security.wrappers.captive-browser = {
|
|
capabilities = "cap_net_raw+p";
|
|
source = pkgs.writeScript "captive-browser" ''
|
|
#!${pkgs.bash}/bin/bash
|
|
export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
|
|
browser = """${cfg.browser}"""
|
|
dhcp-dns = """${cfg.dhcp-dns}"""
|
|
socks5-addr = """${cfg.socks5-addr}"""
|
|
${optionalString cfg.bindInterface ''
|
|
bind-device = """${cfg.interface}"""
|
|
''}
|
|
''}
|
|
exec ${cfg.package}/bin/captive-browser
|
|
'';
|
|
};
|
|
};
|
|
}
|