-
-
Notifications
You must be signed in to change notification settings - Fork 763
feat: add --trust CLI and remote.trust config for remote tasks #2491
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
Open
maciej-lech
wants to merge
1
commit into
go-task:main
Choose a base branch
from
maciej-lech:remote-trust
base: main
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.
+330
−3
Open
Changes from all commits
Commits
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 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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -21,6 +21,7 @@ type Remote struct { | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Offline *bool `yaml:"offline"` | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Timeout *time.Duration `yaml:"timeout"` | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| CacheExpiry *time.Duration `yaml:"cache-expiry"` | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| Trust []string `yaml:"trust"` | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| // Merge combines the current TaskRC with another TaskRC, prioritizing non-nil fields from the other TaskRC. | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -43,6 +44,31 @@ func (t *TaskRC) Merge(other *TaskRC) { | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Remote.Timeout = cmp.Or(other.Remote.Timeout, t.Remote.Timeout) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Remote.CacheExpiry = cmp.Or(other.Remote.CacheExpiry, t.Remote.CacheExpiry) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| // Merge Trust lists - combine both lists with other's entries taking precedence | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| // Remove duplicates by using a map | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if len(other.Remote.Trust) > 0 { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| seen := make(map[string]bool) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| merged := []string{} | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| // Add other's hosts first | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| for _, host := range other.Remote.Trust { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if !seen[host] { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| seen[host] = true | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| merged = append(merged, host) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| // Then add base's hosts that aren't duplicates | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| for _, host := range t.Remote.Trust { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| if !seen[host] { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| seen[host] = true | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| merged = append(merged, host) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Remote.Trust = merged | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+47
to
+71
Member
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. Since the order doesn’t matter (a host is trusted regardless of its position in the slice), we can simplify it to:
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Verbose = cmp.Or(other.Verbose, t.Verbose) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| t.Concurrency = cmp.Or(other.Concurrency, t.Concurrency) | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Oops, something went wrong.
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.
Can't I trust URLs? I trust github.com/myself but I don't trust github.com/shady.
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.
I was thinking about that, but using URLs requires more assumptions how to compare provided URL with the
trustconfig.https://github.com/myselfbut nothttps://github.com/myselfHackedByShady- which could be easily solved by settinghttps://github.com/myself/and nothttps://github.com/myself. So maybe this is the best way.https://github.com/myself/*or extended versionhttps://github.com/myself/**/*https:\/\/github\.com\/myself\/.*