Api/v1/accounts (#8)

* start work on accounts module

* plodding away on the accounts endpoint

* groundwork for other account routes

* add password validator

* validation utils

* require account approval flags

* comments

* comments

* go fmt

* comments

* add distributor stub

* rename api to federator

* tidy a bit

* validate new account requests

* rename r router

* comments

* add domain blocks

* add some more shortcuts

* add some more shortcuts

* check email + username availability

* email block checking for signups

* chunking away at it

* tick off a few more things

* some fiddling with tests

* add mock package

* relocate repo

* move mocks around

* set app id on new signups

* initialize oauth server properly

* rename oauth server

* proper mocking tests

* go fmt ./...

* add required fields

* change name of func

* move validation to account.go

* more tests!

* add some file utility tools

* add mediaconfig

* new shortcut

* add some more fields

* add followrequest model

* add notify

* update mastotypes

* mock out storage interface

* start building media interface

* start on update credentials

* mess about with media a bit more

* test image manipulation

* media more or less working

* account update nearly working

* rearranging my package ;) ;) ;)

* phew big stuff!!!!

* fix type checking

* *fiddles*

* Add CreateTables func

* account registration flow working

* tidy

* script to step through auth flow

* add a lil helper for generating user uris

* fiddling with federation a bit

* update progress

* Tidying and linting

internal/media/media.go

@@ -18,6 +18,195 @@
 
 package media
 
