Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Close all hashed buffers #27787

Merged
merged 3 commits into from Oct 25, 2023
Merged

Close all hashed buffers #27787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25f4ff9
Close hashed buffers.
KN4CK3R Oct 25, 2023
8982e04
Add missing Close.
KN4CK3R Oct 25, 2023
1ff30c3
Merge branch 'main' of https://github.com/go-gitea/gitea into fix-close
KN4CK3R Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/packages/hashed_buffer.go
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ func NewHashedBuffer() (*HashedBuffer, error) {
return NewHashedBufferWithSize(DefaultMemorySize)
}

// NewHashedBuffer creates a hashed buffer with a specific memory size
// NewHashedBufferWithSize creates a hashed buffer with a specific memory size
func NewHashedBufferWithSize(maxMemorySize int) (*HashedBuffer, error) {
b, err := filebuffer.New(maxMemorySize)
if err != nil {
Expand Down
3 changes: 3 additions & 0 deletions services/packages/alpine/repository.go
View file
Open in desktop
Expand Up @@ -238,6 +238,8 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package
}

unsignedIndexContent, _ := packages_module.NewHashedBuffer()
defer unsignedIndexContent.Close()

h := sha1.New()

if err := writeGzipStream(io.MultiWriter(unsignedIndexContent, h), "APKINDEX", buf.Bytes(), true); err != nil {
Expand Down Expand Up @@ -275,6 +277,7 @@ func buildPackagesIndex(ctx context.Context, ownerID int64, repoVersion *package
}

signedIndexContent, _ := packages_module.NewHashedBuffer()
defer signedIndexContent.Close()

if err := writeGzipStream(
signedIndexContent,
Expand Down
10 changes: 10 additions & 0 deletions services/packages/debian/repository.go
View file
Open in desktop
Expand Up @@ -196,11 +196,16 @@ func buildPackagesIndices(ctx context.Context, ownerID int64, repoVersion *packa
}

packagesContent, _ := packages_module.NewHashedBuffer()
defer packagesContent.Close()

packagesGzipContent, _ := packages_module.NewHashedBuffer()
defer packagesGzipContent.Close()

gzw := gzip.NewWriter(packagesGzipContent)

packagesXzContent, _ := packages_module.NewHashedBuffer()
defer packagesXzContent.Close()

xzw, _ := xz.NewWriter(packagesXzContent)

w := io.MultiWriter(packagesContent, gzw, xzw)
Expand Down Expand Up @@ -323,6 +328,8 @@ func buildReleaseFiles(ctx context.Context, ownerID int64, repoVersion *packages
}

inReleaseContent, _ := packages_module.NewHashedBuffer()
defer inReleaseContent.Close()

sw, err := clearsign.Encode(inReleaseContent, e.PrivateKey, nil)
if err != nil {
return err
Expand Down Expand Up @@ -367,11 +374,14 @@ func buildReleaseFiles(ctx context.Context, ownerID int64, repoVersion *packages
sw.Close()

releaseGpgContent, _ := packages_module.NewHashedBuffer()
defer releaseGpgContent.Close()

if err := openpgp.ArmoredDetachSign(releaseGpgContent, e, bytes.NewReader(buf.Bytes()), nil); err != nil {
return err
}

releaseContent, _ := packages_module.CreateHashedBufferFromReader(&buf)
defer releaseContent.Close()

for _, file := range []struct {
Name string
Expand Down
5 changes: 5 additions & 0 deletions services/packages/rpm/repository.go
View file
Open in desktop
Expand Up @@ -258,11 +258,14 @@ func buildRepomd(ctx context.Context, pv *packages_model.PackageVersion, ownerID
}

repomdAscContent, _ := packages_module.NewHashedBuffer()
defer repomdAscContent.Close()

if err := openpgp.ArmoredDetachSign(repomdAscContent, e, bytes.NewReader(buf.Bytes()), nil); err != nil {
return err
}

repomdContent, _ := packages_module.CreateHashedBufferFromReader(&buf)
defer repomdContent.Close()
KN4CK3R marked this conversation as resolved.
Show resolved Hide resolved

for _, file := range []struct {
Name string
Expand Down Expand Up @@ -548,6 +551,8 @@ func (wc *writtenCounter) Written() int64 {

func addDataAsFileToRepo(ctx context.Context, pv *packages_model.PackageVersion, filetype string, obj any) (*repoData, error) {
content, _ := packages_module.NewHashedBuffer()
defer content.Close()

gzw := gzip.NewWriter(content)
wc := &writtenCounter{}
h := sha256.New()
Expand Down