Add files endpoint

coder · kylecarbs · Feb 8, 2022 · Feb 8, 2022 · Feb 8, 2022 · Feb 8, 2022
commit 2d82f895adf39435bea625443ac53da8ccd32240
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -102,6 +102,11 @@ func New(options *Options) http.Handler {
 			})
 		})
 
+		r.Route("/files", func(r chi.Router) {
+			r.Use(httpmw.ExtractAPIKey(options.Database, nil))
+			r.Post("/", api.postFiles)
+		})
+
 		r.Route("/provisioners", func(r chi.Router) {
 			r.Route("/daemons", func(r chi.Router) {
 				r.Get("/", api.provisionerDaemons)

diff --git a/coderd/files.go b/coderd/files.go
@@ -0,0 +1,60 @@
+package coderd
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"net/http"
+
+	"github.com/go-chi/render"
+
+	"github.com/coder/coder/database"
+	"github.com/coder/coder/httpapi"
+	"github.com/coder/coder/httpmw"
+)
+
+type UploadFileResponse struct {
+	Hash string `json:"hash"`
+}
+
+func (api *api) postFiles(rw http.ResponseWriter, r *http.Request) {
+	apiKey := httpmw.APIKey(r)
+	contentType := r.Header.Get("Content-Type")
+
+	switch contentType {
+	case "application/x-tar":
+	default:
+		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
+			Message: fmt.Sprintf("unsupported content type: %s", contentType),
+		})
+		return
+	}
+
+	r.Body = http.MaxBytesReader(rw, r.Body, 10*(10<<20))
+	data, err := io.ReadAll(r.Body)
+	if err != nil {
+		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
+			Message: fmt.Sprintf("read file: %s", err),
+		})
+		return
+	}
+	hashBytes := sha256.Sum256(data)
+	file, err := api.Database.InsertFile(r.Context(), database.InsertFileParams{
+		Hash:      hex.EncodeToString(hashBytes[:]),
+		CreatedBy: apiKey.UserID,
+		CreatedAt: database.Now(),
+		Mimetype:  contentType,
+		Data:      data,
+	})
+	if err != nil {
+		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
+			Message: fmt.Sprintf("insert file: %s", err),
+		})
+		return
+	}
+	render.Status(r, http.StatusOK)
+	render.JSON(rw, r, UploadFileResponse{
+		Hash: file.Hash,
+	})
+}
diff --git a/coderd/files_test.go b/coderd/files_test.go
@@ -0,0 +1,37 @@
+package coderd_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/codersdk"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPostFiles(t *testing.T) {
+	t.Parallel()
+	t.Run("BadContentType", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t)
+		_ = coderdtest.CreateInitialUser(t, client)
+		_, err := client.Upload(context.Background(), "bad", []byte{'a'})
+		require.NoError(t, err)
+	})
+
+	t.Run("MassiveBody", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t)
+		_ = coderdtest.CreateInitialUser(t, client)
+		_, err := client.Upload(context.Background(), codersdk.ContentTypeTar, make([]byte, 11*(10<<20)))
+		require.Error(t, err)
+	})
+
+	t.Run("Insert", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t)
+		_ = coderdtest.CreateInitialUser(t, client)
+		_, err := client.Upload(context.Background(), codersdk.ContentTypeTar, make([]byte, 10<<20))
+		require.NoError(t, err)
+	})
+}
diff --git a/codersdk/client.go b/codersdk/client.go
@@ -51,7 +51,7 @@ func (c *Client) SetSessionToken(token string) error {
 
 // request performs an HTTP request with the body provided.
 // The caller is responsible for closing the response body.
-func (c *Client) request(ctx context.Context, method, path string, body interface{}) (*http.Response, error) {
+func (c *Client) request(ctx context.Context, method, path string, body interface{}, opts ...func(r *http.Request)) (*http.Response, error) {
 	serverURL, err := c.URL.Parse(path)
 	if err != nil {
 		return nil, xerrors.Errorf("parse url: %w", err)
@@ -74,6 +74,9 @@ func (c *Client) request(ctx context.Context, method, path string, body interfac
 	if body != nil {
 		req.Header.Set("Content-Type", "application/json")
 	}
+	for _, opt := range opts {
+		opt(req)
+	}
 
 	resp, err := c.httpClient.Do(req)
 	if err != nil {

diff --git a/codersdk/files.go b/codersdk/files.go
@@ -0,0 +1,28 @@
+package codersdk
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"github.com/coder/coder/coderd"
+)
+
+const (
+	ContentTypeTar = "application/x-tar"
+)
+
+func (c *Client) Upload(ctx context.Context, contentType string, content []byte) (coderd.UploadFileResponse, error) {
+	res, err := c.request(ctx, http.MethodPost, "/api/v2/files", content, func(r *http.Request) {
+		r.Header.Set("Content-Type", contentType)
+	})
+	if err != nil {
+		return coderd.UploadFileResponse{}, err
+	}
+	defer res.Body.Close()
+	if res.StatusCode != http.StatusCreated {
+		return coderd.UploadFileResponse{}, readBodyAsError(res)
+	}
+	var resp coderd.UploadFileResponse
+	return resp, json.NewDecoder(res.Body).Decode(&resp)
+}
diff --git a/codersdk/files_test.go b/codersdk/files_test.go
@@ -0,0 +1,27 @@
+package codersdk_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/codersdk"
+	"github.com/stretchr/testify/require"
+)
+
+func TestUpload(t *testing.T) {
+	t.Parallel()
+	t.Run("Error", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t)
+		_, err := client.Upload(context.Background(), "wow", []byte{})
+		require.Error(t, err)
+	})
+	t.Run("Upload", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t)
+		_ = coderdtest.CreateInitialUser(t, client)
+		_, err := client.Upload(context.Background(), codersdk.ContentTypeTar, []byte{'a'})
+		require.NoError(t, err)
+	})
+}
diff --git a/database/databasefake/databasefake.go b/database/databasefake/databasefake.go
@@ -590,6 +590,7 @@ func (q *fakeQuerier) InsertFile(_ context.Context, arg database.InsertFileParam
 	file := database.File{
 		Hash:      arg.Hash,
 		CreatedAt: arg.CreatedAt,
+		CreatedBy: arg.CreatedBy,
 		Mimetype:  arg.Mimetype,
 		Data:      arg.Data,
 	}

diff --git a/database/dump.sql b/database/dump.sql
diff --git a/database/migrations/000002_projects.up.sql b/database/migrations/000002_projects.up.sql
@@ -2,6 +2,7 @@
 CREATE TABLE file (
     hash varchar(32) NOT NULL UNIQUE,
     created_at timestamptz NOT NULL,
+    created_by text NOT NULL,
     mimetype varchar(64) NOT NULL,
     data bytea NOT NULL
 );

diff --git a/database/models.go b/database/models.go
diff --git a/database/query.sql b/database/query.sql
@@ -364,9 +364,9 @@ VALUES
 
 -- name: InsertFile :one
 INSERT INTO
-  file (hash, created_at, mimetype, data)
+  file (hash, created_at, created_by, mimetype, data)
 VALUES
-  ($1, $2, $3, $4) RETURNING *;
+  ($1, $2, $3, $4, $5) RETURNING *;
 
 -- name: InsertProvisionerJobLogs :many
 INSERT INTO

diff --git a/database/query.sql.go b/database/query.sql.go