Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix misuse of PublicKeyCallback #32810

Merged
merged 10 commits into from
Dec 13, 2024
Merged

Fix misuse of PublicKeyCallback #32810

merged 10 commits into from
Dec 13, 2024

Conversation

wxiaoguang
Copy link
Contributor

Only upgrading the ssh package is not enough.

@wxiaoguang wxiaoguang added the backport/v1.22 This PR should be backported to Gitea 1.22 label Dec 12, 2024
@wxiaoguang wxiaoguang added this to the 1.23.0 milestone Dec 12, 2024
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 12, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 12, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Dec 12, 2024
@wxiaoguang
Copy link
Contributor Author

More context: Patching PublicKeyCallback for CVE-2024-45337 gliderlabs/ssh#242

@wxiaoguang wxiaoguang added the topic/security Something leaks user information or is otherwise vulnerable. Should be fixed! label Dec 12, 2024
@wxiaoguang wxiaoguang changed the title Fix SSH public key bypass Fix misuse of PublicKeyCallback Dec 12, 2024
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 12, 2024
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 12, 2024
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 13, 2024
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 13, 2024
@lunny lunny enabled auto-merge (squash) December 13, 2024 03:32
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 13, 2024
@lunny lunny merged commit 2910f38 into go-gitea:main Dec 13, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 13, 2024
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.22. @wxiaoguang, please send one manually. 🍵

go run ./contrib/backport 32810
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Dec 13, 2024
@wxiaoguang wxiaoguang deleted the fix-ssh branch December 13, 2024 06:15
lunny added a commit to lunny/gitea that referenced this pull request Dec 13, 2024
@lunny
Backport go-gitea#32810
dc8f45f
@lunny lunny mentioned this pull request Dec 13, 2024
Merged
lunny added a commit that referenced this pull request Dec 13, 2024
@lunny
Fix misuse of PublicKeyCallback(#32810) (#32824)
c630b88 
Backport #32810
@lunny lunny added the backport/done All backports for this PR have been created label Dec 13, 2024
@wxiaoguang
Copy link
Contributor Author

Do some improvements for 1.23: Fine tune ssh related comments and code #32846

freebsd-git pushed a commit to freebsd/freebsd-ports that referenced this pull request Dec 18, 2024
@stblassitude @VVD
security/vuxml: add records for www/gitea < 1.22.6
44f68d0 
go-gitea/gitea#32810
GHSA-v778-237x-gjrc
go-gitea/gitea#32791
go-gitea/gitea#32654
go-gitea/gitea#32531
go-gitea/gitea#32473

PR:	283389
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@lunny lunny lunny approved these changes

@bohde bohde bohde approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/dependencies modifies/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files. topic/security Something leaks user information or is otherwise vulnerable. Should be fixed!
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.
5 participants
@wxiaoguang @GiteaBot @bohde @lunny @techknowlogick