diff options
Diffstat (limited to 'internal/processing/admin')
| -rw-r--r-- | internal/processing/admin/emoji.go | 64 | ||||
| -rw-r--r-- | internal/processing/admin/media.go | 4 |
2 files changed, 57 insertions, 11 deletions
diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go index c023fabd8..cf5bacef8 100644 --- a/internal/processing/admin/emoji.go +++ b/internal/processing/admin/emoji.go @@ -25,7 +25,10 @@ import ( "mime/multipart" "strings" + "codeberg.org/gruf/go-bytesize" + "codeberg.org/gruf/go-iotools" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" @@ -41,10 +44,26 @@ func (p *Processor) EmojiCreate( form *apimodel.EmojiCreateRequest, ) (*apimodel.Emoji, gtserror.WithCode) { - // Simply read provided form data for emoji data source. - data := func(_ context.Context) (io.ReadCloser, int64, error) { - f, err := form.Image.Open() - return f, form.Image.Size, err + // Get maximum supported local emoji size. + maxsz := config.GetMediaEmojiLocalMaxSize() + + // Ensure media within size bounds. + if form.Image.Size > int64(maxsz) { + text := fmt.Sprintf("emoji exceeds configured max size: %s", maxsz) + return nil, gtserror.NewErrorBadRequest(errors.New(text), text) + } + + // Open multipart file reader. + mpfile, err := form.Image.Open() + if err != nil { + err := gtserror.Newf("error opening multipart file: %w", err) + return nil, gtserror.NewErrorInternalError(err) + } + + // Wrap the multipart file reader to ensure is limited to max. + rc, _, _ := iotools.UpdateReadCloserLimit(mpfile, int64(maxsz)) + data := func(context.Context) (io.ReadCloser, error) { + return rc, nil } // Attempt to create the new local emoji. @@ -285,14 +304,23 @@ func (p *Processor) emojiUpdateCopy( return nil, gtserror.NewErrorNotFound(err) } + // Get maximum supported local emoji size. + maxsz := config.GetMediaEmojiLocalMaxSize() + + // Ensure target emoji image within size bounds. + if bytesize.Size(target.ImageFileSize) > maxsz { + text := fmt.Sprintf("emoji exceeds configured max size: %s", maxsz) + return nil, gtserror.NewErrorBadRequest(errors.New(text), text) + } + // Data function for copying just streams media // out of storage into an additional location. // // This means that data for the copy persists even // if the remote copied emoji gets deleted at some point. - data := func(ctx context.Context) (io.ReadCloser, int64, error) { + data := func(ctx context.Context) (io.ReadCloser, error) { rc, err := p.state.Storage.GetStream(ctx, target.ImagePath) - return rc, int64(target.ImageFileSize), err + return rc, err } // Attempt to create the new local emoji. @@ -413,10 +441,26 @@ func (p *Processor) emojiUpdateModify( // Updating image and maybe categoryID. // We can do both at the same time :) - // Simply read provided form data for emoji data source. - data := func(_ context.Context) (io.ReadCloser, int64, error) { - f, err := image.Open() - return f, image.Size, err + // Get maximum supported local emoji size. + maxsz := config.GetMediaEmojiLocalMaxSize() + + // Ensure media within size bounds. + if image.Size > int64(maxsz) { + text := fmt.Sprintf("emoji exceeds configured max size: %s", maxsz) + return nil, gtserror.NewErrorBadRequest(errors.New(text), text) + } + + // Open multipart file reader. + mpfile, err := image.Open() + if err != nil { + err := gtserror.Newf("error opening multipart file: %w", err) + return nil, gtserror.NewErrorInternalError(err) + } + + // Wrap the multipart file reader to ensure is limited to max. + rc, _, _ := iotools.UpdateReadCloserLimit(mpfile, int64(maxsz)) + data := func(context.Context) (io.ReadCloser, error) { + return rc, nil } // Prepare emoji model for recache from new data. diff --git a/internal/processing/admin/media.go b/internal/processing/admin/media.go index edbcbe349..9cd68d88b 100644 --- a/internal/processing/admin/media.go +++ b/internal/processing/admin/media.go @@ -21,6 +21,7 @@ import ( "context" "fmt" + "github.com/superseriousbusiness/gotosocial/internal/gtscontext" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/log" @@ -35,8 +36,9 @@ func (p *Processor) MediaRefetch(ctx context.Context, requestingAccount *gtsmode } go func() { + ctx := gtscontext.WithValues(context.Background(), ctx) log.Info(ctx, "starting emoji refetch") - refetched, err := p.media.RefetchEmojis(context.Background(), domain, transport.DereferenceMedia) + refetched, err := p.media.RefetchEmojis(ctx, domain, transport.DereferenceMedia) if err != nil { log.Errorf(ctx, "error refetching emojis: %s", err) } else { |