Add cataloging of macho multi-architecture binaries #657
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
Signed-off-by: Alex Goodman <[email protected]>
Signed-off-by: Alex Goodman <[email protected]>
Benchmark Test ResultsBenchmark results from the latest changes vs base branch |
luhring
reviewed
Dec 8, 2021
syft/pkg/cataloger/golang/exe.go
Outdated
| return []exe{&machoExe{file, e}}, nil | ||
| } | ||
|
|
||
| if bytes.HasPrefix(data, []byte("\xCA\xFE\xBA\xBE")) || bytes.HasPrefix(data[1:], []byte("\xCA\xFE\xBA\xBF")) { |
There was a problem hiding this comment.
It'd be good to add a sense of meaning to this if line in order to motivate these bytes.HasPrefix calls for the reader. If these conditions "mean" something, that'd be great as a factored out function, named for what it's doing. WDYT?
There was a problem hiding this comment.
I can add some clarity here for the new code added, however, for code that was copied out of the stdlib I have a preference to leave as is (that is, consistent with the other code around it. If we refactor the stdlib code, when we incorporate new stdlib code we need to re-re-factor it, which isn't fun).
spiffcs
reviewed
Dec 8, 2021
There was a problem hiding this comment.
LGTM - 👍 to @luhring comments, but nothing else to add. Since the code was copied from the standard lib adding comments might make diffing in the future interesting, but I'm all for improvements.
exe.go does have
// This code was copied from the Go std library.
// https://github.com/golang/go/blob/master/src/cmd/go/internal/version/exe.go
// Copyright 2019 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
@wagoodman did add some improvements regarding arch discoverability and stringifying some nasty values.
Signed-off-by: Alex Goodman <[email protected]>
|
Looks like in the future we might be able to get this from exported stdlib code (not released yet though, so not today) golang/go@b37a539 |
luhring
approved these changes
Dec 8, 2021
fengshunli
pushed a commit
to fengshunli/syft
that referenced
this pull request
Jan 24, 2022
* add cataloging within universal binaries Signed-off-by: Alex Goodman <[email protected]> * update json test fixtures Signed-off-by: Alex Goodman <[email protected]> * add comments + correct 32 bit multi arch magic check Signed-off-by: Alex Goodman <[email protected]> Signed-off-by: fsl <[email protected]>
GijsCalis
pushed a commit
to GijsCalis/syft
that referenced
this pull request
Feb 19, 2024
* add cataloging within universal binaries Signed-off-by: Alex Goodman <[email protected]> * update json test fixtures Signed-off-by: Alex Goodman <[email protected]> * add comments + correct 32 bit multi arch magic check Signed-off-by: Alex Goodman <[email protected]>
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.
Adds the ability to catalog Macho multiarchitecture binaries that are built by the go compiler.
Additionally this PR:
This relates to goreleaser/goreleaser#2648 (comment)