mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-30 17:43:42 +00:00
4f0dadbf38
After final improvements to the official formatter implementation, this commit now performs the first treewide reformat of Nix files using it. This is part of the implementation of RFC 166. Only "inactive" files are reformatted, meaning only files that aren't being touched by any PR with activity in the past 2 months. This is to avoid conflicts for PRs that might soon be merged. Later we can do a full treewide reformat to get the rest, which should not cause as many conflicts. A CI check has already been running for some time to ensure that new and already-formatted files are formatted, so the files being reformatted here should also stay formatted. This commit was automatically created and can be verified using nix-builda08b3a4d19
.tar.gz \ --argstr baseRevb32a094368
result/bin/apply-formatting $NIXPKGS_PATH
167 lines
5.2 KiB
Nix
167 lines
5.2 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
|
|
let
|
|
cfg = config.programs.captive-browser;
|
|
|
|
inherit (lib)
|
|
concatStringsSep
|
|
escapeShellArgs
|
|
optionalString
|
|
literalExpression
|
|
mkEnableOption
|
|
mkPackageOption
|
|
mkIf
|
|
mkOption
|
|
mkOptionDefault
|
|
types
|
|
;
|
|
|
|
requiresSetcapWrapper = config.boot.kernelPackages.kernelOlder "5.7" && cfg.bindInterface;
|
|
|
|
browserDefault =
|
|
chromium:
|
|
concatStringsSep " " [
|
|
''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"''
|
|
''${chromium}/bin/chromium''
|
|
''--user-data-dir=''${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive''
|
|
''--proxy-server="socks5://$PROXY"''
|
|
''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"''
|
|
''--no-first-run''
|
|
''--new-window''
|
|
''--incognito''
|
|
''-no-default-browser-check''
|
|
''http://cache.nixos.org/''
|
|
];
|
|
|
|
desktopItem = pkgs.makeDesktopItem {
|
|
name = "captive-browser";
|
|
desktopName = "Captive Portal Browser";
|
|
exec = "captive-browser";
|
|
icon = "nix-snowflake";
|
|
categories = [ "Network" ];
|
|
};
|
|
|
|
captive-browser-configured = pkgs.writeShellScriptBin "captive-browser" ''
|
|
export PREV_CONFIG_HOME="$XDG_CONFIG_HOME"
|
|
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
|
|
'';
|
|
in
|
|
{
|
|
###### interface
|
|
|
|
options = {
|
|
programs.captive-browser = {
|
|
enable = mkEnableOption "captive browser, a dedicated Chrome instance to log into captive portals without messing with DNS settings";
|
|
|
|
package = mkPackageOption pkgs "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 = browserDefault pkgs.chromium;
|
|
defaultText = literalExpression (browserDefault "\${pkgs.chromium}");
|
|
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 `captive-browser` to the network interface declared in
|
|
`cfg.interface`. This can be used to avoid collisions
|
|
with private subnets.
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
|
|
###### implementation
|
|
|
|
config = mkIf cfg.enable {
|
|
environment.systemPackages = [
|
|
(pkgs.runCommand "captive-browser-desktop-item" { } ''
|
|
install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop
|
|
'')
|
|
captive-browser-configured
|
|
];
|
|
|
|
programs.captive-browser.dhcp-dns =
|
|
let
|
|
iface =
|
|
prefixes: optionalString cfg.bindInterface (escapeShellArgs (prefixes ++ [ cfg.interface ]));
|
|
in
|
|
mkOptionDefault (
|
|
if config.networking.networkmanager.enable then
|
|
"${pkgs.networkmanager}/bin/nmcli dev show ${iface [ ]} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS"
|
|
else if config.networking.dhcpcd.enable then
|
|
"${pkgs.dhcpcd}/bin/dhcpcd ${iface [ "-U" ]} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers"
|
|
else if config.networking.useNetworkd then
|
|
"${cfg.package}/bin/systemd-networkd-dns ${iface [ ]}"
|
|
else
|
|
"${config.security.wrapperDir}/udhcpc --quit --now -f ${iface [ "-i" ]} -O dns --script ${pkgs.writeShellScript "udhcp-script" ''
|
|
if [ "$1" = bound ]; then
|
|
echo "$dns"
|
|
fi
|
|
''}"
|
|
);
|
|
|
|
security.wrappers.udhcpc = {
|
|
owner = "root";
|
|
group = "root";
|
|
capabilities = "cap_net_raw+p";
|
|
source = "${pkgs.busybox}/bin/udhcpc";
|
|
};
|
|
|
|
security.wrappers.captive-browser = mkIf requiresSetcapWrapper {
|
|
owner = "root";
|
|
group = "root";
|
|
capabilities = "cap_net_raw+p";
|
|
source = "${captive-browser-configured}/bin/captive-browser";
|
|
};
|
|
};
|
|
}
|