From ea1d09718ce2e3bf043c60bae76dd6bd7e84e9fe Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 2 Mar 2023 06:32:21 +0100 Subject: [PATCH] Fix commit retrieval by tag (#21804) It is not correct to return tag data when commit data is requested, so remove the hacky code that overwrote parts of a commit with parts of a tag. This fixes commit retrieval by tag for both the latest commit in the UI and the commit info on tag webhook events. Fixes: https://github.com/go-gitea/gitea/issues/21687 Replaces: https://github.com/go-gitea/gitea/pull/21693 Screenshot 2022-11-13 at 15 26 37 image --------- Co-authored-by: Lunny Xiao --- modules/git/repo_commit_gogit.go | 39 ------------------ modules/git/repo_commit_nogogit.go | 4 -- modules/git/repo_commit_test.go | 5 ++- modules/git/repo_ref_test.go | 12 ++++-- modules/git/repo_stats_test.go | 4 +- modules/git/repo_tag_test.go | 9 ++-- modules/git/repo_test.go | 6 +-- modules/git/tests/repos/repo1_bare/index | Bin 0 -> 65 bytes modules/git/tests/repos/repo1_bare/logs/HEAD | 1 + .../repos/repo1_bare/logs/refs/heads/master | 1 + .../1c/91d130dc5fb75fd2d9f586a058650889cfe7fb | Bin 0 -> 813 bytes .../28/b55526e7100924d864dd89e35c1ea62e7a5a32 | Bin 0 -> 818 bytes .../36/f97d9a96457e2bab511db30fe2db03893ebc64 | Bin 0 -> 770 bytes .../4b/825dc642cb6eb9a060e54bf8d69288fbee4904 | Bin 0 -> 15 bytes .../93/3305878a3c9ad485c29b87fb662a73a9675c4b | Bin 0 -> 770 bytes .../ce/064814f4a0d337b333e646ece456cd39fab612 | Bin 0 -> 815 bytes .../cf/8b0b492a950b358a7ce7f9d01b18aef48a6b2d | Bin 0 -> 827 bytes .../tests/repos/repo1_bare/refs/heads/master | 2 +- .../repos/repo1_bare/refs/tags/signed-tag | 1 + 19 files changed, 26 insertions(+), 58 deletions(-) create mode 100644 modules/git/tests/repos/repo1_bare/index create mode 100644 modules/git/tests/repos/repo1_bare/objects/1c/91d130dc5fb75fd2d9f586a058650889cfe7fb create mode 100644 modules/git/tests/repos/repo1_bare/objects/28/b55526e7100924d864dd89e35c1ea62e7a5a32 create mode 100644 modules/git/tests/repos/repo1_bare/objects/36/f97d9a96457e2bab511db30fe2db03893ebc64 create mode 100644 modules/git/tests/repos/repo1_bare/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 create mode 100644 modules/git/tests/repos/repo1_bare/objects/93/3305878a3c9ad485c29b87fb662a73a9675c4b create mode 100644 modules/git/tests/repos/repo1_bare/objects/ce/064814f4a0d337b333e646ece456cd39fab612 create mode 100644 modules/git/tests/repos/repo1_bare/objects/cf/8b0b492a950b358a7ce7f9d01b18aef48a6b2d create mode 100644 modules/git/tests/repos/repo1_bare/refs/tags/signed-tag diff --git a/modules/git/repo_commit_gogit.go b/modules/git/repo_commit_gogit.go index 72de158e6e..ce0af93614 100644 --- a/modules/git/repo_commit_gogit.go +++ b/modules/git/repo_commit_gogit.go @@ -7,7 +7,6 @@ package git import ( - "fmt" "strings" "github.com/go-git/go-git/v5/plumbing" @@ -67,38 +66,6 @@ func (repo *Repository) IsCommitExist(name string) bool { return err == nil } -func convertPGPSignatureForTag(t *object.Tag) *CommitGPGSignature { - if t.PGPSignature == "" { - return nil - } - - var w strings.Builder - var err error - - if _, err = fmt.Fprintf(&w, - "object %s\ntype %s\ntag %s\ntagger ", - t.Target.String(), t.TargetType.Bytes(), t.Name); err != nil { - return nil - } - - if err = t.Tagger.Encode(&w); err != nil { - return nil - } - - if _, err = fmt.Fprintf(&w, "\n\n"); err != nil { - return nil - } - - if _, err = fmt.Fprintf(&w, t.Message); err != nil { - return nil - } - - return &CommitGPGSignature{ - Signature: t.PGPSignature, - Payload: strings.TrimSpace(w.String()) + "\n", - } -} - func (repo *Repository) getCommit(id SHA1) (*Commit, error) { var tagObject *object.Tag @@ -122,12 +89,6 @@ func (repo *Repository) getCommit(id SHA1) (*Commit, error) { commit := convertCommit(gogitCommit) commit.repo = repo - if tagObject != nil { - commit.CommitMessage = strings.TrimSpace(tagObject.Message) - commit.Author = &tagObject.Tagger - commit.Signature = convertPGPSignatureForTag(tagObject) - } - tree, err := gogitCommit.Tree() if err != nil { return nil, err diff --git a/modules/git/repo_commit_nogogit.go b/modules/git/repo_commit_nogogit.go index 7373d01c8e..d5eb723100 100644 --- a/modules/git/repo_commit_nogogit.go +++ b/modules/git/repo_commit_nogogit.go @@ -107,10 +107,6 @@ func (repo *Repository) getCommitFromBatchReader(rd *bufio.Reader, id SHA1) (*Co return nil, err } - commit.CommitMessage = strings.TrimSpace(tag.Message) - commit.Author = tag.Tagger - commit.Signature = tag.Signature - return commit, nil case "commit": commit, err := CommitFromReader(repo, id, io.LimitReader(rd, size)) diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go index af8c0592fe..729fb0ba10 100644 --- a/modules/git/repo_commit_test.go +++ b/modules/git/repo_commit_test.go @@ -43,12 +43,13 @@ func TestGetTagCommitWithSignature(t *testing.T) { assert.NoError(t, err) defer bareRepo1.Close() - commit, err := bareRepo1.GetCommit("3ad28a9149a2864384548f3d17ed7f38014c9e8a") + // both the tag and the commit are signed here, this validates only the commit signature + commit, err := bareRepo1.GetCommit("28b55526e7100924d864dd89e35c1ea62e7a5a32") assert.NoError(t, err) assert.NotNil(t, commit) assert.NotNil(t, commit.Signature) // test that signature is not in message - assert.Equal(t, "tag", commit.CommitMessage) + assert.Equal(t, "signed-commit\n", commit.CommitMessage) } func TestGetCommitWithBadCommitID(t *testing.T) { diff --git a/modules/git/repo_ref_test.go b/modules/git/repo_ref_test.go index 776d7ce3e1..c08ea12760 100644 --- a/modules/git/repo_ref_test.go +++ b/modules/git/repo_ref_test.go @@ -19,13 +19,14 @@ func TestRepository_GetRefs(t *testing.T) { refs, err := bareRepo1.GetRefs() assert.NoError(t, err) - assert.Len(t, refs, 5) + assert.Len(t, refs, 6) expectedRefs := []string{ BranchPrefix + "branch1", BranchPrefix + "branch2", BranchPrefix + "master", TagPrefix + "test", + TagPrefix + "signed-tag", NotesRef, } @@ -43,9 +44,12 @@ func TestRepository_GetRefsFiltered(t *testing.T) { refs, err := bareRepo1.GetRefsFiltered(TagPrefix) assert.NoError(t, err) - if assert.Len(t, refs, 1) { - assert.Equal(t, TagPrefix+"test", refs[0].Name) + if assert.Len(t, refs, 2) { + assert.Equal(t, TagPrefix+"signed-tag", refs[0].Name) assert.Equal(t, "tag", refs[0].Type) - assert.Equal(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", refs[0].Object.String()) + assert.Equal(t, "36f97d9a96457e2bab511db30fe2db03893ebc64", refs[0].Object.String()) + assert.Equal(t, TagPrefix+"test", refs[1].Name) + assert.Equal(t, "tag", refs[1].Type) + assert.Equal(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", refs[1].Object.String()) } } diff --git a/modules/git/repo_stats_test.go b/modules/git/repo_stats_test.go index 668ed67999..3d032385ee 100644 --- a/modules/git/repo_stats_test.go +++ b/modules/git/repo_stats_test.go @@ -24,9 +24,9 @@ func TestRepository_GetCodeActivityStats(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, code) - assert.EqualValues(t, 9, code.CommitCount) + assert.EqualValues(t, 10, code.CommitCount) assert.EqualValues(t, 3, code.AuthorCount) - assert.EqualValues(t, 9, code.CommitCountInAllBranches) + assert.EqualValues(t, 10, code.CommitCountInAllBranches) assert.EqualValues(t, 10, code.Additions) assert.EqualValues(t, 1, code.Deletions) assert.Len(t, code.Authors, 3) diff --git a/modules/git/repo_tag_test.go b/modules/git/repo_tag_test.go index 589349a72c..8ccfec3eb2 100644 --- a/modules/git/repo_tag_test.go +++ b/modules/git/repo_tag_test.go @@ -25,11 +25,14 @@ func TestRepository_GetTags(t *testing.T) { assert.NoError(t, err) return } - assert.Len(t, tags, 1) + assert.Len(t, tags, 2) assert.Equal(t, len(tags), total) - assert.EqualValues(t, "test", tags[0].Name) - assert.EqualValues(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", tags[0].ID.String()) + assert.EqualValues(t, "signed-tag", tags[0].Name) + assert.EqualValues(t, "36f97d9a96457e2bab511db30fe2db03893ebc64", tags[0].ID.String()) assert.EqualValues(t, "tag", tags[0].Type) + assert.EqualValues(t, "test", tags[1].Name) + assert.EqualValues(t, "3ad28a9149a2864384548f3d17ed7f38014c9e8a", tags[1].ID.String()) + assert.EqualValues(t, "tag", tags[1].Type) } func TestRepository_GetTag(t *testing.T) { diff --git a/modules/git/repo_test.go b/modules/git/repo_test.go index 2a39148192..044b9d4065 100644 --- a/modules/git/repo_test.go +++ b/modules/git/repo_test.go @@ -14,10 +14,10 @@ func TestGetLatestCommitTime(t *testing.T) { bareRepo1Path := filepath.Join(testReposDir, "repo1_bare") lct, err := GetLatestCommitTime(DefaultContext, bareRepo1Path) assert.NoError(t, err) - // Time is Sun Jul 21 22:43:13 2019 +0200 + // Time is Sun Nov 13 16:40:14 2022 +0100 // which is the time of commit - // feaf4ba6bc635fec442f46ddd4512416ec43c2c2 (refs/heads/master) - assert.EqualValues(t, 1563741793, lct.Unix()) + // ce064814f4a0d337b333e646ece456cd39fab612 (refs/heads/master) + assert.EqualValues(t, 1668354014, lct.Unix()) } func TestRepoIsEmpty(t *testing.T) { diff --git a/modules/git/tests/repos/repo1_bare/index b/modules/git/tests/repos/repo1_bare/index new file mode 100644 index 0000000000000000000000000000000000000000..65d675154f23ffb2d0196e017d44a5e7017550f5 GIT binary patch literal 65 zcmZ?q402{*U|?ckU|ow@eu%I1{kvd literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/repo1_bare/logs/HEAD b/modules/git/tests/repos/repo1_bare/logs/HEAD index cef4ca2dcb..46da5fe0b1 100644 --- a/modules/git/tests/repos/repo1_bare/logs/HEAD +++ b/modules/git/tests/repos/repo1_bare/logs/HEAD @@ -1 +1,2 @@ 37991dec2c8e592043f47155ce4808d4580f9123 feaf4ba6bc635fec442f46ddd4512416ec43c2c2 silverwind 1563741799 +0200 push +feaf4ba6bc635fec442f46ddd4512416ec43c2c2 ce064814f4a0d337b333e646ece456cd39fab612 silverwind 1668354026 +0100 push diff --git a/modules/git/tests/repos/repo1_bare/logs/refs/heads/master b/modules/git/tests/repos/repo1_bare/logs/refs/heads/master index cef4ca2dcb..46da5fe0b1 100644 --- a/modules/git/tests/repos/repo1_bare/logs/refs/heads/master +++ b/modules/git/tests/repos/repo1_bare/logs/refs/heads/master @@ -1 +1,2 @@ 37991dec2c8e592043f47155ce4808d4580f9123 feaf4ba6bc635fec442f46ddd4512416ec43c2c2 silverwind 1563741799 +0200 push +feaf4ba6bc635fec442f46ddd4512416ec43c2c2 ce064814f4a0d337b333e646ece456cd39fab612 silverwind 1668354026 +0100 push diff --git a/modules/git/tests/repos/repo1_bare/objects/1c/91d130dc5fb75fd2d9f586a058650889cfe7fb b/modules/git/tests/repos/repo1_bare/objects/1c/91d130dc5fb75fd2d9f586a058650889cfe7fb new file mode 100644 index 0000000000000000000000000000000000000000..fb50b65f9ff04e722d4df5c734d8d64eb761f61a GIT binary patch literal 813 zcmbIabnW{&N8d7VlED6U*0n1(ocGc=<y|1hCv)#W>clNcPYn>)MW9>W1C7;dTMhb7;_xG^m zhpR6CijVIy`@SLUe8`IGmrOlh&u+0vEqR>2V%kxGe$V@poik3g1(vPuJ-oo>`iq^0 z4v)+pR>@wuS+P7t_uMI^Y5RI zF@v^q+}=k#^&YO9ui3mZ&-Uf8J(2y#GJVdJYj>H;w*;}w+p2kb}&t?19 ziFY%`23S32xL<3M8&-a^D(5qc-lt{X`OjYu>iy7q_>l$&xBYkjPVtYLlk6X#m=tsW zTN>LOIe)XR{5Q21j``FdH2BStJw@+gv0}O6y?J>>j)@U!A3eADExNHoLx+F0$nW%3 za{BIU9U7W(nR+r;g^n}r{*XJJ>(IL&R=VE%?(DFVIKTPp%=;z6*VnCo^XJQ)C0pK} zl;YIcV|3sxQ#-Za#>SxAB&~ScQ)^di+U9I@GJKP$4*_Ty{mSKOZv`?N8XdP`KC;M&+}v7 gw~fdC6uEuh`roMS=cHB3pKgzjGqPt$^bB$X01fPqr~m)} literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/repo1_bare/objects/28/b55526e7100924d864dd89e35c1ea62e7a5a32 b/modules/git/tests/repos/repo1_bare/objects/28/b55526e7100924d864dd89e35c1ea62e7a5a32 new file mode 100644 index 0000000000000000000000000000000000000000..7779599a06c8a22ca72e7ab6294a394a5961a3dc GIT binary patch literal 818 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 literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/repo1_bare/objects/ce/064814f4a0d337b333e646ece456cd39fab612 b/modules/git/tests/repos/repo1_bare/objects/ce/064814f4a0d337b333e646ece456cd39fab612 new file mode 100644 index 0000000000000000000000000000000000000000..93f1525e57972e8cfc311b65cd62e012291c6c28 GIT binary patch literal 815 zcmb z-1V8Jq1|f3T*+9m(WOPnmFgxx6WhXcO5_R_x$^{ z{qNp)|5YLxQsP7;!W1;yQY9As_<6tQ-}gsv3unKQ{`vO(t(VXKxl}E4Z>#>i#I10_ z|0gV-6SnTZU$$!3@1W3(E4$`ZSeE-Y3KmsFyggw5h&lP@x|^^17CyQh9nA9e^|e2T zIX@Yn)H9#ucUdlD^~0(0&y%fQHhNi}N_9`2eC>;MyZMgUyI!6=v+7aC{&T-hZ(OYx ztK6oboh*5eM=mKrm38iC-qlSy4`+X`l9#>6-uI@@%j0#;5tWn4j4StaTYu-;+$>z2 z5zFyuiD!_?mFE*S-#+Sl<(Y(9zs@9oe*HxszX)`j1&5{Z{LXaTvb|+_x54}eDM?<- z`fA-K1PFC$$E_;6(X?FFcX8QQJw~a(*YfYZWz7?+O9i^FJ&P*3mm?tmV_MV7>n%2> zTRy9wRND9D5AR!ZO}Vw=b1Pm1TvoF4n0Ys6{Y;_lUjm%h+04FPdtZC!re9LJYj<_c z%Ko{HGw74`?pLyZb*3IWDjvQ3+X8jf&2O?+pHt<2H|1qUAzM`H!`wNt_m)MTd}DP* z`EBJEc^1xB&oB6dz3WuEebnp6B>6r5qSZR1*r;)Nt(=jZ>VCWQ+dJl;Ren7uS^i6PV`kgsz(+r)?PJ!loc^BW ir|qhEwvVSJ|1SAE-SCL}D!zmH`}e5SG5jbC{{#U3&6jro literal 0 HcmV?d00001 diff --git a/modules/git/tests/repos/repo1_bare/objects/cf/8b0b492a950b358a7ce7f9d01b18aef48a6b2d b/modules/git/tests/repos/repo1_bare/objects/cf/8b0b492a950b358a7ce7f9d01b18aef48a6b2d new file mode 100644 index 0000000000000000000000000000000000000000..1152b25bb8318c8fcb2b11de4e18b0185eeef25f GIT binary patch literal 827 zcmbZGie7jb#ZpWZtE!_Ix{Gj6?Fcc4E1;{5+d z;$Q#cpVKm7vE-~Y$r|?wER9d?e~NwCFTZ->tk+!szg_Q~v?y}NVv8N?HKz%*%=@zW zcmdD)*tfb|O%(zyPU}=(K1vA@cD%X#*2ksQ?^c>}gl?a@JLQy9wrzj9pGC;_{nb4C zy{|3e{yleLzE-nc_WP=PMpCWbPH6}K1VzUCuTPUXE%{J)*ZRGuVvDay?9fcA<;dZ& zPwkT2?7#fciAN0V+0%}`czZlck)2&}SFFogo6_2}xRSXSOwZ1ppmC*Ay*%!5VgG}! zhf)3pYAxx@RnBb*F=#ziib z@ROXkZMoPL8{doBk&90D6~>kPTjbHoRrBuWshe&OqNTcmkH>2@-`Uohmoimz)78*> z5^~SJSQIUv()CKtWnr4-5of+*A)TL|eqg$tl6_~*3Td9tKcC9?y4$>PWP2m)#SSEcRQ_e%N=_mbWwFY|nYu zzTI(J@bKI|3%0&+!$kcZ%Eh)ylX$Lib^P*Wtl9GJI(sI+`}en(0&PC=I-BKbyq$7^ zYg?kPJDKN@*`Wkj>%+&!y~s2kg>@%EjyED`##eQ$QY7{{^fry>1Y zwq4VViNDR1JiEDxqRda4SRptz(eI>QSj+~8lDATAMUQ*on>rWWq#!w?~lHR v_gBv|-Kd|g^7=>qu>|>*Rv|UNKM5WFv;M~Pr`z9ry