-
-
Notifications
You must be signed in to change notification settings - Fork 9.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cache bottle attestations #18581
Open
carlocab
wants to merge
2
commits into
master
Choose a base branch
from
attestation-cache
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+38
−1
Open
Cache bottle attestations #18581
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -62,6 +62,8 @@ def stale?(entry, scrub: false) | |
stale_cask?(pathname, scrub) | ||
when :gh_actions_artifact | ||
stale_gh_actions_artifact?(pathname, scrub) | ||
when :attestation | ||
stale_attestation?(pathname, scrub) | ||
else | ||
stale_formula?(pathname, scrub) | ||
end | ||
|
@@ -76,6 +78,13 @@ def stale_gh_actions_artifact?(pathname, scrub) | |
scrub || prune?(pathname, GH_ACTIONS_ARTIFACT_CLEANUP_DAYS) | ||
end | ||
|
||
ATTESTATION_CLEANUP_DAYS = 3 | ||
|
||
sig { params(pathname: Pathname, scrub: T::Boolean).returns(T::Boolean) } | ||
def stale_attestation?(pathname, scrub) | ||
scrub || prune?(pathname, ATTESTATION_CLEANUP_DAYS) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Might be nice if this could be cleaned up based on the state of the cached bottles? Not a blocker, very much nice-to-have. |
||
end | ||
|
||
sig { params(pathname: Pathname, scrub: T::Boolean).returns(T::Boolean) } | ||
def stale_api_source?(pathname, scrub) | ||
return true if scrub | ||
|
@@ -381,11 +390,13 @@ def cache_files | |
cask_files = (cache/"Cask").directory? ? (cache/"Cask").children : [] | ||
api_source_files = (cache/"api-source").glob("*/*/*/*/*") # `<org>/<repo>/<git_head>/<type>/<token>.rb` | ||
gh_actions_artifacts = (cache/"gh-actions-artifact").directory? ? (cache/"gh-actions-artifact").children : [] | ||
attestations = (cache/"attestation").directory? ? (cache/"attestation").children : [] | ||
|
||
files.map { |path| { path:, type: nil } } + | ||
cask_files.map { |path| { path:, type: :cask } } + | ||
api_source_files.map { |path| { path:, type: :api_source } } + | ||
gh_actions_artifacts.map { |path| { path:, type: :gh_actions_artifact } } | ||
gh_actions_artifacts.map { |path| { path:, type: :gh_actions_artifact } } + | ||
attestations.map { |path| { path:, type: :attestation } } | ||
end | ||
|
||
def cleanup_empty_api_source_directories(directory = cache/"api-source") | ||
|
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to make sure I understand: the intended behavior here is to treat a cached attestation as implicitly previously verified, right?
I think we could go two ways with this: either assume
cached == verified
(which in turn means an attacker who can modify the cache/insert a dummy cache member can bypass verification, although such an attacker is already pretty powerful), or perform verification again on the cached attestation (so skip the download, but do the rest of thegh attestation verify
).The first seems fine to me, but the second is perhaps preferable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed 👍🏻