-// API provides an interface for parsing, storing, and retrieving media objects like photos and videos
-type API interface {
+import (
+	"errors"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/sirupsen/logrus"
+	"github.com/superseriousbusiness/gotosocial/internal/config"
+	"github.com/superseriousbusiness/gotosocial/internal/db"
+	"github.com/superseriousbusiness/gotosocial/internal/db/model"
+	"github.com/superseriousbusiness/gotosocial/internal/storage"
+)
+
+// MediaHandler provides an interface for parsing, storing, and retrieving media objects like photos, videos, and gifs.
+type MediaHandler interface {
+	// SetHeaderOrAvatarForAccountID takes a new header image for an account, checks it out, removes exif data from it,
+	// puts it in whatever storage backend we're using, sets the relevant fields in the database for the new image,
+	// and then returns information to the caller about the new header.
+	SetHeaderOrAvatarForAccountID(img []byte, accountID string, headerOrAvi string) (*model.MediaAttachment, error)
+}
+
+type mediaHandler struct {
+	config  *config.Config
+	db      db.DB
+	storage storage.Storage
+	log     *logrus.Logger
+}
+
+func New(config *config.Config, database db.DB, storage storage.Storage, log *logrus.Logger) MediaHandler {
+	return &mediaHandler{
+		config:  config,
+		db:      database,
+		storage: storage,
+		log:     log,
+	}
+}
+
+// HeaderInfo wraps the urls at which a Header and a StaticHeader is available from the server.
+type HeaderInfo struct {
+	// URL to the header
+	Header string
+	// Static version of the above (eg., a path to a still image if the header is a gif)
+	HeaderStatic string
+}
+
+/*
+	INTERFACE FUNCTIONS
+*/
+
+func (mh *mediaHandler) SetHeaderOrAvatarForAccountID(img []byte, accountID string, headerOrAvi string) (*model.MediaAttachment, error) {
+	l := mh.log.WithField("func", "SetHeaderForAccountID")
+
+	if headerOrAvi != "header" && headerOrAvi != "avatar" {
+		return nil, errors.New("header or avatar not selected")
+	}
+
+	// make sure we have an image we can handle
+	contentType, err := parseContentType(img)
+	if err != nil {
+		return nil, err
+	}
+	if !supportedImageType(contentType) {
+		return nil, fmt.Errorf("%s is not an accepted image type", contentType)
+	}
+
+	if len(img) == 0 {
+		return nil, fmt.Errorf("passed reader was of size 0")
+	}
+	l.Tracef("read %d bytes of file", len(img))
+
+	// process it
+	ma, err := mh.processHeaderOrAvi(img, contentType, headerOrAvi, accountID)
+	if err != nil {
+		return nil, fmt.Errorf("error processing %s: %s", headerOrAvi, err)
+	}
+
+	// set it in the database
+	if err := mh.db.SetHeaderOrAvatarForAccountID(ma, accountID); err != nil {
+		return nil, fmt.Errorf("error putting %s in database: %s", headerOrAvi, err)
+	}
+
+	return ma, nil
+}
+
+/*
+	HELPER FUNCTIONS
+*/
+
+func (mh *mediaHandler) processHeaderOrAvi(imageBytes []byte, contentType string, headerOrAvi string, accountID string) (*model.MediaAttachment, error) {
+	var isHeader bool
+	var isAvatar bool
+
+	switch headerOrAvi {
+	case "header":
+		isHeader = true
+	case "avatar":
+		isAvatar = true
+	default:
+		return nil, errors.New("header or avatar not selected")
+	}
+
+	var clean []byte
+	var err error
+
+	switch contentType {
+	case "image/jpeg":
+		if clean, err = purgeExif(imageBytes); err != nil {
+			return nil, fmt.Errorf("error cleaning exif data: %s", err)
+		}
+	case "image/png":
+		if clean, err = purgeExif(imageBytes); err != nil {
+			return nil, fmt.Errorf("error cleaning exif data: %s", err)
+		}
+	case "image/gif":
+		clean = imageBytes
+	default:
+		return nil, errors.New("media type unrecognized")
+	}
+
+	original, err := deriveImage(clean, contentType)
+	if err != nil {
+		return nil, fmt.Errorf("error parsing image: %s", err)
+	}
+
+	small, err := deriveThumbnail(clean, contentType)
+	if err != nil {
+		return nil, fmt.Errorf("error deriving thumbnail: %s", err)
+	}
+
+	// now put it in storage, take a new uuid for the name of the file so we don't store any unnecessary info about it
+	extension := strings.Split(contentType, "/")[1]
+	newMediaID := uuid.NewString()
+
+	base := fmt.Sprintf("%s://%s%s", mh.config.StorageConfig.ServeProtocol, mh.config.StorageConfig.ServeHost, mh.config.StorageConfig.ServeBasePath)
+
+	// we store the original...
+	originalPath := fmt.Sprintf("%s/%s/%s/original/%s.%s", base, accountID, headerOrAvi, newMediaID, extension)
+	if err := mh.storage.StoreFileAt(originalPath, original.image); err != nil {
+		return nil, fmt.Errorf("storage error: %s", err)
+	}
+	// and a thumbnail...
+	smallPath := fmt.Sprintf("%s/%s/%s/small/%s.%s", base, accountID, headerOrAvi, newMediaID, extension)
+	if err := mh.storage.StoreFileAt(smallPath, small.image); err != nil {
+		return nil, fmt.Errorf("storage error: %s", err)
+	}
+
+	ma := &model.MediaAttachment{
+		ID:        newMediaID,
+		StatusID:  "",
+		RemoteURL: "",
+		CreatedAt: time.Now(),
+		UpdatedAt: time.Now(),
+		Type:      model.FileTypeImage,
+		FileMeta: model.FileMeta{
+			Original: model.Original{
+				Width:  original.width,
+				Height: original.height,
+				Size:   original.size,
+				Aspect: original.aspect,
+			},
+			Small: model.Small{
+				Width:  small.width,
+				Height: small.height,
+				Size:   small.size,
+				Aspect: small.aspect,
+			},
+		},
+		AccountID:         accountID,
+		Description:       "",
+		ScheduledStatusID: "",
+		Blurhash:          original.blurhash,
+		Processing:        2,
+		File: model.File{
+			Path:        originalPath,
+			ContentType: contentType,
+			FileSize:    len(original.image),
+			UpdatedAt:   time.Now(),
+		},
+		Thumbnail: model.Thumbnail{
+			Path:        smallPath,
+			ContentType: contentType,
+			FileSize:    len(small.image),
+			UpdatedAt:   time.Now(),
+			RemoteURL:   "",
+		},
+		Avatar: isAvatar,
+		Header: isHeader,
+	}
+
+	return ma, nil
 }

internal/media/media_test.go

@@ -0,0 +1,159 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package media
+
+import (
+	"context"
+	"io/ioutil"
+	"testing"
+
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/gotosocial/internal/config"
+	"github.com/superseriousbusiness/gotosocial/internal/db"
+	"github.com/superseriousbusiness/gotosocial/internal/db/model"
+	"github.com/superseriousbusiness/gotosocial/internal/storage"
+)
+
+type MediaTestSuite struct {
+	suite.Suite
+	config       *config.Config
+	log          *logrus.Logger
+	db           db.DB
+	mediaHandler *mediaHandler
+	mockStorage  *storage.MockStorage
+}
+
+/*
+	TEST INFRASTRUCTURE
+*/
+
+// SetupSuite sets some variables on the suite that we can use as consts (more or less) throughout
+func (suite *MediaTestSuite) SetupSuite() {
+	// some of our subsequent entities need a log so create this here
+	log := logrus.New()
+	log.SetLevel(logrus.TraceLevel)
+	suite.log = log
+
+	// Direct config to local postgres instance
+	c := config.Empty()
+	c.Protocol = "http"
+	c.Host = "localhost"
+	c.DBConfig = &config.DBConfig{
+		Type:            "postgres",
+		Address:         "localhost",
+		Port:            5432,
+		User:            "postgres",
+		Password:        "postgres",
+		Database:        "postgres",
+		ApplicationName: "gotosocial",
+	}
+	c.MediaConfig = &config.MediaConfig{
+		MaxImageSize: 2 << 20,
+	}
+	c.StorageConfig = &config.StorageConfig{
+		Backend:       "local",
+		BasePath:      "/tmp",
+		ServeProtocol: "http",
+		ServeHost:     "localhost",
+		ServeBasePath: "/fileserver/media",
+	}
+	suite.config = c
+	// use an actual database for this, because it's just easier than mocking one out
+	database, err := db.New(context.Background(), c, log)
+	if err != nil {
+		suite.FailNow(err.Error())
+	}
+	suite.db = database
+
+	suite.mockStorage = &storage.MockStorage{}
+	// We don't need storage to do anything for these tests, so just simulate a success and do nothing
+	suite.mockStorage.On("StoreFileAt", mock.AnythingOfType("string"), mock.AnythingOfType("[]uint8")).Return(nil)
+
+	// and finally here's the thing we're actually testing!
+	suite.mediaHandler = &mediaHandler{
+		config:  suite.config,
+		db:      suite.db,
+		storage: suite.mockStorage,
+		log:     log,
+	}
+
+}
+
+func (suite *MediaTestSuite) TearDownSuite() {
+	if err := suite.db.Stop(context.Background()); err != nil {
+		logrus.Panicf("error closing db connection: %s", err)
+	}
+}
+
+// SetupTest creates a db connection and creates necessary tables before each test
+func (suite *MediaTestSuite) SetupTest() {
+	// create all the tables we might need in thie suite
+	models := []interface{}{
+		&model.Account{},
+		&model.MediaAttachment{},
+	}
+	for _, m := range models {
+		if err := suite.db.CreateTable(m); err != nil {
+			logrus.Panicf("db connection error: %s", err)
+		}
+	}
+}
+
+// TearDownTest drops tables to make sure there's no data in the db
+func (suite *MediaTestSuite) TearDownTest() {
+
+	// remove all the tables we might have used so it's clear for the next test
+	models := []interface{}{
+		&model.Account{},
+		&model.MediaAttachment{},
+	}
+	for _, m := range models {
+		if err := suite.db.DropTable(m); err != nil {
+			logrus.Panicf("error dropping table: %s", err)
+		}
+	}
+}
+
+/*
+	ACTUAL TESTS
+*/
+
+func (suite *MediaTestSuite) TestSetHeaderOrAvatarForAccountID() {
+	// load test image
+	f, err := ioutil.ReadFile("./test/test-jpeg.jpg")
+	assert.Nil(suite.T(), err)
+
+	ma, err := suite.mediaHandler.SetHeaderOrAvatarForAccountID(f, "weeeeeee", "header")
+	assert.Nil(suite.T(), err)
+	suite.log.Debugf("%+v", ma)
+
+	// attachment should have....
+	assert.Equal(suite.T(), "weeeeeee", ma.AccountID)
+	assert.Equal(suite.T(), "LjCZnlvyRkRn_NvzRjWF?urqV@f9", ma.Blurhash)
+	//TODO: add more checks here, cba right now!
+}
+
+// TODO: add tests for sad path, gif, png....
+
+func TestMediaTestSuite(t *testing.T) {
+	suite.Run(t, new(MediaTestSuite))
+}

internal/media/mock_MediaHandler.go

@@ -0,0 +1,36 @@
+// Code generated by mockery v2.7.4. DO NOT EDIT.
+
+package media
+
+import (
+	mock "github.com/stretchr/testify/mock"
+	model "github.com/superseriousbusiness/gotosocial/internal/db/model"
+)
+
+// MockMediaHandler is an autogenerated mock type for the MediaHandler type
+type MockMediaHandler struct {
+	mock.Mock
+}
+
+// SetHeaderOrAvatarForAccountID provides a mock function with given fields: img, accountID, headerOrAvi
+func (_m *MockMediaHandler) SetHeaderOrAvatarForAccountID(img []byte, accountID string, headerOrAvi string) (*model.MediaAttachment, error) {
+	ret := _m.Called(img, accountID, headerOrAvi)
+
+	var r0 *model.MediaAttachment
+	if rf, ok := ret.Get(0).(func([]byte, string, string) *model.MediaAttachment); ok {
+		r0 = rf(img, accountID, headerOrAvi)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*model.MediaAttachment)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func([]byte, string, string) error); ok {
+		r1 = rf(img, accountID, headerOrAvi)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}

internal/media/util.go

@@ -0,0 +1,192 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package media
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"image"
+	"image/gif"
+	"image/jpeg"
+	"image/png"
+
+	"github.com/buckket/go-blurhash"
+	"github.com/h2non/filetype"
+	"github.com/nfnt/resize"
+	"github.com/superseriousbusiness/exifremove/pkg/exifremove"
+)
+
+// parseContentType parses the MIME content type from a file, returning it as a string in the form (eg., "image/jpeg").
+// Returns an error if the content type is not something we can process.
+func parseContentType(content []byte) (string, error) {
+	head := make([]byte, 261)
+	_, err := bytes.NewReader(content).Read(head)
+	if err != nil {
+		return "", fmt.Errorf("could not read first magic bytes of file: %s", err)
+	}
+
+	kind, err := filetype.Match(head)
+	if err != nil {
+		return "", err
+	}
+
+	if kind == filetype.Unknown {
+		return "", errors.New("filetype unknown")
+	}
+
+	return kind.MIME.Value, nil
+}
+
+// supportedImageType checks mime type of an image against a slice of accepted types,
+// and returns True if the mime type is accepted.
+func supportedImageType(mimeType string) bool {
+	acceptedImageTypes := []string{
+		"image/jpeg",
+		"image/gif",
+		"image/png",
+	}
+	for _, accepted := range acceptedImageTypes {
+		if mimeType == accepted {
+			return true
+		}
+	}
+	return false
+}
+
+// purgeExif is a little wrapper for the action of removing exif data from an image.
+// Only pass pngs or jpegs to this function.
+func purgeExif(b []byte) ([]byte, error) {
+	if len(b) == 0 {
+		return nil, errors.New("passed image was not valid")
+	}
+
+	clean, err := exifremove.Remove(b)
+	if err != nil {
+		return nil, fmt.Errorf("could not purge exif from image: %s", err)
+	}
+	if len(clean) == 0 {
+		return nil, errors.New("purged image was not valid")
+	}
+	return clean, nil
+}
+
+func deriveImage(b []byte, extension string) (*imageAndMeta, error) {
+	var i image.Image
+	var err error
+
+	switch extension {
+	case "image/jpeg":
+		i, err = jpeg.Decode(bytes.NewReader(b))
+		if err != nil {
+			return nil, err
+		}
+	case "image/png":
+		i, err = png.Decode(bytes.NewReader(b))
+		if err != nil {
+			return nil, err
+		}
+	case "image/gif":
+		i, err = gif.Decode(bytes.NewReader(b))
+		if err != nil {
+			return nil, err
+		}
+	default:
+		return nil, fmt.Errorf("extension %s not recognised", extension)
+	}
+
+	width := i.Bounds().Size().X
+	height := i.Bounds().Size().Y
+	size := width * height
+	aspect := float64(width) / float64(height)
+	bh, err := blurhash.Encode(4, 3, i)
+	if err != nil {
+		return nil, fmt.Errorf("error generating blurhash: %s", err)
+	}
+
+	out := &bytes.Buffer{}
+	if err := jpeg.Encode(out, i, nil); err != nil {
+		return nil, err
+	}
+	return &imageAndMeta{
+		image:    out.Bytes(),
+		width:    width,
+		height:   height,
+		size:     size,
+		aspect:   aspect,
+		blurhash: bh,
+	}, nil
+}
+
+// deriveThumbnailFromImage returns a byte slice and metadata for a 256-pixel-width thumbnail
+// of a given jpeg, png, or gif, or an error if something goes wrong.
+//
+// Note that the aspect ratio of the image will be retained,
+// so it will not necessarily be a square.
+func deriveThumbnail(b []byte, extension string) (*imageAndMeta, error) {
+	var i image.Image
+	var err error
+
+	switch extension {
+	case "image/jpeg":
+		i, err = jpeg.Decode(bytes.NewReader(b))
+		if err != nil {
+			return nil, err
+		}
+	case "image/png":
+		i, err = png.Decode(bytes.NewReader(b))
+		if err != nil {
+			return nil, err
+		}
+	case "image/gif":
+		i, err = gif.Decode(bytes.NewReader(b))
+		if err != nil {
+			return nil, err
+		}
+	default:
+		return nil, fmt.Errorf("extension %s not recognised", extension)
+	}
+
+	thumb := resize.Thumbnail(256, 256, i, resize.NearestNeighbor)
+	width := thumb.Bounds().Size().X
+	height := thumb.Bounds().Size().Y
+	size := width * height
+	aspect := float64(width) / float64(height)
+
+	out := &bytes.Buffer{}
+	if err := jpeg.Encode(out, thumb, nil); err != nil {
+		return nil, err
+	}
+	return &imageAndMeta{
+		image:  out.Bytes(),
+		width:  width,
+		height: height,
+		size:   size,
+		aspect: aspect,
+	}, nil
+}
+
+type imageAndMeta struct {
+	image    []byte
+	width    int
+	height   int
+	size     int
+	aspect   float64
+	blurhash string
+}

