Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions internal/files/web.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,9 @@ func (h *webSrv) handleDownload(w http.ResponseWriter, r *http.Request) {
}

func (h *webSrv) handleUpload(w http.ResponseWriter, r *http.Request) {
if !requirePost(w, r) {
return
}
sess, ok := h.session(w, r)
if !ok {
return
Expand Down Expand Up @@ -268,6 +271,9 @@ func (h *webSrv) handleUpload(w http.ResponseWriter, r *http.Request) {
}

func (h *webSrv) handleMkdir(w http.ResponseWriter, r *http.Request) {
if !requirePost(w, r) {
return
}
sess, ok := h.session(w, r)
if !ok {
return
Expand All @@ -286,6 +292,9 @@ func (h *webSrv) handleMkdir(w http.ResponseWriter, r *http.Request) {
}

func (h *webSrv) handleDelete(w http.ResponseWriter, r *http.Request) {
if !requirePost(w, r) {
return
}
sess, ok := h.session(w, r)
if !ok {
return
Expand All @@ -299,6 +308,15 @@ func (h *webSrv) handleDelete(w http.ResponseWriter, r *http.Request) {
h.redirectMsg(w, r, parent, "deleted "+path.Base(target))
}

func requirePost(w http.ResponseWriter, r *http.Request) bool {
if r.Method == http.MethodPost {
return true
}
w.Header().Set("Allow", http.MethodPost)
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
return false
}

// session resolves the logged-in member into a filesystem session, writing an
// auth error to w when there is none.
func (h *webSrv) session(w http.ResponseWriter, r *http.Request) (*session, bool) {
Expand Down
32 changes: 32 additions & 0 deletions internal/files/web_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,38 @@ func TestWebRoundTrip(t *testing.T) {
}
}

func TestWebMutationsRejectGet(t *testing.T) {
h, _ := webTestHandler(t)
cookie := loginCookie(t, h)
uploadTo(t, h, cookie, "/me", "keep.txt", "keep me")

for _, target := range []string{
"/upload?dir=/me",
"/mkdir?dir=/me&name=from-get",
"/delete?path=/me/keep.txt",
} {
rr := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, target, nil)
req.AddCookie(cookie)
h.ServeHTTP(rr, req)
if rr.Code != http.StatusMethodNotAllowed {
t.Fatalf("GET %s: want 405, got %d", target, rr.Code)
}
}

rr := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/?path=/me", nil)
req.AddCookie(cookie)
h.ServeHTTP(rr, req)
body := rr.Body.String()
if !strings.Contains(body, "keep.txt") {
t.Fatal("GET /delete removed the file")
}
if strings.Contains(body, "from-get") {
t.Fatal("GET /mkdir created a directory")
}
}

// loginCookie logs alice in and returns her session cookie.
func loginCookie(t *testing.T, h http.Handler) *http.Cookie {
t.Helper()
Expand Down
Loading