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

restrict certificate type for builtin SSH server #26789

Merged
merged 2 commits into from
Sep 1, 2023
Merged

restrict certificate type for builtin SSH server #26789

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12eb64d
restrict certificate type for builtin SSH server
Gusted Jul 31, 2023
e459885
Merge branch 'main' into wip-gitea-ssh
GiteaBot Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions modules/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,12 @@ func publicKeyHandler(ctx ssh.Context, key ssh.PublicKey) bool {
return false
}

if cert.CertType != gossh.UserCert {
log.Warn("Certificate Rejected: Not a user certificate")
log.Warn("Failed authentication attempt from %s", ctx.RemoteAddr())
Comment on lines +195 to +196
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you merge these in one.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think it's fine. Go is not really made for multi-line strings.

return false
}

// look for the exact principal
principalLoop:
for _, principal := range cert.ValidPrincipals {
Expand Down