internal/media/util_test.go

@@ -0,0 +1,147 @@
+/*
+   GoToSocial
+   Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package media
+
+import (
+	"io/ioutil"
+	"testing"
+
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+)
+
+type MediaUtilTestSuite struct {
+	suite.Suite
+	log *logrus.Logger
+}
+
+/*
+	TEST INFRASTRUCTURE
+*/
+
+// SetupSuite sets some variables on the suite that we can use as consts (more or less) throughout
+func (suite *MediaUtilTestSuite) SetupSuite() {
+	// some of our subsequent entities need a log so create this here
+	log := logrus.New()
+	log.SetLevel(logrus.TraceLevel)
+	suite.log = log
+}
+
+func (suite *MediaUtilTestSuite) TearDownSuite() {
+
+}
+
+// SetupTest creates a db connection and creates necessary tables before each test
+func (suite *MediaUtilTestSuite) SetupTest() {
+
+}
+
+// TearDownTest drops tables to make sure there's no data in the db
+func (suite *MediaUtilTestSuite) TearDownTest() {
+
+}
+
+/*
+	ACTUAL TESTS
+*/
+
+func (suite *MediaUtilTestSuite) TestParseContentTypeOK() {
+	f, err := ioutil.ReadFile("./test/test-jpeg.jpg")
+	assert.Nil(suite.T(), err)
+	ct, err := parseContentType(f)
+	assert.Nil(suite.T(), err)
+	assert.Equal(suite.T(), "image/jpeg", ct)
+}
+
+func (suite *MediaUtilTestSuite) TestParseContentTypeNotOK() {
+	f, err := ioutil.ReadFile("./test/test-corrupted.jpg")
+	assert.Nil(suite.T(), err)
+	ct, err := parseContentType(f)
+	assert.NotNil(suite.T(), err)
+	assert.Equal(suite.T(), "", ct)
+	assert.Equal(suite.T(), "filetype unknown", err.Error())
+}
+
+func (suite *MediaUtilTestSuite) TestRemoveEXIF() {
+	// load and validate image
+	b, err := ioutil.ReadFile("./test/test-with-exif.jpg")
+	assert.Nil(suite.T(), err)
+
+	// clean it up and validate the clean version
+	clean, err := purgeExif(b)
+	assert.Nil(suite.T(), err)
+
+	// compare it to our stored sample
+	sampleBytes, err := ioutil.ReadFile("./test/test-without-exif.jpg")
+	assert.Nil(suite.T(), err)
+	assert.EqualValues(suite.T(), sampleBytes, clean)
+}
+
+func (suite *MediaUtilTestSuite) TestDeriveImageFromJPEG() {
+	// load image
+	b, err := ioutil.ReadFile("./test/test-jpeg.jpg")
+	assert.Nil(suite.T(), err)
+
+	// clean it up and validate the clean version
+	imageAndMeta, err := deriveImage(b, "image/jpeg")
+	assert.Nil(suite.T(), err)
+
+	assert.Equal(suite.T(), 1920, imageAndMeta.width)
+	assert.Equal(suite.T(), 1080, imageAndMeta.height)
+	assert.Equal(suite.T(), 1.7777777777777777, imageAndMeta.aspect)
+	assert.Equal(suite.T(), 2073600, imageAndMeta.size)
+	assert.Equal(suite.T(), "LjCZnlvyRkRn_NvzRjWF?urqV@f9", imageAndMeta.blurhash)
+
+	// assert that the final image is what we would expect
+	sampleBytes, err := ioutil.ReadFile("./test/test-jpeg-processed.jpg")
+	assert.Nil(suite.T(), err)
+	assert.EqualValues(suite.T(), sampleBytes, imageAndMeta.image)
+}
+
+func (suite *MediaUtilTestSuite) TestDeriveThumbnailFromJPEG() {
+	// load image
+	b, err := ioutil.ReadFile("./test/test-jpeg.jpg")
+	assert.Nil(suite.T(), err)
+
+	// clean it up and validate the clean version
+	imageAndMeta, err := deriveThumbnail(b, "image/jpeg")
+	assert.Nil(suite.T(), err)
+
+	assert.Equal(suite.T(), 256, imageAndMeta.width)
+	assert.Equal(suite.T(), 144, imageAndMeta.height)
+	assert.Equal(suite.T(), 1.7777777777777777, imageAndMeta.aspect)
+	assert.Equal(suite.T(), 36864, imageAndMeta.size)
+
+	sampleBytes, err := ioutil.ReadFile("./test/test-jpeg-thumbnail.jpg")
+	assert.Nil(suite.T(), err)
+	assert.EqualValues(suite.T(), sampleBytes, imageAndMeta.image)
+}
+
+func (suite *MediaUtilTestSuite) TestSupportedImageTypes() {
+	ok := supportedImageType("image/jpeg")
+	assert.True(suite.T(), ok)
+
+	ok = supportedImageType("image/bmp")
+	assert.False(suite.T(), ok)
+}
+
+func TestMediaUtilTestSuite(t *testing.T) {
+	suite.Run(t, new(MediaUtilTestSuite))
+}