modules/programs: sane-sandboxed: remove --sane-sandbox-home-path argument and plumbing
no longer needed, and mixing this with root paths is liable to cause troubles at this point, around symlink dereferencing/canonicalization/etc
This commit is contained in:
parent
e94e338040
commit
14d8230821
|
@ -3,7 +3,6 @@
|
|||
|
||||
{ pkgName
|
||||
, method
|
||||
, allowedHomePaths ? []
|
||||
, allowedRootPaths ? []
|
||||
, autodetectCliPaths ? false
|
||||
, capabilities ? []
|
||||
|
@ -17,12 +16,7 @@ let
|
|||
"--sane-sandbox-path"
|
||||
p
|
||||
];
|
||||
allowHomePath = p: [
|
||||
"--sane-sandbox-home-path"
|
||||
p
|
||||
];
|
||||
allowPaths = paths: lib.flatten (builtins.map allowPath paths);
|
||||
allowHomePaths = paths: lib.flatten (builtins.map allowHomePath paths);
|
||||
|
||||
capabilityFlags = lib.flatten (builtins.map (c: [ "--sane-sandbox-cap" c ]) capabilities);
|
||||
|
||||
|
@ -41,7 +35,6 @@ let
|
|||
]
|
||||
++ netItems
|
||||
++ allowPaths allowedRootPaths
|
||||
++ allowHomePaths allowedHomePaths
|
||||
++ capabilityFlags
|
||||
++ lib.optionals (autodetectCliPaths != null) [ "--sane-sandbox-autodetect" autodetectCliPaths ]
|
||||
++ lib.optionals whitelistPwd [ "--sane-sandbox-add-pwd" ]
|
||||
|
|
|
@ -206,11 +206,6 @@ parseArgs() {
|
|||
net="$1"
|
||||
shift
|
||||
;;
|
||||
(--sane-sandbox-home-path)
|
||||
_path="$HOME/$1"
|
||||
shift
|
||||
paths+=("$_path")
|
||||
;;
|
||||
(--sane-sandbox-path)
|
||||
_path="$1"
|
||||
shift
|
||||
|
|
Loading…
Reference in New Issue
Block a user