Support HEAD and fix broken dependency (#13)

* Handle HEAD

* Fix broken UUID package

* Add sanity check for HEAD and GET requests

* [skip ci] Remove go version from go.mod

Author: Hexawolf

.gitignore

@@ -1 +1,5 @@
 coverage.txt
+.idea/
+*.db
+*.exe
+filedropd.yml

go.mod

@@ -2,7 +2,7 @@ module github.com/foxcpp/filedrop
 
 require (
 	github.com/go-sql-driver/mysql v1.4.0
-	github.com/gofrs/uuid/v3 v3.1.1
+	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/lib/pq v1.0.0
 	github.com/mattn/go-sqlite3 v1.9.0
 	github.com/pkg/errors v0.8.0

go.sum

@@ -1,7 +1,7 @@
 github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx+opk=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/gofrs/uuid/v3 v3.1.1 h1:sqMK0jjyOJ7HV36lwG2GZ6TD2hK8RB7dJQVDakI65U4=
-github.com/gofrs/uuid/v3 v3.1.1/go.mod h1:xPwMqoocQ1L5G6pXX5BcE7N5jlzn2o19oqAKxwZW/kI=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=

server.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gofrs/uuid/v3"
+	"github.com/gofrs/uuid"
 	"github.com/pkg/errors"
 )
 
@@ -347,7 +347,7 @@ func (s *Server) serveFile(w http.ResponseWriter, r *http.Request) {
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Method == http.MethodPost {
 		s.acceptFile(w, r)
-	} else if r.Method == http.MethodGet {
+	} else if r.Method == http.MethodGet || r.Method == http.MethodHead {
 		s.serveFile(w, r)
 	} else {
 		w.WriteHeader(http.StatusMethodNotAllowed)

server_test.go

@@ -8,6 +8,7 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 	"time"
@@ -38,6 +39,36 @@ func TestBasicSubmit(t *testing.T) {
 	}
 }
 
+func TestHeadAndGet(t *testing.T) {
+	serv := initServ(filedrop.Default)
+	ts := httptest.NewServer(serv)
+	defer cleanServ(serv)
+	defer ts.Close()
+	c := ts.Client()
+
+	url := string(doPOST(t, c, ts.URL+"/filedrop", "text/plain", strings.NewReader(file)))
+
+	t.Log("File URL:", url)
+
+	respHead, err := c.Head(url)
+	if err != nil {
+		t.Error("GET:", err)
+		t.FailNow()
+	}
+	respGet, err := c.Get(url)
+	if err != nil {
+		t.Error("HEAD:", err)
+		t.FailNow()
+	}
+	defer respHead.Body.Close()
+	defer respGet.Body.Close()
+
+	if !reflect.DeepEqual(respHead.Header, respGet.Header) {
+		t.Error("Headers are different!")
+		t.FailNow()
+	}
+}
+
 func TestFakeFilename(t *testing.T) {
 	conf := filedrop.Default
 	serv := initServ(conf)