Skip to content

Commit 631539c

Browse files
KN4CK3Rlunny
andauthored
Fix package upload for files >32mb (#20622)
* Rewind file before first read. * Added tests. Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
1 parent e43bb2b commit 631539c

File tree

3 files changed

+98
-5
lines changed

3 files changed

+98
-5
lines changed
+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright 2022 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 packages
6+
7+
import (
8+
"fmt"
9+
"io"
10+
"strings"
11+
"testing"
12+
13+
"github.com/stretchr/testify/assert"
14+
)
15+
16+
func TestHashedBuffer(t *testing.T) {
17+
cases := []struct {
18+
MaxMemorySize int
19+
Data string
20+
HashMD5 string
21+
HashSHA1 string
22+
HashSHA256 string
23+
HashSHA512 string
24+
}{
25+
{5, "test", "098f6bcd4621d373cade4e832627b4f6", "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08", "ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff"},
26+
{5, "testtest", "05a671c66aefea124cc08b76ea6d30bb", "51abb9636078defbf888d8457a7c76f85c8f114c", "37268335dd6931045bdcdf92623ff819a64244b53d0e746d438797349d4da578", "125d6d03b32c84d492747f79cf0bf6e179d287f341384eb5d6d3197525ad6be8e6df0116032935698f99a09e265073d1d6c32c274591bf1d0a20ad67cba921bc"},
27+
}
28+
29+
for _, c := range cases {
30+
buf, err := CreateHashedBufferFromReader(strings.NewReader(c.Data), c.MaxMemorySize)
31+
assert.NoError(t, err)
32+
33+
assert.EqualValues(t, len(c.Data), buf.Size())
34+
35+
data, err := io.ReadAll(buf)
36+
assert.NoError(t, err)
37+
assert.Equal(t, c.Data, string(data))
38+
39+
hashMD5, hashSHA1, hashSHA256, hashSHA512 := buf.Sums()
40+
assert.Equal(t, c.HashMD5, fmt.Sprintf("%x", hashMD5))
41+
assert.Equal(t, c.HashSHA1, fmt.Sprintf("%x", hashSHA1))
42+
assert.Equal(t, c.HashSHA256, fmt.Sprintf("%x", hashSHA256))
43+
assert.Equal(t, c.HashSHA512, fmt.Sprintf("%x", hashSHA512))
44+
45+
assert.NoError(t, buf.Close())
46+
}
47+
}

modules/util/filebuffer/file_backed_buffer.go

+15-5
Original file line numberDiff line numberDiff line change
@@ -103,35 +103,45 @@ func (b *FileBackedBuffer) Size() int64 {
103103
return b.size
104104
}
105105

106-
func (b *FileBackedBuffer) switchToReader() {
106+
func (b *FileBackedBuffer) switchToReader() error {
107107
if b.reader != nil {
108-
return
108+
return nil
109109
}
110110

111111
if b.file != nil {
112+
if _, err := b.file.Seek(0, io.SeekStart); err != nil {
113+
return err
114+
}
112115
b.reader = b.file
113116
} else {
114117
b.reader = bytes.NewReader(b.buffer.Bytes())
115118
}
119+
return nil
116120
}
117121

118122
// Read implements io.Reader
119123
func (b *FileBackedBuffer) Read(p []byte) (int, error) {
120-
b.switchToReader()
124+
if err := b.switchToReader(); err != nil {
125+
return 0, err
126+
}
121127

122128
return b.reader.Read(p)
123129
}
124130

125131
// ReadAt implements io.ReaderAt
126132
func (b *FileBackedBuffer) ReadAt(p []byte, off int64) (int, error) {
127-
b.switchToReader()
133+
if err := b.switchToReader(); err != nil {
134+
return 0, err
135+
}
128136

129137
return b.reader.ReadAt(p, off)
130138
}
131139

132140
// Seek implements io.Seeker
133141
func (b *FileBackedBuffer) Seek(offset int64, whence int) (int64, error) {
134-
b.switchToReader()
142+
if err := b.switchToReader(); err != nil {
143+
return 0, err
144+
}
135145

136146
return b.reader.Seek(offset, whence)
137147
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright 2022 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 filebuffer
6+
7+
import (
8+
"io"
9+
"strings"
10+
"testing"
11+
12+
"github.com/stretchr/testify/assert"
13+
)
14+
15+
func TestFileBackedBuffer(t *testing.T) {
16+
cases := []struct {
17+
MaxMemorySize int
18+
Data string
19+
}{
20+
{5, "test"},
21+
{5, "testtest"},
22+
}
23+
24+
for _, c := range cases {
25+
buf, err := CreateFromReader(strings.NewReader(c.Data), c.MaxMemorySize)
26+
assert.NoError(t, err)
27+
28+
assert.EqualValues(t, len(c.Data), buf.Size())
29+
30+
data, err := io.ReadAll(buf)
31+
assert.NoError(t, err)
32+
assert.Equal(t, c.Data, string(data))
33+
34+
assert.NoError(t, buf.Close())
35+
}
36+
}

0 commit comments

Comments
 (0)