Skip to content

Instance signing rule pubkey should allow all public keys, not just GPG #35357

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

Merged
merged 7 commits into from
Aug 26, 2025
Merged

Instance signing rule pubkey should allow all public keys, not just GPG #35357

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59bb08b
fix(sign): `pubkey` should allow all public keys
lyricwulf Aug 25, 2025
2212546
fix: return false on error
lyricwulf Aug 25, 2025
234896b
test: add test cases for userHasPubkeys
lyricwulf Aug 26, 2025
4cb3c88
cleanup: fmt
lyricwulf Aug 26, 2025
a101161
optimize db query by "db.Exist"
wxiaoguang Aug 26, 2025
bd485f6
prepare test data for unit-test
wxiaoguang Aug 26, 2025
50da729
fix fmt
wxiaoguang Aug 26, 2025
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
54 changes: 34 additions & 20 deletions services/asymkey/sign.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,32 @@ func signingModeFromStrings(modeStrings []string) []signingMode {
return returnable
}

func userHasPubkeys(ctx context.Context, u *user_model.User) (bool, error) {
gpgKeys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
OwnerID: u.ID,
IncludeSubKeys: true,
})
if err != nil {
return false, err
}
if len(gpgKeys) > 0 {
return true, nil
}

sshKeys, err := db.Find[asymkey_model.PublicKey](ctx, asymkey_model.FindPublicKeyOptions{
OwnerID: u.ID,
NotKeytype: asymkey_model.KeyTypePrincipal,
})
if err != nil {
return false, err
}
if len(sshKeys) > 0 {
return true, nil
}

return false, nil
}

// ErrWontSign explains the first reason why a commit would not be signed
// There may be other reasons - this is just the first reason found
type ErrWontSign struct {
Expand Down Expand Up @@ -170,14 +196,11 @@ Loop:
case always:
break Loop
case pubkey:
keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
OwnerID: u.ID,
IncludeSubKeys: true,
})
hasKeys, err := userHasPubkeys(ctx, u)
if err != nil {
return false, nil, nil, err
}
if len(keys) == 0 {
if !hasKeys {
return false, nil, nil, &ErrWontSign{pubkey}
}
case twofa:
Expand Down Expand Up @@ -210,14 +233,11 @@ Loop:
case always:
break Loop
case pubkey:
keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
OwnerID: u.ID,
IncludeSubKeys: true,
})
hasKeys, err := userHasPubkeys(ctx, u)
if err != nil {
return false, nil, nil, err
}
if len(keys) == 0 {
if !hasKeys {
return false, nil, nil, &ErrWontSign{pubkey}
}
case twofa:
Expand Down Expand Up @@ -266,14 +286,11 @@ Loop:
case always:
break Loop
case pubkey:
keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
OwnerID: u.ID,
IncludeSubKeys: true,
})
hasKeys, err := userHasPubkeys(ctx, u)
if err != nil {
return false, nil, nil, err
}
if len(keys) == 0 {
if !hasKeys {
return false, nil, nil, &ErrWontSign{pubkey}
}
case twofa:
Expand Down Expand Up @@ -337,14 +354,11 @@ Loop:
case always:
break Loop
case pubkey:
keys, err := db.Find[asymkey_model.GPGKey](ctx, asymkey_model.FindGPGKeyOptions{
OwnerID: u.ID,
IncludeSubKeys: true,
})
hasKeys, err := userHasPubkeys(ctx, u)
if err != nil {
return false, nil, nil, err
}
if len(keys) == 0 {
if !hasKeys {
return false, nil, nil, &ErrWontSign{pubkey}
}
case twofa:
Expand Down