public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

torsocks: make 2 wrappers to torify apps with more and less circuit isolation.

Browse Source
This commit is contained in:
Evgeny Egorochkin 2013-01-15 08:59:02 +02:00
parent 123c73caf6
commit e201da376e
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
modules/services/security/torsocks.nix
View File

@ -4,16 +4,30 @@ let
cfg = config.services.tor; cfg = config.services.tor;
torsocks = pkgs.writeTextFile { makeConfig = server: ''
name = "torsocks"; server = ${toString(head (splitString ":" server))}
server_port = ${toString(tail (splitString ":" server))}
local = 127.0.0.0/255.128.0.0
local = 127.128.0.0/255.192.0.0
local = 169.254.0.0/255.255.0.0
local = 172.16.0.0/255.240.0.0
local = 192.168.0.0/255.255.0.0
${cfg.torsocks.config}
'';
makeTorsocks = name: server: pkgs.writeTextFile {
name = name;
text = '' text = ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}
TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" cfg.torsocks.config} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" $@ TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (makeConfig server)} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" $@
''; '';
executable = true; executable = true;
destination = "/bin/torsocks"; destination = "/bin/${name}";
}; };
torsocks = makeTorsocks "torsocks" cfg.torsocks.server;
torsocksFaster = makeTorsocks "torsocks-faster" cfg.torsocks.serverFaster;
in in
{ {
@ -33,12 +47,21 @@ in
server = mkOption { server = mkOption {
default = cfg.client.socksListenAddress; default = cfg.client.socksListenAddress;
example = "192.168.0.20"; example = "192.168.0.20:9050";
description = '' description = ''
IP address of TOR client to use. IP address of TOR client to use.
''; '';
}; };
serverFaster = mkOption {
default = cfg.client.socksListenAddressFaster;
example = "192.168.0.20:9063";
description = ''
IP address of TOR client to use for applications like web browsers which
need less circuit isolation to achive satisfactory performance.
'';
};
config = mkOption { config = mkOption {
default = ""; default = "";
description = '' description = ''
@ -55,18 +78,8 @@ in
config = mkIf cfg.torsocks.enable { config = mkIf cfg.torsocks.enable {
environment.systemPackages = [ torsocks ]; # expose it to the users environment.systemPackages = [ torsocks torsocksFaster ]; # expose it to the users
services.tor.torsocks.config = ''
server = ${toString(head (splitString ":" cfg.torsocks.server))}
server_port = ${toString(tail (splitString ":" cfg.torsocks.server))}
local = 127.0.0.0/255.128.0.0
local = 127.128.0.0/255.192.0.0
local = 169.254.0.0/255.255.0.0
local = 172.16.0.0/255.240.0.0
local = 192.168.0.0/255.255.0.0
'';
}; };
} }