fix(integrations): don't send full env to subprocess#3251
Merged
sentrivana merged 2 commits intomasterfrom Jul 8, 2024
Merged
Conversation
During the arguments modification to `subprocess.Popen.__init__`,
an explicitly empty environment of `{}` is incorrectly confused with a `None`
environment. This causes sentry to pass the entire environment of the
parent process instead of sending just the injected environment variables.
Fix it by only replacing the environment with `os.environ` if the variable
is None, and not just falsy.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #3251 +/- ##
==========================================
- Coverage 79.34% 79.34% -0.01%
==========================================
Files 132 132
Lines 14227 14227
Branches 2987 2987
==========================================
- Hits 11289 11288 -1
Misses 2093 2093
- Partials 845 846 +1
|
szokeasaurusrex
approved these changes
Jul 8, 2024
arjennienhuis
pushed a commit
to arjennienhuis/sentry-python
that referenced
this pull request
Sep 30, 2024
During the arguments modification to `subprocess.Popen.__init__`,
an explicitly empty environment of `{}` is incorrectly confused with a `None`
environment. This causes sentry to pass the entire environment of the
parent process instead of sending just the injected environment variables.
Fix it by only replacing the environment with `os.environ` if the variable
is None, and not just falsy.
---------
Co-authored-by: Kevin Michel <kevin.michel@aiven.io>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
During the arguments modification to
subprocess.Popen.__init__, an explicitly empty environment of{}is incorrectly confused with aNoneenvironment. This causes sentry to pass the entire environment of the parent process instead of sending just the injected environment variables.Fix it by only replacing the environment with
os.environif the variable is None, and not just falsy.