9 files changed, 347 insertions, 0 deletions
diff --git a/internal/db/redis/image.go b/internal/db/redis/image.go
new file mode 100644
index 0000000..6814fb7
--- /dev/null
+++ b/internal/db/redis/image.go
@@ -0,0 +1,35 @@
+package redis
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/gomodule/redigo/redis"
+
+	"git.ofmax.li/iserv/internal/image"
+)
+
+const V1FilePathFmt = "filepath:up/%s"
+
+// ImageRepo deps. for storage
+type ImageRepo struct {
+	db *redis.Pool
+}
+
+// NewRedisImageRepo
+func NewRedisImageRepo(conn *redis.Pool) *ImageRepo {
+	return &ImageRepo{
+		conn,
+	}
+}
+
+func (r *ImageRepo) AddNewFile(filename string, meta *image.PostMeta, timeout int) error {
+	conn := r.db.Get()
+	defer conn.Close()
+	key := fmt.Sprintf(V1FilePathFmt, filename)
+	_, err := conn.Do("HMSET", redis.Args{}.Add(key).AddFlat(meta)...)
+	if err != nil {
+		log.Fatal(err)
+	}
+	return err
+}
diff --git a/internal/db/redis/redis.go b/internal/db/redis/redis.go
new file mode 100644
index 0000000..d769bb4
--- /dev/null
+++ b/internal/db/redis/redis.go
@@ -0,0 +1,20 @@
+package redis
+
+import (
+	"time"
+
+	"github.com/gomodule/redigo/redis"
+
+	"gitlab.com/grumps/environ"
+)
+
+var redisServer = environ.GetEnv("AUTH_REDIS", "localhost:6379")
+
+// CreatePool redis connection pool
+func CreatePool(addr string) *redis.Pool {
+	return &redis.Pool{
+		MaxIdle:     3,
+		IdleTimeout: 240 * time.Second,
+		Dial:        func() (redis.Conn, error) { return redis.Dial("tcp", addr) },
+	}
+}
diff --git a/internal/image/handler.go b/internal/image/handler.go
new file mode 100644
index 0000000..8988a58
--- /dev/null
+++ b/internal/image/handler.go
@@ -0,0 +1,71 @@
+package image
+
+import (
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+)
+
+var fileTypes = map[string]string{
+	"image/jpeg": "jpg",
+	"image/png":  "png",
+}
+
+// Handler image handler interface
+type Handler interface {
+	GetImage(w http.ResponseWriter, r *http.Request)
+	PostImage(w http.ResponseWriter, r *http.Request)
+}
+
+// NewHandler create image handler struct
+func NewHandler(service Servicer) Handler {
+	return &imageHandler{service}
+}
+
+type imageHandler struct {
+	service Servicer
+}
+
+func (h *imageHandler) GetImage(w http.ResponseWriter, r *http.Request) {
+	log.Print("serving image")
+	http.ServeFile(w, r, "foo.jpg")
+}
+
+// PostImage handler for creating an image post
+func (h *imageHandler) PostImage(w http.ResponseWriter, r *http.Request) {
+	// max size
+	r.ParseMultipartForm(10 << 20)
+	file, handler, err := r.FormFile("file")
+	if err != nil {
+		log.Printf("%s", err)
+	}
+	defer file.Close()
+	fileBytes, err := ioutil.ReadAll(file)
+	if err != nil {
+		log.Printf("%s", err)
+		log.Printf("unsupported filetype")
+		w.WriteHeader(400)
+		w.Write([]byte("Incorrect Content Type"))
+		return
+	}
+	fileType := http.DetectContentType(fileBytes)
+	if fileType != handler.Header.Get("Content-Type") {
+		log.Printf("file type and content type do not match")
+		w.WriteHeader(400)
+		w.Write([]byte("Incorrect Content Type"))
+		return
+	}
+	extension, exists := fileTypes[fileType]
+	if !exists {
+		log.Printf("unsupported filetype")
+		w.WriteHeader(400)
+		w.Write([]byte("Incorrect Content Type"))
+		return
+	}
+	fileID, err := h.service.NewID()
+	fileName := fmt.Sprintf("%s.%s", fileID, extension)
+	h.service.AddFile(fileName, fileBytes)
+	w.WriteHeader(201)
+	w.Write([]byte("ok"))
+}
diff --git a/internal/image/image_test.go b/internal/image/image_test.go
new file mode 100644
index 0000000..4a1aea9
--- /dev/null
+++ b/internal/image/image_test.go
@@ -0,0 +1,152 @@
+package image_test
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"mime/multipart"
+	"net/http"
+	"net/http/httptest"
+	"net/textproto"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/gomodule/redigo/redis"
+	"github.com/rafaeljusto/redigomock"
+	_ "github.com/stretchr/testify/mock"
+
+	db "git.ofmax.li/iserv/internal/db/redis"
+	"git.ofmax.li/iserv/internal/image"
+)
+
+// from go lang src https://golang.org/src/mime/multipart/writer.go
+// there seems to be no way to set the content type.
+var quoteEscaper = strings.NewReplacer("\\", "\\\\", `"`, "\\\"")
+
+func escapeQuotes(s string) string {
+
+	return quoteEscaper.Replace(s)
+}
+
+// end go lang src
+
+func createHeader(fieldname, filename, contentType string) textproto.MIMEHeader {
+	h := make(textproto.MIMEHeader)
+	h.Set("Content-Disposition", fmt.Sprintf(`form-data; name="%s"; filename="%s"`, escapeQuotes(fieldname), escapeQuotes(filename)))
+	h.Set("Content-Type", escapeQuotes(contentType))
+	return h
+}
+
+func prepareRequest(t *testing.T, filename, mimeType string) (*multipart.Writer, *bytes.Buffer, error) {
+	fileDir, _ := os.Getwd()
+	fileName := filename
+	filePath := path.Join(fileDir, fileName)
+
+	body := &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
+	header := createHeader("file", filePath, mimeType)
+	part, err := writer.CreatePart(header)
+	if err != nil {
+		t.Errorf("wtf %s", err)
+	}
+	file, err := os.Open(filePath)
+	if err != nil {
+		t.Errorf("couldnt open: %s", err)
+	}
+	defer file.Close()
+	fileBytes, err := ioutil.ReadAll(file)
+	if err != nil {
+		t.Errorf("couldn't read buffer: %s", fileBytes)
+	}
+
+	part.Write(fileBytes)
+	writer.Close()
+	return writer, body, err
+}
+
+func TestImage(t *testing.T) {
+	// setup redis for tests
+	conn := redigomock.NewConn()
+	pool := &redis.Pool{
+		// Return the same connection mock for each Get() call.
+		Dial:    func() (redis.Conn, error) { return conn, nil },
+		MaxIdle: 10,
+	}
+	conn.Command("HMSET", redigomock.NewAnyData(), redigomock.NewAnyData(), redigomock.NewAnyData(), redigomock.NewAnyData(), redigomock.NewAnyData(), redigomock.NewAnyData(), redigomock.NewAnyData())
+	repo := db.NewRedisImageRepo(pool)
+
+	// setup image package
+	imageBuildDir, err := ioutil.TempDir("", "test-images")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(imageBuildDir)
+	imageService := image.NewService(repo, imageBuildDir)
+	imageHandler := image.NewHandler(imageService)
+	handler := http.HandlerFunc(imageHandler.PostImage)
+
+	// prep test with png
+	writer, body, err := prepareRequest(t, "t.png", "image/png")
+	if err != nil {
+		t.Fatal(err)
+	}
+	w := httptest.NewRecorder()
+	r, err := http.NewRequest("POST", "http://example.com", body)
+	if err != nil {
+		t.Errorf("%s", err)
+	}
+	r.Header.Add("Content-Type", writer.FormDataContentType())
+	handler.ServeHTTP(w, r)
+	response := w.Result()
+	if response.StatusCode != http.StatusCreated {
+		t.Errorf("image create status 201")
+
+	}
+
+	// incorrect mime
+	writer, body, err = prepareRequest(t, "t.pdf", "application/pdf")
+	if err != nil {
+		t.Fatal(err)
+	}
+	w = httptest.NewRecorder()
+	r, err = http.NewRequest("POST", "http://example.com", body)
+	if err != nil {
+		t.Fatal(err)
+	}
+	r.Header.Add("Content-Type", writer.FormDataContentType())
+	handler.ServeHTTP(w, r)
+	response = w.Result()
+	if response.StatusCode != http.StatusBadRequest {
+		t.Errorf("image create not 400")
+	}
+
+	// sneaky mimetype check
+	writer, body, err = prepareRequest(t, "t.png", "image/jpeg")
+	if err != nil {
+		t.Fatal(err)
+	}
+	w = httptest.NewRecorder()
+	r, err = http.NewRequest("POST", "http://example.com", body)
+	if err != nil {
+		t.Errorf("%s", err)
+	}
+	r.Header.Add("Content-Type", writer.FormDataContentType())
+	handler.ServeHTTP(w, r)
+	response = w.Result()
+	if response.StatusCode != http.StatusBadRequest {
+		t.Errorf("image create not 400")
+	}
+
+	// test image write path && ext
+	// TODO
+	pngs, err := filepath.Glob(filepath.Join(imageBuildDir))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(pngs) != 1 {
+		t.Error("expected only 1 image to be found")
+	}
+}
diff --git a/internal/image/model.go b/internal/image/model.go
new file mode 100644
index 0000000..002ad8a
--- /dev/null
+++ b/internal/image/model.go
@@ -0,0 +1,8 @@
+package image
+
+// PostMeta hold data for an image post
+type PostMeta struct {
+	FilePath  string `redis:"file_path"`
+	CreatedAt string `redis:"created_at"`
+	UserID    string `redis:"user_id"`
+}
diff --git a/internal/image/repo.go b/internal/image/repo.go
new file mode 100644
index 0000000..a65ad49
--- /dev/null
+++ b/internal/image/repo.go
@@ -0,0 +1,6 @@
+package image
+
+// Repo storage interface
+type Repo interface {
+	AddNewFile(filename string, meta *PostMeta, timeout int) error
+}
diff --git a/internal/image/service.go b/internal/image/service.go
new file mode 100644
index 0000000..dabbfe7
--- /dev/null
+++ b/internal/image/service.go
@@ -0,0 +1,55 @@
+package image
+
+import (
+	"io/ioutil"
+	"log"
+	"path"
+	"time"
+
+	"github.com/matoous/go-nanoid"
+)
+
+// Servicer image management
+type Servicer interface {
+	NewID() (string, error)
+	AddFile(filename string, fileBytes []byte) error
+}
+
+// NewService new image service
+func NewService(repo Repo, storagePath string) *Service {
+	return &Service{repo,
+		storagePath,
+	}
+}
+
+// Service a container for working with images
+type Service struct {
+	db          Repo
+	storagePath string
+}
+
+// NewID create an uniqueish ID
+func (is *Service) NewID() (string, error) {
+	return gonanoid.Nanoid()
+}
+
+// AddFile writes to disk, writes meta to db
+func (is *Service) AddFile(fileName string, fileBytes []byte) error {
+	filePath := path.Join(is.storagePath, fileName)
+	if err := ioutil.WriteFile(filePath, fileBytes, 0750); err != nil {
+		log.Fatal(err)
+		return err
+	}
+	t := time.Now().UTC()
+	postMeta := &PostMeta{
+		FilePath:  fileName,
+		CreatedAt: t.Format(time.RFC3339),
+		UserID:    "1",
+	}
+	is.db.AddNewFile(fileName, postMeta, 946080000)
+	if err := is.db.AddNewFile(fileName, postMeta, 946080000); err != nil {
+		log.Fatal(err)
+		return err
+	}
+	return nil
+}
diff --git a/internal/image/t.pdf b/internal/image/t.pdf
new file mode 100644
index 0000000..e1eb5d1
--- /dev/null
+++ b/internal/image/t.pdf
diff --git a/internal/image/t.png b/internal/image/t.png
new file mode 100644
index 0000000..50b107e
--- /dev/null
+++ b/internal/image/t.png