Use os.Root for device file pulls#97
Merged
Merged
Conversation
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
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.
Summary
This fixes the residual arbitrary host-path write risk in temp and Intrusion Logging acquisition paths.
The previous code derived host destinations from device-reported paths with
strings.TrimPrefixand then passed those paths toadb pull. That allowed unsafe paths to escape the intended output directory, and the Intrusion Logging path made this worse by creating attacker-influenced parent directories withMkdirAll.This PR:
os.Rootfor traditional-mode host writes so files are opened relative to the held output directory rootos.Root-opened files instead of passing host paths toadb pull1.26.3, the newest local toolchain available in this workspaceValidation
go test modules/paths.go modules/paths_test.goGOCACHE=/tmp/go-build go test -run=^$ -vet=off ./...GOCACHE=/tmp/go-build go build ./...A normal
GOCACHE=/tmp/go-build go test ./...still fails on pre-existing vet diagnostics inlog/logger.goaroundLogger.outcalls with arguments but no formatting directives.