Skip to content

Commit 8446d6f

Browse files
wxiaoguangwxiaoguang
authored
Merge branch 'main' into user-avatar-link-abs
2 parents b44d985 + 843bc9d commit 8446d6f

File tree

13 files changed

+78
-51
lines changed

13 files changed

+78
-51
lines changed

‎modules/charset/charset.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313

1414
"code.gitea.io/gitea/modules/log"
1515
"code.gitea.io/gitea/modules/setting"
16+
"code.gitea.io/gitea/modules/util"
1617

1718
"github.com/gogs/chardet"
1819
"golang.org/x/net/html/charset"
@@ -25,9 +26,9 @@ var UTF8BOM = []byte{'\xef', '\xbb', '\xbf'}
2526
// ToUTF8WithFallbackReader detects the encoding of content and coverts to UTF-8 reader if possible
2627
func ToUTF8WithFallbackReader(rd io.Reader) io.Reader {
2728
var buf = make([]byte, 2048)
28-
n, err := rd.Read(buf)
29+
n, err := util.ReadAtMost(rd, buf)
2930
if err != nil {
30-
return rd
31+
return io.MultiReader(bytes.NewReader(RemoveBOMIfPresent(buf[:n])), rd)
3132
}
3233

3334
charsetLabel, err := DetectEncoding(buf[:n])

‎modules/csv/csv.go

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,35 +27,24 @@ func CreateReader(input io.Reader, delimiter rune) *stdcsv.Reader {
2727
}
2828

2929
// CreateReaderAndGuessDelimiter tries to guess the field delimiter from the content and creates a csv.Reader.
30+
// Reads at most 10k bytes.
3031
func CreateReaderAndGuessDelimiter(rd io.Reader) (*stdcsv.Reader, error) {
3132
var data = make([]byte, 1e4)
32-
size, err := rd.Read(data)
33+
size, err := util.ReadAtMost(rd, data)
3334
if err != nil {
34-
if err == io.EOF {
35-
return CreateReader(bytes.NewReader([]byte{}), rune(',')), nil
36-
}
3735
return nil, err
3836
}
3937

40-
delimiter := guessDelimiter(data[:size])
41-
42-
var newInput io.Reader
43-
if size < 1e4 {
44-
newInput = bytes.NewReader(data[:size])
45-
} else {
46-
newInput = io.MultiReader(bytes.NewReader(data), rd)
47-
}
48-
49-
return CreateReader(newInput, delimiter), nil
38+
return CreateReader(
39+
io.MultiReader(bytes.NewReader(data[:size]), rd),
40+
guessDelimiter(data[:size]),
41+
), nil
5042
}
5143

5244
// guessDelimiter scores the input CSV data against delimiters, and returns the best match.
53-
// Reads at most 10k bytes & 10 lines.
5445
func guessDelimiter(data []byte) rune {
5546
maxLines := 10
56-
maxBytes := util.Min(len(data), 1e4)
57-
text := string(data[:maxBytes])
58-
text = quoteRegexp.ReplaceAllLiteralString(text, "")
47+
text := quoteRegexp.ReplaceAllLiteralString(string(data), "")
5948
lines := strings.SplitN(text, "\n", maxLines+1)
6049
lines = lines[:util.Min(maxLines, len(lines))]
6150

‎modules/git/blob.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"io"
1212

1313
"code.gitea.io/gitea/modules/typesniffer"
14+
"code.gitea.io/gitea/modules/util"
1415
)
1516

1617
// This file contains common functions between the gogit and !gogit variants for git Blobs
@@ -28,7 +29,7 @@ func (b *Blob) GetBlobContent() (string, error) {
2829
}
2930
defer dataRc.Close()
3031
buf := make([]byte, 1024)
31-
n, _ := dataRc.Read(buf)
32+
n, _ := util.ReadAtMost(dataRc, buf)
3233
buf = buf[:n]
3334
return string(buf), nil
3435
}

‎modules/repofiles/update.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
repo_module "code.gitea.io/gitea/modules/repository"
2020
"code.gitea.io/gitea/modules/setting"
2121
"code.gitea.io/gitea/modules/structs"
22+
"code.gitea.io/gitea/modules/util"
2223

