Sos pmoravec dont obfuscate tmpdir path #2887
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
When writing down a private_map file local to a sosreport, do cleanup of its filename but not its leading path (like /var/tmp/). Relevant: sosreport#2887 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
Congratulations! One of the builds has completed. 🍾 You can install the built RPMs by following these steps:
Please note that the RPMs should be used only in a testing environment. |
When renaming the sosreport directory (inside the /var/tmp/sos.* working directory), apply cleaner obfuscation to the sosreport directory but not to the working directory path. This is achieved by proper setting of FileCacheArchive._name that should have the relative directory name only without the leading path. Resolves: sosreport#2887 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
pmoravec
force-pushed
the
sos-pmoravec-dont-obfuscate-tmpdir-path
branch
from
df10fe1
to
ff07224
Compare
pmoravec
commented
Mar 17, 2022
| @@ -135,6 +135,9 @@ class FileCacheArchive(Archive): | |||
| def __init__(self, name, tmpdir, policy, threads, enc_opts, sysroot, | |||
| manifest=None): | |||
| self._name = name | |||
| # truncate the name just relative to the tmpdir in case of full path | |||
| if os.path.commonprefix([self._name, tmpdir]) == tmpdir: | |||
There was a problem hiding this comment.
This condition is required due to TarFileArchive.add(testfile`) where we add files without their path.
TurboTurtle
approved these changes
Mar 25, 2022
TurboTurtle
pushed a commit
that referenced
this pull request
Mar 25, 2022
When writing down a private_map file local to a sosreport, do cleanup of its filename but not its leading path (like /var/tmp/). Relevant: #2887 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
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.
Two commits preventing to apply cleaner obfuscation to the working directory path itself. Creating files or moving directories must happen within the (non-obfuscated) working dir.
The
archivecommit changes purpose ofself._namevariable from/var/tmp/sos.oq9ae6gj/sosreport-pmoravec-rhel8-2022-03-16-qzazpxito justsosreport-pmoravec-rhel8-2022-03-16-qzazpxi. Since the full path is already captured in_archive_rootvariable.Please place an 'X' inside each '[]' to confirm you adhere to our Contributor Guidelines