mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-11 12:15:34 +03:00
374e6bcc40
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:
nix-build ci -A fmt.check
This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).
This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).
Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).
If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
125 lines
3.6 KiB
Nix
125 lines
3.6 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
pkgs,
|
|
...
|
|
}:
|
|
let
|
|
cfg = config.services.tor.torsocks;
|
|
optionalNullStr = b: v: lib.optionalString (b != null) v;
|
|
|
|
configFile = server: ''
|
|
TorAddress ${toString (lib.head (lib.splitString ":" server))}
|
|
TorPort ${toString (lib.tail (lib.splitString ":" server))}
|
|
|
|
OnionAddrRange ${cfg.onionAddrRange}
|
|
|
|
${optionalNullStr cfg.socks5Username "SOCKS5Username ${cfg.socks5Username}"}
|
|
${optionalNullStr cfg.socks5Password "SOCKS5Password ${cfg.socks5Password}"}
|
|
|
|
AllowInbound ${if cfg.allowInbound then "1" else "0"}
|
|
'';
|
|
|
|
wrapTorsocks =
|
|
name: server:
|
|
pkgs.writeTextFile {
|
|
name = name;
|
|
text = ''
|
|
#!${pkgs.runtimeShell}
|
|
TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (configFile server)} ${pkgs.torsocks}/bin/torsocks "$@"
|
|
'';
|
|
executable = true;
|
|
destination = "/bin/${name}";
|
|
};
|
|
|
|
in
|
|
{
|
|
options = {
|
|
services.tor.torsocks = {
|
|
enable = lib.mkOption {
|
|
type = lib.types.bool;
|
|
default = config.services.tor.enable && config.services.tor.client.enable;
|
|
defaultText = lib.literalExpression "config.services.tor.enable && config.services.tor.client.enable";
|
|
description = ''
|
|
Whether to build `/etc/tor/torsocks.conf`
|
|
containing the specified global torsocks configuration.
|
|
'';
|
|
};
|
|
|
|
server = lib.mkOption {
|
|
type = lib.types.str;
|
|
default = "127.0.0.1:9050";
|
|
example = "192.168.0.20:1234";
|
|
description = ''
|
|
IP/Port of the Tor SOCKS server. Currently, hostnames are
|
|
NOT supported by torsocks.
|
|
'';
|
|
};
|
|
|
|
fasterServer = lib.mkOption {
|
|
type = lib.types.str;
|
|
default = "127.0.0.1:9063";
|
|
example = "192.168.0.20:1234";
|
|
description = ''
|
|
IP/Port of the Tor SOCKS server for torsocks-faster wrapper suitable for HTTP.
|
|
Currently, hostnames are NOT supported by torsocks.
|
|
'';
|
|
};
|
|
|
|
onionAddrRange = lib.mkOption {
|
|
type = lib.types.str;
|
|
default = "127.42.42.0/24";
|
|
description = ''
|
|
Tor hidden sites do not have real IP addresses. This
|
|
specifies what range of IP addresses will be handed to the
|
|
application as "cookies" for .onion names. Of course, you
|
|
should pick a block of addresses which you aren't going to
|
|
ever need to actually connect to. This is similar to the
|
|
MapAddress feature of the main tor daemon.
|
|
'';
|
|
};
|
|
|
|
socks5Username = lib.mkOption {
|
|
type = lib.types.nullOr lib.types.str;
|
|
default = null;
|
|
example = "bob";
|
|
description = ''
|
|
SOCKS5 username. The `TORSOCKS_USERNAME`
|
|
environment variable overrides this option if it is set.
|
|
'';
|
|
};
|
|
|
|
socks5Password = lib.mkOption {
|
|
type = lib.types.nullOr lib.types.str;
|
|
default = null;
|
|
example = "sekret";
|
|
description = ''
|
|
SOCKS5 password. The `TORSOCKS_PASSWORD`
|
|
environment variable overrides this option if it is set.
|
|
'';
|
|
};
|
|
|
|
allowInbound = lib.mkOption {
|
|
type = lib.types.bool;
|
|
default = false;
|
|
description = ''
|
|
Set Torsocks to accept inbound connections. If set to
|
|
`true`, listen() and accept() will be
|
|
allowed to be used with non localhost address.
|
|
'';
|
|
};
|
|
|
|
};
|
|
};
|
|
|
|
config = lib.mkIf cfg.enable {
|
|
environment.systemPackages = [
|
|
pkgs.torsocks
|
|
(wrapTorsocks "torsocks-faster" cfg.fasterServer)
|
|
];
|
|
|
|
environment.etc."tor/torsocks.conf" = {
|
|
source = pkgs.writeText "torsocks.conf" (configFile cfg.server);
|
|
};
|
|
};
|
|
}
|