-
Notifications
You must be signed in to change notification settings - Fork 811
v5: plumbing: transport, Reintroduce SetHostKeyCallback. Fix #1514 #1515
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
Conversation
The PR go-git#1482 renamed SetHostKeyCallback to SetHostKeyCallbackAndAlgorithms, due to the change in behaviour. For keeping backwards compatibility within existing v5, a new SetHostKeyCallback is being introduced that simply calls back to SetHostKeyCallbackAndAlgorithms. Some tests were introduced to enforce expected behaviour. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
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.
Thanks, I did not realize that there are users of HostKeyCallbackHelper
outside go-git
. Thank you for addressing it.
|
||
// fallback allows for injecting the fallback call, which is called | ||
// when a HostKeyCallback is not set. | ||
fallback func(files ...string) (ssh.HostKeyCallback, error) |
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.
Might be worth indicating that this is only meant for testing, but in practice it always calls NewKnownHostsCallback
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.
Good point. I was initially considered this, but given that it is already an internal field and the code may not necessarily move into v6
, I ended up deciding against it.
This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) | `v5.13.1` -> `v5.16.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>go-git/go-git (github.com/go-git/go-git/v5)</summary> ### [`v5.16.2`](https://github.com/go-git/go-git/releases/tag/v5.16.2) [Compare Source](go-git/go-git@v5.16.1...v5.16.2) #### What's Changed - utils: fix diff so subpaths work for sparse checkouts, fixes 1455 to releases/v5.x by [@​kane8n](https://github.com/kane8n) in go-git/go-git#1567 **Full Changelog**: go-git/go-git@v5.16.1...v5.16.2 ### [`v5.16.1`](https://github.com/go-git/go-git/releases/tag/v5.16.1) [Compare Source](go-git/go-git@v5.16.0...v5.16.1) #### What's Changed - utils: merkletrie, Fix diff on sparse-checkout index. Fixes [#​1406](go-git/go-git#1406) to releases/v5.x by [@​kane8n](https://github.com/kane8n) in go-git/go-git#1561 #### New Contributors - [@​kane8n](https://github.com/kane8n) made their first contribution in go-git/go-git#1561 **Full Changelog**: go-git/go-git@v5.16.0...v5.16.1 ### [`v5.16.0`](https://github.com/go-git/go-git/releases/tag/v5.16.0) [Compare Source](go-git/go-git@v5.15.0...v5.16.0) #### What's Changed - \[v5] plumbing: support mTLS for HTTPS protocol by [@​hiddeco](https://github.com/hiddeco) in go-git/go-git#1510 - v5: plumbing: transport, Reintroduce SetHostKeyCallback. Fix [#​1514](go-git/go-git#1514) by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#1515 **Full Changelog**: go-git/go-git@v5.15.0...v5.16.0 ### [`v5.15.0`](https://github.com/go-git/go-git/releases/tag/v5.15.0) [Compare Source](go-git/go-git@v5.14.0...v5.15.0) #### What's Changed - plumbing: add cert auth support to `releases/v5.x` by [@​Javier-varez](https://github.com/Javier-varez) in go-git/go-git#1482 - v5: Bump dependencies by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#1505 **Full Changelog**: go-git/go-git@v5.14.0...v5.15.0 ### [`v5.14.0`](https://github.com/go-git/go-git/releases/tag/v5.14.0) [Compare Source](go-git/go-git@v5.13.2...v5.14.0) #### What's Changed - v5: Bump Go and dependencies to mitigate [GO-2025-3487](https://pkg.go.dev/vuln/GO-2025-3487) by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#1436⚠️ Note that this version requires Go 1.23, due to the bump to `golang.org/x/crypto@v0.35.0` which mitigates the CVE above. User's that can't bump to Go 1.23 will need to remain on the previous v5.13.x release. **Full Changelog**: go-git/go-git@v5.13.2...v5.14.0 ### [`v5.13.2`](https://github.com/go-git/go-git/releases/tag/v5.13.2) [Compare Source](go-git/go-git@v5.13.1...v5.13.2) #### What's Changed - plumbing: use the correct user agent string. Fixes [#​883](go-git/go-git#883) by [@​uragirii](https://github.com/uragirii) in go-git/go-git#1364 - build: bump golang.org/x/sys from 0.28.0 to 0.29.0 in the golang-org group by [@​dependabot](https://github.com/dependabot) in go-git/go-git#1365 - build: bump the golang-org group with 2 updates by [@​dependabot](https://github.com/dependabot) in go-git/go-git#1367 - build: bump github.com/ProtonMail/go-crypto from 1.1.3 to 1.1.4 by [@​dependabot](https://github.com/dependabot) in go-git/go-git#1368 - build: bump github.com/go-git/go-billy/v5 from 5.6.1 to 5.6.2 by [@​dependabot](https://github.com/dependabot) in go-git/go-git#1378 - build: bump github/codeql-action from 3.28.0 to 3.28.1 by [@​dependabot](https://github.com/dependabot) in go-git/go-git#1376 - build: bump github.com/elazarl/goproxy from 1.2.3 to 1.4.0 by [@​dependabot](https://github.com/dependabot) in go-git/go-git#1377 - git: worktree, fix restoring dot slash files (backported to v5). Fixes [#​1176](go-git/go-git#1176) by [@​BeChris](https://github.com/BeChris) in go-git/go-git#1361 - build: bump github.com/pjbgf/sha1cd from 0.3.0 to 0.3.2 by [@​dependabot](https://github.com/dependabot) in go-git/go-git#1392 - git: worktree\_status, fix adding dot slash files to working tree (backported to v5). Fixes [#​1150](go-git/go-git#1150) by [@​BeChris](https://github.com/BeChris) in go-git/go-git#1359 - build: bump github.com/ProtonMail/go-crypto from 1.1.4 to 1.1.5 by [@​dependabot](https://github.com/dependabot) in go-git/go-git#1383 **Full Changelog**: go-git/go-git@v5.13.1...v5.13.2 </details> --- ### Configuration 📅 **Schedule**: Branch creation - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS40My41IiwidXBkYXRlZEluVmVyIjoiNDEuNDMuNSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==--> Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/800 Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org> Co-authored-by: Renovate Bot <bot@kriese.eu> Co-committed-by: Renovate Bot <bot@kriese.eu>
The PR #1482 renamed
SetHostKeyCallback
toSetHostKeyCallbackAndAlgorithms
, due to the change in behaviour in that method. For keeping backwards compatibility with v5, a newSetHostKeyCallback
is being introduced that simply calls back toSetHostKeyCallbackAndAlgorithms
.Some tests were introduced to enforce expected behaviour.