2324
stdcharset "golang.org/x/net/html/charset"
2425
"golang.org/x/text/transform"
@@ -61,7 +62,7 @@ func detectEncodingAndBOM(entry *git.TreeEntry, repo *models.Repository) (string
6162
}
6263
defer reader.Close()
6364
buf := make([]byte, 1024)
64-
n, err := reader.Read(buf)
65+
n, err := util.ReadAtMost(reader, buf)
6566
if err != nil {
6667
// return default
6768
return "UTF-8", false
@@ -84,7 +85,7 @@ func detectEncodingAndBOM(entry *git.TreeEntry, repo *models.Repository) (string
8485
}
8586
defer dataRc.Close()
8687
buf = make([]byte, 1024)
87-
n, err = dataRc.Read(buf)
88+
n, err = util.ReadAtMost(dataRc, buf)
8889
if err != nil {
8990
// return default
9091
return "UTF-8", false

‎modules/typesniffer/typesniffer.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"net/http"
1111
"regexp"
1212
"strings"
13+
14+
"code.gitea.io/gitea/modules/util"
1315
)
1416

1517
// Use at most this many bytes to determine Content Type.
@@ -86,8 +88,8 @@ func DetectContentType(data []byte) SniffedType {
8688
// DetectContentTypeFromReader guesses the content type contained in the reader.
8789
func DetectContentTypeFromReader(r io.Reader) (SniffedType, error) {
8890
buf := make([]byte, sniffLen)
89-
n, err := r.Read(buf)
90-
if err != nil && err != io.EOF {
91+
n, err := util.ReadAtMost(r, buf)
92+
if err != nil {
9193
return SniffedType{}, fmt.Errorf("DetectContentTypeFromReader io error: %w", err)
9294
}
9395
buf = buf[:n]

‎modules/util/io.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Copyright 2021 The Gitea Authors. All rights reserved.
2+
// Use of this source code is governed by a MIT-style
3+
// license that can be found in the LICENSE file.
4+
5+
package util
6+
7+
import (
8+
"io"
9+
)
10+
11+
// ReadAtMost reads at most len(buf) bytes from r into buf.
12+
// It returns the number of bytes copied. n is only less then len(buf) if r provides fewer bytes.
13+
// If EOF occurs while reading, err will be nil.
14+
func ReadAtMost(r io.Reader, buf []byte) (n int, err error) {
15+
n, err = io.ReadFull(r, buf)
16+
if err == io.EOF || err == io.ErrUnexpectedEOF {
17+
err = nil
18+
}
19+
return
20+
}

‎options/locale/locale_ja-JP.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ view_home=%s を表示
227227
search_repos=リポジトリを探す…
228228
filter=その他のフィルター
229229
filter_by_team_repositories=チームリポジトリで絞り込み
230+
feed_of="%s" のフィード
230231

231232
show_archived=アーカイブ
232233
show_both_archived_unarchived=アーカイブと非アーカイブの両方を表示
@@ -982,6 +983,7 @@ commit_graph=コミットグラフ
982983
commit_graph.select=ブランチを選択
983984
commit_graph.hide_pr_refs=プルリクエストを非表示
984985
commit_graph.monochrome=モノクロ
986+
commit_graph.color=カラー
985987
blame=Blame
986988
normal_view=通常表示
987989
line=行
@@ -1098,6 +1100,7 @@ projects.board.set_default=デフォルトに設定
10981100
projects.board.set_default_desc=このボードを未分類のイシューやプルリクエストが入るデフォルトのボードに設定します
10991101
projects.board.delete=ボードを削除
11001102
projects.board.deletion_desc=プロジェクトボードを削除すると、関連するすべてのイシューが '未分類' に移動します。 続行しますか？
1103+
projects.board.color=色
11011104
projects.open=オープン
11021105
projects.close=クローズ
11031106

@@ -1801,6 +1804,7 @@ settings.content_type=POST Content Type
18011804
settings.secret=Secret
18021805
settings.slack_username=ユーザー名
18031806
settings.slack_icon_url=アイコンのURL
1807+
settings.slack_color=色
18041808
settings.discord_username=ユーザー名
18051809
settings.discord_icon_url=アイコンのURL
18061810
settings.event_desc=トリガー:
@@ -2779,6 +2783,8 @@ publish_release=`が <a href="%[1]s">%[3]s</a> の <a href="%[1]s/releases/tag/%
27792783
review_dismissed=`が <b>%[4]s</b> の <a href="%[1]s/pulls/%[2]s">%[3]s#%[2]s</a> へのレビューを棄却しました`
27802784
review_dismissed_reason=理由:
27812785
create_branch=が <a href="%[1]s">%[4]s</a> にブランチ <a href="%[1]s/src/branch/%[2]s">%[3]s</a> を作成しました
2786+
stared_repo=が <a href="%[1]s">%[2]s</a> にスターをつけました
2787+
watched_repo=が <a href="%[1]s">%[2]s</a> のウォッチを開始しました
27822788

27832789
[tool]
27842790
ago=%s前

‎routers/common/repo.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"code.gitea.io/gitea/modules/log"
1919
"code.gitea.io/gitea/modules/setting"
2020
"code.gitea.io/gitea/modules/typesniffer"
21+
"code.gitea.io/gitea/modules/util"
2122
)
2223

2324
// ServeBlob download a git.Blob
@@ -42,8 +43,8 @@ func ServeBlob(ctx *context.Context, blob *git.Blob) error {
4243
// ServeData download file from io.Reader
4344
func ServeData(ctx *context.Context, name string, size int64, reader io.Reader) error {
4445
buf := make([]byte, 1024)
45-
n, err := reader.Read(buf)
46-
if err != nil && err != io.EOF {
46+
n, err := util.ReadAtMost(reader, buf)
47+
if err != nil {
4748
return err
4849
}
4950
if n >= 0 {

‎routers/web/repo/compare.go

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"errors"
1111
"fmt"
1212
"html"
13+
"io"
1314
"net/http"
1415
"path"
1516
"path/filepath"
@@ -105,30 +106,36 @@ func setCsvCompareContext(ctx *context.Context) {
105106

106107
errTooLarge := errors.New(ctx.Locale.Tr("repo.error.csv.too_large"))
107108

108-
csvReaderFromCommit := func(c *git.Commit) (*csv.Reader, error) {
109+
csvReaderFromCommit := func(c *git.Commit) (*csv.Reader, io.Closer, error) {
109110
blob, err := c.GetBlobByPath(diffFile.Name)
110111
if err != nil {
111-
return nil, err
112+
return nil, nil, err
112113
}
113114

114115
if setting.UI.CSV.MaxFileSize != 0 && setting.UI.CSV.MaxFileSize < blob.Size() {
115-
return nil, errTooLarge
116+
return nil, nil, errTooLarge
116117
}
117118

118119
reader, err := blob.DataAsync()
119120
if err != nil {
120-
return nil, err
121+
return nil, nil, err
121122
}
122-
defer reader.Close()
123123

124-
return csv_module.CreateReaderAndGuessDelimiter(charset.ToUTF8WithFallbackReader(reader))
124+
csvReader, err := csv_module.CreateReaderAndGuessDelimiter(charset.ToUTF8WithFallbackReader(reader))
125+
return csvReader, reader, err
125126
}
126127

127-
baseReader, err := csvReaderFromCommit(baseCommit)
128+
baseReader, baseBlobCloser, err := csvReaderFromCommit(baseCommit)
129+
if baseBlobCloser != nil {
130+
defer baseBlobCloser.Close()
131+
}
128132
if err == errTooLarge {
129133
return CsvDiffResult{nil, err.Error()}
130134
}
131-
headReader, err := csvReaderFromCommit(headCommit)
135+
headReader, headBlobCloser, err := csvReaderFromCommit(headCommit)
136+
if headBlobCloser != nil {
137+
defer headBlobCloser.Close()
138+
}
132139
if err == errTooLarge {
133140
return CsvDiffResult{nil, err.Error()}
134141
}

‎routers/web/repo/editor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
118118
ctx.Data["FileName"] = blob.Name()
119119

120120
buf := make([]byte, 1024)
121-
n, _ := dataRc.Read(buf)
121+
n, _ := util.ReadAtMost(dataRc, buf)
122122
buf = buf[:n]
123123

124124
// Only some file types are editable online as text.
@@ -751,7 +751,7 @@ func UploadFileToServer(ctx *context.Context) {
751751
defer file.Close()
752752

753753
buf := make([]byte, 1024)
754-
n, _ := file.Read(buf)
754+
n, _ := util.ReadAtMost(file, buf)
755755
if n > 0 {
756756
buf = buf[:n]
757757
}

‎routers/web/repo/lfs.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"code.gitea.io/gitea/modules/setting"
2626
"code.gitea.io/gitea/modules/storage"
2727
"code.gitea.io/gitea/modules/typesniffer"
28+
"code.gitea.io/gitea/modules/util"
2829
)
2930

3031
const (
@@ -271,7 +272,7 @@ func LFSFileGet(ctx *context.Context) {
271272
}
272273
defer dataRc.Close()
273274
buf := make([]byte, 1024)
274-
n, err := dataRc.Read(buf)
275+
n, err := util.ReadAtMost(dataRc, buf)
275276
if err != nil {
276277
ctx.ServerError("Data", err)
277278
return
@@ -296,10 +297,10 @@ func LFSFileGet(ctx *context.Context) {
296297
break
297298
}
298299

299-
buf := charset.ToUTF8WithFallbackReader(io.MultiReader(bytes.NewReader(buf), dataRc))
300+
rd := charset.ToUTF8WithFallbackReader(io.MultiReader(bytes.NewReader(buf), dataRc))
300301

301302
// Building code view blocks with line number on server side.
302-
fileContent, _ := io.ReadAll(buf)
303+
fileContent, _ := io.ReadAll(rd)
303304

304305
var output bytes.Buffer
305306
lines := strings.Split(string(fileContent), "\n")

‎routers/web/repo/view.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"code.gitea.io/gitea/modules/setting"
3434
"code.gitea.io/gitea/modules/structs"
3535
"code.gitea.io/gitea/modules/typesniffer"
36+
"code.gitea.io/gitea/modules/util"
3637
)
3738

3839
const (
@@ -250,7 +251,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
250251
defer dataRc.Close()
251252

252253
buf := make([]byte, 1024)
253-
n, _ := dataRc.Read(buf)
254+
n, _ := util.ReadAtMost(dataRc, buf)
254255
buf = buf[:n]
255256

256257
st := typesniffer.DetectContentType(buf)
@@ -285,7 +286,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
285286
defer dataRc.Close()
286287

287288
buf = make([]byte, 1024)
288-
n, err = dataRc.Read(buf)
289+
n, err = util.ReadAtMost(dataRc, buf)
289290
if err != nil {
290291
ctx.ServerError("Data", err)
291292
return
@@ -377,7 +378,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
377378
ctx.Data["RawFileLink"] = rawLink + "/" + ctx.Repo.TreePath
378379

379380
buf := make([]byte, 1024)
380-
n, _ := dataRc.Read(buf)
381+
n, _ := util.ReadAtMost(dataRc, buf)
381382
buf = buf[:n]
382383

383384
st := typesniffer.DetectContentType(buf)
@@ -409,10 +410,8 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
409410
defer dataRc.Close()
410411

411412
buf = make([]byte, 1024)
412-
n, err = dataRc.Read(buf)
413-
// Error EOF don't mean there is an error, it just means we read to
414-
// the end
415-
if err != nil && err != io.EOF {
413+
n, err = util.ReadAtMost(dataRc, buf)
414+
if err != nil {
416415
ctx.ServerError("Data", err)
417416
return
418417
}

‎services/attachment/attachment.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"code.gitea.io/gitea/models/db"
1515
"code.gitea.io/gitea/modules/storage"
1616
"code.gitea.io/gitea/modules/upload"
17+
"code.gitea.io/gitea/modules/util"
1718

1819
"github.com/google/uuid"
1920
)
@@ -41,10 +42,8 @@ func NewAttachment(attach *models.Attachment, file io.Reader) (*models.Attachmen
4142
// UploadAttachment upload new attachment into storage and update database
4243
func UploadAttachment(file io.Reader, actorID, repoID, releaseID int64, fileName string, allowedTypes string) (*models.Attachment, error) {
4344
buf := make([]byte, 1024)
44-
n, _ := file.Read(buf)
45-
if n > 0 {
46-
buf = buf[:n]
47-
}
45+
n, _ := util.ReadAtMost(file, buf)
46+
buf = buf[:n]
4847

4948
if err := upload.Verify(buf, fileName, allowedTypes); err != nil {
5049
return nil, err

0 commit comments

Comments
 (0)