mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Improve instance wide ssh commit signing (#34341)
* Signed SSH commits can look in the UI like on GitHub, just like gpg keys today in Gitea * SSH format can be added in gitea config * SSH Signing worked before with DEFAULT_TRUST_MODEL=committer `TRUSTED_SSH_KEYS` can be a list of additional ssh public key contents to trust for every user of this instance Closes #34329 Related #31392 --------- Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: techknowlogick <techknowlogick@gitea.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		
							
								
								
									
										54
									
								
								services/asymkey/commit_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										54
									
								
								services/asymkey/commit_test.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,54 @@ | ||||
| // Copyright 2025 The Gitea Authors. All rights reserved. | ||||
| // SPDX-License-Identifier: MIT | ||||
|  | ||||
| package asymkey | ||||
|  | ||||
| import ( | ||||
| 	"strings" | ||||
| 	"testing" | ||||
|  | ||||
| 	user_model "code.gitea.io/gitea/models/user" | ||||
| 	"code.gitea.io/gitea/modules/git" | ||||
| 	"code.gitea.io/gitea/modules/setting" | ||||
| 	"code.gitea.io/gitea/modules/test" | ||||
|  | ||||
| 	"github.com/stretchr/testify/assert" | ||||
| 	"github.com/stretchr/testify/require" | ||||
| ) | ||||
|  | ||||
| func TestParseCommitWithSSHSignature(t *testing.T) { | ||||
| 	// Here we only test the TrustedSSHKeys. The complete signing test is in tests/integration/gpg_ssh_git_test.go | ||||
| 	t.Run("TrustedSSHKey", func(t *testing.T) { | ||||
| 		defer test.MockVariableValue(&setting.Repository.Signing.SigningName, "gitea")() | ||||
| 		defer test.MockVariableValue(&setting.Repository.Signing.SigningEmail, "gitea@fake.local")() | ||||
| 		defer test.MockVariableValue(&setting.Repository.Signing.TrustedSSHKeys, []string{"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH6Y4idVaW3E+bLw1uqoAfJD7o5Siu+HqS51E9oQLPE9"})() | ||||
|  | ||||
| 		commit, err := git.CommitFromReader(nil, git.Sha1ObjectFormat.EmptyObjectID(), strings.NewReader(`tree 9a93ffa76e8b72bdb6431910b3a506fa2b39f42e | ||||
| author User Two <user2@example.com> 1749230009 +0200 | ||||
| committer User Two <user2@example.com> 1749230009 +0200 | ||||
| gpgsig -----BEGIN SSH SIGNATURE----- | ||||
|  U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgfpjiJ1VpbcT5svDW6qgB8kPujl | ||||
|  KK74epLnUT2hAs8T0AAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 | ||||
|  AAAAQDX2t2iHuuLxEWHLJetYXKsgayv3c43r0pJNfAzdLN55Q65pC5M7rG6++gT2bxcpOu | ||||
|  Y6EXbpLqia9sunEF3+LQY= | ||||
|  -----END SSH SIGNATURE----- | ||||
|  | ||||
| Initial commit with signed file | ||||
| `)) | ||||
| 		require.NoError(t, err) | ||||
| 		committingUser := &user_model.User{ | ||||
| 			ID:    2, | ||||
| 			Name:  "User Two", | ||||
| 			Email: "user2@example.com", | ||||
| 		} | ||||
| 		ret := ParseCommitWithSSHSignature(t.Context(), commit, committingUser) | ||||
| 		require.NotNil(t, ret) | ||||
| 		assert.True(t, ret.Verified) | ||||
| 		assert.False(t, ret.Warning) | ||||
| 		assert.Equal(t, committingUser, ret.CommittingUser) | ||||
| 		if assert.NotNil(t, ret.SigningUser) { | ||||
| 			assert.Equal(t, "gitea", ret.SigningUser.Name) | ||||
| 			assert.Equal(t, "gitea@fake.local", ret.SigningUser.Email) | ||||
| 		} | ||||
| 	}) | ||||
| } | ||||
		Reference in New Issue
	
	Block a user