mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-05-15 14:32:42 +00:00
feat(sec): Add SSH signing support for instances (#6897)
- Add support to set `gpg.format` in the Git config, via the new `[repository.signing].FORMAT` option. This is to tell Git that the instance would like to use SSH instead of OpenPGP to sign its commits. This is guarded behind a Git version check for v2.34.0 and a check that a `ssh-keygen` binary is present. - Add support to recognize the public SSH key that is given to `[repository.signing].SIGNING_KEY` as the signing key by the instance. - Thus this allows the instance to use SSH commit signing for commits that the instance creates (e.g. initial and squash commits) instead of using PGP. - Technically (although I have no clue how as this is not documented) you can have a different PGP signing key for different repositories; this is not implemented for SSH signing. - Add unit and integration testing. - `TestInstanceSigning` was reworked from `TestGPGGit`, now also includes testing for SHA256 repositories. Is the main integration test that actually signs commits and checks that they are marked as verified by Forgejo. - `TestParseCommitWithSSHSignature` is a unit test that makes sure that if a SSH instnace signing key is set, that it is used to possibly verify instance SSH signed commits. - `TestSyncConfigGPGFormat` is a unit test that makes sure the correct git config is set according to the signing format setting. Also checks that the guarded git version check and ssh-keygen binary presence check is done correctly. - `TestSSHInstanceKey` is a unit test that makes sure the parsing of a SSH signing key is done correctly. - `TestAPISSHSigningKey` is a integration test that makes sure the newly added API route `/api/v1/signing-key.ssh` responds correctly. Documentation PR: forgejo/docs#1122 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/6897 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Gusted <postmaster@gusted.xyz> Co-committed-by: Gusted <postmaster@gusted.xyz>
This commit is contained in:
parent
eb85681b41
commit
b55c72828e
17 changed files with 687 additions and 306 deletions
|
@ -278,6 +278,49 @@ func syncGitConfig() (err error) {
|
|||
return err
|
||||
}
|
||||
|
||||
switch setting.Repository.Signing.Format {
|
||||
case "ssh":
|
||||
// First do a git version check.
|
||||
if CheckGitVersionAtLeast("2.34.0") != nil {
|
||||
return errors.New("ssh signing requires Git >= 2.34.0")
|
||||
}
|
||||
|
||||
// Get the ssh-keygen binary that Git will use.
|
||||
// This can be overriden in app.ini in [git.config] section, so we must
|
||||
// query this information.
|
||||
sshKeygenPath, err := configGet("gpg.ssh.program")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// git is very stubborn and does not give a default value, so we must do
|
||||
// this ourselves.
|
||||
if len(sshKeygenPath) == 0 {
|
||||
// Default value of git, very unlikely to change.
|
||||
// https://github.com/git/git/blob/5b97a56fa0e7d580dc8865b73107407c9b3f0eff/gpg-interface.c#L116
|
||||
sshKeygenPath = "ssh-keygen"
|
||||
}
|
||||
|
||||
// Although there's a version requirement of 8.2p1, there's no cross-version
|
||||
// method to get the version of ssh-keygen. Therefore we do a simple binary
|
||||
// presence check and hope for the best.
|
||||
if _, err := exec.LookPath(sshKeygenPath); err != nil {
|
||||
if errors.Is(err, exec.ErrNotFound) {
|
||||
return errors.New("git signing requires a ssh-keygen binary")
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
if err := configSet("gpg.format", "ssh"); err != nil {
|
||||
return err
|
||||
}
|
||||
// openpgp is already the default value, so in the case of a non SSH format
|
||||
// set the value to openpgp.
|
||||
default:
|
||||
if err := configSet("gpg.format", "openpgp"); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// By default partial clones are disabled, enable them from git v2.22
|
||||
if !setting.Git.DisablePartialClone && CheckGitVersionAtLeast("2.22") == nil {
|
||||
if err = configSet("uploadpack.allowfilter", "true"); err != nil {
|
||||
|
@ -324,6 +367,15 @@ func CheckGitVersionEqual(equal string) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func configGet(key string) (string, error) {
|
||||
stdout, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil)
|
||||
if err != nil && !IsErrorExitCode(err, 1) {
|
||||
return "", fmt.Errorf("failed to get git config %s, err: %w", key, err)
|
||||
}
|
||||
|
||||
return strings.TrimSpace(stdout), nil
|
||||
}
|
||||
|
||||
func configSet(key, value string) error {
|
||||
stdout, _, err := NewCommand(DefaultContext, "config", "--global", "--get").AddDynamicArguments(key).RunStdString(nil)
|
||||
if err != nil && !IsErrorExitCode(err, 1) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue