Allow passing environment variables to execSandboxed #1703
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows to pass extra environment variables to `execSandboxed` in preparation for a fix for #1698. It also changes how environment variables are used if firejail is enabled. All environment variables (those from the config and those passed to `execSandboxed`) are now passed via the `--env` parameter of the firejail command instead of injecting them into the environment. This has been suggested earlier in #337 (comment) by @mwz.
Codecov Report
@@ Coverage Diff @@
## master #1703 +/- ##
==========================================
+ Coverage 73.84% 73.91% +0.06%
==========================================
Files 115 115
Lines 1946 1951 +5
Branches 52 58 +6
==========================================
+ Hits 1437 1442 +5
Misses 509 509
Continue to review full report at Codecov.
|
|
The last commit also clears the inherited environment if firejail is used. This closes #595. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows to pass extra environment variables to
execSandboxedinpreparation for a fix for #1698. It also changes how environment
variables are used if firejail is enabled. All environment variables
(those from the config and those passed to
execSandboxed) arenow passed via the
--envparameter of the firejail command instead ofinjecting them into the environment. This has been suggested earlier in
#337 (comment) by @mwz.