Lubuntu/lxqt-sudo-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the patch to pass through env vars.

Browse Source
This commit is contained in:
Simon Quigley 2024-10-16 17:09:37 -05:00
parent 4205318af5
commit 146074a151
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
lxqt-sudo (2.0.0-0ubuntu2) plucky; urgency=medium
* Update the patch to pass through env vars.
-- Simon Quigley <tsimonq2@ubuntu.com> Wed, 16 Oct 2024 17:09:37 -0500
lxqt-sudo (2.0.0-0ubuntu1) oracular; urgency=medium lxqt-sudo (2.0.0-0ubuntu1) oracular; urgency=medium
* New upstream release. * New upstream release.

14
debian/patches/bypass-envvar-allowlist.patch vendored
View File

@ -8,7 +8,7 @@ Last-Update: 2023-10-11
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/sudo.cpp --- a/sudo.cpp
+++ b/sudo.cpp +++ b/sudo.cpp
@@ -83,6 +83,7 @@ namespace @@ -84,6 +84,7 @@ namespace
" -s|--su Use %3(1) as backend.\n" " -s|--su Use %3(1) as backend.\n"
" -d|--sudo Use %2(8) as backend.\n" " -d|--sudo Use %2(8) as backend.\n"
" -a|--doas Use %4(1) as backend.\n" " -a|--doas Use %4(1) as backend.\n"
@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
" command Command to run.\n" " command Command to run.\n"
" arguments Optional arguments for command.\n\n").arg(app_master).arg(sudo_prog).arg(su_prog).arg(doas_prog); " arguments Optional arguments for command.\n\n").arg(app_master).arg(sudo_prog).arg(su_prog).arg(doas_prog);
if (!err.isEmpty()) if (!err.isEmpty())
@@ -113,8 +114,13 @@ namespace @@ -114,8 +115,13 @@ namespace
}; };
assert_helper h; assert_helper h;
@ -31,7 +31,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
std::cerr << LXQTSUDO << ": Stripping child environment except for: "; std::cerr << LXQTSUDO << ": Stripping child environment except for: ";
std::ostringstream left_env_params; std::ostringstream left_env_params;
std::copy(ALLOWED_VARS, ALLOWED_END - 1, std::ostream_iterator<const char *>{left_env_params, ","}); std::copy(ALLOWED_VARS, ALLOWED_END - 1, std::ostream_iterator<const char *>{left_env_params, ","});
@@ -195,6 +201,10 @@ int Sudo::main() @@ -196,6 +202,10 @@ int Sudo::main()
{ {
mBackend = BACK_DOAS; mBackend = BACK_DOAS;
mArgs.removeAt(0); mArgs.removeAt(0);
@ -42,7 +42,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
} }
} }
//any other arguments we simply forward to su/sudo //any other arguments we simply forward to su/sudo
@@ -286,11 +296,11 @@ void Sudo::child() @@ -287,11 +297,13 @@ void Sudo::child()
switch (mBackend) switch (mBackend)
{ {
case BACK_SUDO: case BACK_SUDO:
@ -54,12 +54,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ if(!mPreserveEnv) { + if(!mPreserveEnv) {
+ preserve_env_param = "--preserve-env="; + preserve_env_param = "--preserve-env=";
+ preserve_env_param += env_workarounds(mPreserveEnv); + preserve_env_param += env_workarounds(mPreserveEnv);
+ *(param_arg++) = preserve_env_param.c_str(); //preserve environment + } else {
+ preserve_env_param = "--preserve-env";
+ } + }
+ *(param_arg++) = preserve_env_param.c_str();
*(param_arg++) = "/bin/sh"; *(param_arg++) = "/bin/sh";
break; break;
case BACK_DOAS: case BACK_DOAS:
@@ -298,7 +308,7 @@ void Sudo::child() @@ -299,7 +311,7 @@ void Sudo::child()
[[fallthrough]]; [[fallthrough]];
case BACK_SU: case BACK_SU:
case BACK_NONE: case BACK_NONE: