First time working

Author: AlexSnet

davoop/filesystem.go

@@ -1,7 +1,6 @@
 package davoop
 
 import (
-	"log"
 	"os"
 	"path"
 	"path/filepath"
@@ -41,7 +40,7 @@ func (d HDFSDir) sanitizePath(name string) (string, error) {
 	}
 	dir = filepath.Join(dir, filepath.FromSlash(path.Clean("/"+name)))
 
-	log.Println(name, " -> ", dir)
+	// log.Println(name, " -> ", dir)
 
 	return dir, nil
 }

main.go

@@ -1,2 +1,48 @@
 package main
 
+import (
+	"log"
+	"net/http"
+
+	"fmt"
+
+	"github.com/codeteam/davoop/davoop"
+	"github.com/codeteam/davoop/webdav"
+	"github.com/kelseyhightower/envconfig"
+)
+
+type Configuration struct {
+	NameNode string
+	User     string
+	Path     string `default:"/"`
+
+	Addr string `default:":8080"`
+
+	Listing  bool `default:"true"`
+	ReadOnly bool `default:"false"`
+}
+
+func main() {
+	var s Configuration
+	err := envconfig.Process("davoop", &s)
+	if err != nil {
+		log.Fatal(err.Error())
+	}
+
+	fmt.Println(s)
+
+	fs, err := davoop.NewHDFSDir(s.NameNode, s.User, s.Path)
+	if err != nil {
+		panic(err)
+	}
+
+	http.Handle("/", &webdav.Server{
+		Fs:         fs,
+		TrimPrefix: "/",
+		Listings:   s.Listing,
+		ReadOnly:   s.ReadOnly,
+	})
+
+	// log.Println("Listening on http://127.0.0.1:8080")
+	log.Fatal(http.ListenAndServe(s.Addr, nil))
+}

webdav/server.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"math/rand"
 	"mime"
 	"net/http"
@@ -107,7 +108,7 @@ func IsPushMethod(method string) bool {
 }
 
 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	//log.Println("DAV:", r.RemoteAddr, r.Method, r.URL)
+	log.Println("DAV:", r.RemoteAddr, r.Method, r.URL)
 
 	switch r.Method {
 	case "OPTIONS":
@@ -314,6 +315,10 @@ func (s *Server) doPropfind(w http.ResponseWriter, r *http.Request) {
 	}
 
 	depth := r.Header.Get("Depth")
+	if depth == "" {
+		depth = "1"
+	}
+
 	switch depth {
 	case "0", "1":
 	case "", "infinity":
@@ -399,7 +404,8 @@ func (s *Server) doPropfind(w http.ResponseWriter, r *http.Request) {
 	buf.WriteString(`<multistatus xmlns='DAV:'>`)
 
 	// TODO: https?
-	abs := "http://" + r.Host + s.TrimPrefix
+	// abs := "http://" + r.Host + s.TrimPrefix
+	abs := ""
 
 	for _, p := range paths {
 		// TODO
@@ -414,7 +420,7 @@ func (s *Server) doPropfind(w http.ResponseWriter, r *http.Request) {
 		fi, _ := f.Stat()
 
 		buf.WriteString(`<response>`)
-		buf.WriteString(`<href>` + abs + "/" + p + `</href>`)
+		buf.WriteString(`<href>` + filepath.Join(abs, p) + `</href>`)
 		buf.WriteString(`<propstat>`)
 		{
 			buf.WriteString(`<prop>`)