From fff15a9f1405a7e08b359cd35ee3229d64c4bec2 Mon Sep 17 00:00:00 2001 From: heapcrash Date: Mon, 22 Jun 2020 18:41:27 -0500 Subject: [PATCH 1/2] Fix extremely verbosel logging of environment when no changes were made Fixes #1448 --- pwnlib/tubes/process.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pwnlib/tubes/process.py b/pwnlib/tubes/process.py index 187e1a92a..dfe63cb99 100644 --- a/pwnlib/tubes/process.py +++ b/pwnlib/tubes/process.py @@ -242,6 +242,9 @@ def __init__(self, argv = None, #: :class:`subprocess.Popen` object that backs this process self.proc = None + # We need to keep a copy of the un-_validated environment for printing + original_env = env + if shell: executable_val, argv_val, env_val = executable, argv, env else: @@ -298,7 +301,7 @@ def __init__(self, argv = None, if self.isEnabledFor(logging.DEBUG): if argv != [self.executable]: message += ' argv=%r ' % self.argv - if env not in (os.environ, None): message += ' env=%r ' % self.env + if original_env not in (os.environ, None): message += ' env=%r ' % self.env with self.progress(message) as p: From a146b6872ffecc058c0a8575f0940e2cfc8cc189 Mon Sep 17 00:00:00 2001 From: heapcrash Date: Mon, 22 Jun 2020 18:42:43 -0500 Subject: [PATCH 2/2] [changelog] Update changelog for #1592 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd5cfff3c..3a43eadef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,9 +56,11 @@ To be released on Jun 30, 2020. - [#1576][1576] Add `executable=` argument to `ELF.search` - [#1584][1584] Add `jmp_esp`/`jmp_rsp` attribute to `ROP` +- [#1592][1592] Fix over-verbose logging of process() environment [1576]: https://github.com/Gallopsled/pwntools/pull/1576 [1584]: https://github.com/Gallopsled/pwntools/pull/1584 +[1592]: https://github.com/Gallopsled/pwntools/pull/1592 ## 4.2.0 (`beta`)