Skip to content

Commit

Permalink
Close all hashed buffers (#27787) (#27790)
Browse files Browse the repository at this point in the history
Backport #27787 by @KN4CK3R

Add missing `.Close()` calls. The current code does not delete the
temporary files if the data grows over 32mb.

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
  • Loading branch information
GiteaBot and KN4CK3R committed Oct 25, 2023
1 parent 9dd8f34 commit 25acbfe
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion modules/packages/hashed_buffer.go
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
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
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
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()

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

0 comments on commit 25acbfe

Please sign in to comment.