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

nixos/throne: rename from nekoray

Browse Source
This commit is contained in:
TomaSajt
2025-08-04 16:32:26 +02:00
parent 41a216f7e2
commit 12085a24e8
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/module-list.nix
View File

@@ -269,7 +269,6 @@
./programs/nano.nix ./programs/nano.nix
./programs/nautilus-open-any-terminal.nix ./programs/nautilus-open-any-terminal.nix
./programs/nbd.nix ./programs/nbd.nix
./programs/nekoray.nix
./programs/neovim.nix ./programs/neovim.nix
./programs/nethoscope.nix ./programs/nethoscope.nix
./programs/nexttrace.nix ./programs/nexttrace.nix
@@ -327,6 +326,7 @@
./programs/systemtap.nix ./programs/systemtap.nix
./programs/tcpdump.nix ./programs/tcpdump.nix
./programs/television.nix ./programs/television.nix
./programs/throne.nix
./programs/thunar.nix ./programs/thunar.nix
./programs/thunderbird.nix ./programs/thunderbird.nix
./programs/tmux.nix ./programs/tmux.nix

29
nixos/modules/programs/nekoray.nix → nixos/modules/programs/throne.nix
View File

@@ -6,20 +6,24 @@
}: }:
let let
cfg = config.programs.nekoray; cfg = config.programs.throne;
in in
{ {
options = { imports = [
programs.nekoray = { (lib.mkRenamedOptionModule [ "programs" "nekoray" ] [ "programs" "throne" ])
enable = lib.mkEnableOption "nekoray, a GUI proxy configuration manager"; ];
package = lib.mkPackageOption pkgs "nekoray" { }; options = {
programs.throne = {
enable = lib.mkEnableOption "Throne, a GUI proxy configuration manager";
package = lib.mkPackageOption pkgs "throne" { };
tunMode = { tunMode = {
enable = lib.mkEnableOption "TUN mode of nekoray"; enable = lib.mkEnableOption "TUN mode of Throne";
setuid = lib.mkEnableOption '' setuid = lib.mkEnableOption ''
setting suid bit for nekobox_core to run as root, which is less setting suid bit for throne-core to run as root, which is less
secure than default setcap method but closer to upstream assumptions. secure than default setcap method but closer to upstream assumptions.
Enable this if you find the default setcap method configured in Enable this if you find the default setcap method configured in
this module doesn't work for you this module doesn't work for you
@@ -29,10 +33,11 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
security.wrappers.nekobox_core = lib.mkIf cfg.tunMode.enable { security.wrappers.throne-core = lib.mkIf cfg.tunMode.enable {
source = "${cfg.package}/share/nekoray/nekobox_core"; source = "${cfg.package}/share/throne/Core";
owner = "root"; owner = "root";
group = "root"; group = "root";
setuid = lib.mkIf cfg.tunMode.setuid true; setuid = lib.mkIf cfg.tunMode.setuid true;
@@ -44,7 +49,7 @@ in
# avoid resolvectl password prompt popping up three times # avoid resolvectl password prompt popping up three times
# https://github.com/SagerNet/sing-tun/blob/0686f8c4f210f4e7039c352d42d762252f9d9cf5/tun_linux.go#L1062 # https://github.com/SagerNet/sing-tun/blob/0686f8c4f210f4e7039c352d42d762252f9d9cf5/tun_linux.go#L1062
# We use a hack here to determine whether the requested process is nekobox_core # We use a hack here to determine whether the requested process is throne-core
# Detect whether its capabilities contain at least `net_admin` and `net_raw`. # Detect whether its capabilities contain at least `net_admin` and `net_raw`.
# This does not reduce security, as we can already bypass `resolved` with them. # This does not reduce security, as we can already bypass `resolved` with them.
# Alternatives to consider: # Alternatives to consider:
@@ -56,9 +61,9 @@ in
# change its own cmdline. `/proc/<pid>/exe` is reliable but kernel forbids # change its own cmdline. `/proc/<pid>/exe` is reliable but kernel forbids
# checking that entry of process from different users, and polkit runs `spawn` # checking that entry of process from different users, and polkit runs `spawn`
# as an unprivileged user. # as an unprivileged user.
# 3. Put nekobox_core into a systemd service, and let polkit check service name. # 3. Put throne-core into a systemd service, and let polkit check service name.
# This is the most secure and convenient way but requires heavy modification # This is the most secure and convenient way but requires heavy modification
# to nekoray source code. Would be good to let upstream support that eventually. # to Throne source code. Would be good to let upstream support that eventually.
security.polkit.extraConfig = security.polkit.extraConfig =
lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable) lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable)
'' ''