serve webdav: combine serve webdav and serve http

cmd/serve/http/http.go

@@ -43,7 +43,7 @@ control the stats printing.
 		cmd.CheckArgs(1, 1, command, args)
 		f := cmd.NewFsSrc(args)
 		cmd.Run(false, true, command, func() error {
-			s := newServer(f, &httpflags.Opt)
+			s := NewServer(f, &httpflags.Opt)
 			err := s.Serve()
 			if err != nil {
 				return err
@@ -54,28 +54,29 @@ control the stats printing.
 	},
 }
 
-// server contains everything to run the server
+// Server contains everything to run the Server
-type server struct {
+type Server struct {
 	*httplib.Server
 	f   fs.Fs
 	vfs *vfs.VFS
 }
 
-func newServer(f fs.Fs, opt *httplib.Options) *server {
+// NewServer creates a new http server
+func NewServer(f fs.Fs, opt *httplib.Options) *Server {
 	mux := http.NewServeMux()
-	s := &server{
+	s := &Server{
 		Server: httplib.NewServer(mux, opt),
 		f:      f,
 		vfs:    vfs.New(f, &vfsflags.Opt),
 	}
-	mux.HandleFunc("/", s.handler)
+	mux.HandleFunc("/", s.Handler)
 	return s
 }
 
-// Serve runs the http server in the background.
+// Serve runs the http Server in the background.
 //
-// Use s.Close() and s.Wait() to shutdown server
+// Use s.Close() and s.Wait() to shutdown Server
-func (s *server) Serve() error {
+func (s *Server) Serve() error {
 	err := s.Server.Serve()
 	if err != nil {
 		return err
@@ -84,8 +85,8 @@ func (s *server) Serve() error {
 	return nil
 }
 
-// handler reads incoming requests and dispatches them
+// Handler reads incoming requests and dispatches them
-func (s *server) handler(w http.ResponseWriter, r *http.Request) {
+func (s *Server) Handler(w http.ResponseWriter, r *http.Request) {
 	if r.Method != "GET" && r.Method != "HEAD" {
 		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
 		return
@@ -104,7 +105,7 @@ func (s *server) handler(w http.ResponseWriter, r *http.Request) {
 }
 
 // serveDir serves a directory index at dirRemote
-func (s *server) serveDir(w http.ResponseWriter, r *http.Request, dirRemote string) {
+func (s *Server) serveDir(w http.ResponseWriter, r *http.Request, dirRemote string) {
 	// List the directory
 	node, err := s.vfs.Stat(dirRemote)
 	if err == vfs.ENOENT {
@@ -135,7 +136,7 @@ func (s *server) serveDir(w http.ResponseWriter, r *http.Request, dirRemote stri
 }
 
 // serveFile serves a file object at remote
-func (s *server) serveFile(w http.ResponseWriter, r *http.Request, remote string) {
+func (s *Server) serveFile(w http.ResponseWriter, r *http.Request, remote string) {
 	node, err := s.vfs.Stat(remote)
 	if err == vfs.ENOENT {
 		fs.Infof(remote, "%s: File not found", r.RemoteAddr)

cmd/serve/http/http_test.go

@@ -19,7 +19,7 @@ import (
 
 var (
 	updateGolden = flag.Bool("updategolden", false, "update golden files for regression test")
-	httpServer   *server
+	httpServer   *Server
 	testURL      string
 )
 
@@ -30,7 +30,7 @@ const (
 func startServer(t *testing.T, f fs.Fs) {
 	opt := httplib.DefaultOpt
 	opt.ListenAddr = testBindAddress
-	httpServer = newServer(f, &opt)
+	httpServer = NewServer(f, &opt)
 	assert.NoError(t, httpServer.Serve())
 	testURL = httpServer.Server.URL()
 

cmd/serve/webdav/webdav.go

@@ -6,8 +6,10 @@ import (
 	"context"
 	"net/http"
 	"os"
+	"strings"
 
 	"github.com/ncw/rclone/cmd"
+	rhttp "github.com/ncw/rclone/cmd/serve/http"
 	"github.com/ncw/rclone/cmd/serve/httplib"
 	"github.com/ncw/rclone/cmd/serve/httplib/httpflags"
 	"github.com/ncw/rclone/fs"
@@ -22,12 +24,14 @@ import (
 var (
 	hashName string
 	hashType = hash.None
+	disableGETDir = false
 )
 
 func init() {
 	httpflags.AddFlags(Command.Flags())
 	vfsflags.AddFlags(Command.Flags())
 	Command.Flags().StringVar(&hashName, "etag-hash", "", "Which hash to use for the ETag, or auto or blank for off")
+	Command.Flags().BoolVar(&disableGETDir, "disable-dir-list", false, "Disable HTML directory list on GET request for a directory")
 }
 
 // Command definition for cobra
@@ -96,8 +100,10 @@ Use "rclone hashsum" to see the full list.
 // overwriting another existing file or directory is an error is OS-dependent.
 type WebDAV struct {
 	*httplib.Server
-	f   fs.Fs
+	f             fs.Fs
-	vfs *vfs.VFS
+	vfs           *vfs.VFS
+	webdavhandler *webdav.Handler
+	httpserver    *rhttp.Server
 }
 
 // check interface
@@ -109,17 +115,27 @@ func newWebDAV(f fs.Fs, opt *httplib.Options) *WebDAV {
 		f:   f,
 		vfs: vfs.New(f, &vfsflags.Opt),
 	}
-
+	webdavHandler := &webdav.Handler{
-	handler := &webdav.Handler{
 		FileSystem: w,
 		LockSystem: webdav.NewMemLS(),
 		Logger:     w.logRequest, // FIXME
 	}
-
+	w.webdavhandler = webdavHandler
-	w.Server = httplib.NewServer(handler, opt)
+	if !disableGETDir {
+		w.httpserver = rhttp.NewServer(f, opt)
+	}
+	w.Server = httplib.NewServer(http.HandlerFunc(w.handler), opt)
 	return w
 }
 
+func (w *WebDAV) handler(rw http.ResponseWriter, r *http.Request) {
+	if !disableGETDir && (r.Method == "GET" || r.Method == "HEAD") && strings.HasSuffix(r.URL.Path, "/") {
+		w.httpserver.Handler(rw, r)
+		return
+	}
+	w.webdavhandler.ServeHTTP(rw, r)
+}
+
 // serve runs the http server in the background.
 //
 // Use s.Close() and s.Wait() to shutdown server