diff options
| author | zeripath <art27@cantab.net> | 2020-06-18 15:07:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 10:07:09 -0400 |
| commit | 654a97064495213531efdfc2571f659b45236633 (patch) | |
| tree | fa2f298c4b7c289d618940582515751189b4c0da | |
| parent | 1dd3f19ee381d3a3554828a37282fd75ba3073ee (diff) | |
| download | gitea-654a97064495213531efdfc2571f659b45236633.tar.gz gitea-654a97064495213531efdfc2571f659b45236633.zip | |
Fix commenting on non-utf8 encoded files (#11916)
* Add comment on non-unicode line to force fail
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Just quote/unquote patch
Signed-off-by: Andrew Thornton <art27@cantab.net>
6 files changed, 41 insertions, 4 deletions
diff --git a/integrations/api_pull_review_test.go b/integrations/api_pull_review_test.go index c90a5c11cd..611b34712c 100644 --- a/integrations/api_pull_review_test.go +++ b/integrations/api_pull_review_test.go @@ -86,6 +86,11 @@ func TestAPIPullReview(t *testing.T) { Body: "first old line", OldLineNum: 1, NewLineNum: 0, + }, { + Path: "iso-8859-1.txt", + Body: "this line contains a non-utf-8 character", + OldLineNum: 0, + NewLineNum: 1, }, }, }) @@ -93,7 +98,7 @@ func TestAPIPullReview(t *testing.T) { DecodeJSON(t, resp, &review) assert.EqualValues(t, 6, review.ID) assert.EqualValues(t, "PENDING", review.State) - assert.EqualValues(t, 2, review.CodeCommentsCount) + assert.EqualValues(t, 3, review.CodeCommentsCount) // test SubmitPullReview req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews/%d?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, review.ID, token), &api.SubmitPullReviewOptions{ @@ -104,7 +109,7 @@ func TestAPIPullReview(t *testing.T) { DecodeJSON(t, resp, &review) assert.EqualValues(t, 6, review.ID) assert.EqualValues(t, "APPROVED", review.State) - assert.EqualValues(t, 2, review.CodeCommentsCount) + assert.EqualValues(t, 3, review.CodeCommentsCount) // test DeletePullReview req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.CreatePullReviewOptions{ diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/objects/5f/22f7d0d95d614d25a5b68592adb345a4b5c7fd b/integrations/gitea-repositories-meta/user2/repo1.git/objects/5f/22f7d0d95d614d25a5b68592adb345a4b5c7fd Binary files differnew file mode 100644 index 0000000000..17fdf18edb --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo1.git/objects/5f/22f7d0d95d614d25a5b68592adb345a4b5c7fd diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/objects/90/dcd07da077d1e7cd6032b52d1f79ae2b5f19b2 b/integrations/gitea-repositories-meta/user2/repo1.git/objects/90/dcd07da077d1e7cd6032b52d1f79ae2b5f19b2 new file mode 100644 index 0000000000..1404abdaa2 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo1.git/objects/90/dcd07da077d1e7cd6032b52d1f79ae2b5f19b2 @@ -0,0 +1,2 @@ +xeN0D# 4 +JA5,xzsV5Dػ7,=o.E卢q5J= r= >4
O!6ms8&\ EatTIzԅ! dso@a&K5B)r4Q`YLb o`a3@(eԭ5
H\sH99R3)@S_"4sE0R.U|/mۿ]Uz
\ No newline at end of file diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/objects/dd/59742c0f6672911f2b64cba5711ac00593ed32 b/integrations/gitea-repositories-meta/user2/repo1.git/objects/dd/59742c0f6672911f2b64cba5711ac00593ed32 Binary files differnew file mode 100644 index 0000000000..f9137c5f77 --- /dev/null +++ b/integrations/gitea-repositories-meta/user2/repo1.git/objects/dd/59742c0f6672911f2b64cba5711ac00593ed32 diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/3/head b/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/3/head index 98593d6537..33a9eaa7f1 100644 --- a/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/3/head +++ b/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/3/head @@ -1 +1 @@ -4a357436d925b5c974181ff12a994538ddc5a269 +5f22f7d0d95d614d25a5b68592adb345a4b5c7fd diff --git a/models/issue_comment.go b/models/issue_comment.go index 7e940cbec4..452afc79f0 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -11,7 +11,9 @@ import ( "encoding/json" "fmt" "regexp" + "strconv" "strings" + "unicode/utf8" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" @@ -143,7 +145,8 @@ type Comment struct { RenderedContent string `xorm:"-"` // Path represents the 4 lines of code cemented by this comment - Patch string `xorm:"TEXT"` + Patch string `xorm:"-"` + PatchQuoted string `xorm:"TEXT patch"` CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` @@ -199,6 +202,33 @@ func (c *Comment) loadIssue(e Engine) (err error) { return } +// BeforeInsert will be invoked by XORM before inserting a record +func (c *Comment) BeforeInsert() { + c.PatchQuoted = c.Patch + if !utf8.ValidString(c.Patch) { + c.PatchQuoted = strconv.Quote(c.Patch) + } +} + +// BeforeUpdate will be invoked by XORM before updating a record +func (c *Comment) BeforeUpdate() { + c.PatchQuoted = c.Patch + if !utf8.ValidString(c.Patch) { + c.PatchQuoted = strconv.Quote(c.Patch) + } +} + +// AfterLoad is invoked from XORM after setting the values of all fields of this object. +func (c *Comment) AfterLoad(session *xorm.Session) { + c.Patch = c.PatchQuoted + if len(c.PatchQuoted) > 0 && c.PatchQuoted[0] == '"' { + unquoted, err := strconv.Unquote(c.PatchQuoted) + if err == nil { + c.Patch = unquoted + } + } +} + func (c *Comment) loadPoster(e Engine) (err error) { if c.PosterID <= 0 || c.Poster != nil { return nil |