start of 'copy to'; more plumbing to support passing modification times through (#438)

cmd/zrok/copyTo.go

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"github.com/openziti/zrok/util/sync"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	copyCmd.AddCommand(newCopyToCommand().cmd)
+}
+
+type copyToCommand struct {
+	cmd *cobra.Command
+}
+
+func newCopyToCommand() *copyToCommand {
+	cmd := &cobra.Command{
+		Use:   "to <share> <source>",
+		Short: "Copy files to a zrok drive from source",
+		Args:  cobra.ExactArgs(2),
+	}
+	command := &copyToCommand{cmd: cmd}
+	cmd.Run = command.run
+	return command
+}
+
+func (cmd *copyToCommand) run(_ *cobra.Command, args []string) {
+	dst, err := sync.NewWebDAVTarget(&sync.WebDAVTargetConfig{
+		URL:      args[0],
+		Username: "",
+		Password: "",
+	})
+	if err != nil {
+		panic(err)
+	}
+	src := sync.NewFilesystemTarget(&sync.FilesystemTargetConfig{
+		Root: args[1],
+	})
+
+	if err := sync.Synchronize(src, dst); err != nil {
+		panic(err)
+	}
+}

endpoints/drive/webdav/file.go

@@ -6,10 +6,9 @@ package webdav
 
 import (
 	"context"
-	"crypto/md5"
+	"crypto/sha512"
 	"encoding/xml"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"io"
 	"io/fs"
 	"net/http"
@@ -66,27 +65,24 @@ type webdavFile struct {
 }
 
 func (f *webdavFile) DeadProps() (map[xml.Name]Property, error) {
-	logrus.Infof("DeadProps(%v)", f.name)
 	var (
 		xmlName       xml.Name
 		property      Property
 		properties    = make(map[xml.Name]Property)
-		checksum, err = f.md5()
+		checksum, err = f.checksum()
 	)
 	if err == nil {
-		xmlName.Space = "http://owncloud.org/ns"
+		xmlName.Space = "zrok:"
-		xmlName.Local = "checksums"
+		xmlName.Local = "checksum"
 		property.XMLName = xmlName
-		property.InnerXML = append(property.InnerXML, "<checksum xmlns=\"http://owncloud.org/ns\">"...)
+		property.InnerXML = []byte(checksum)
-		property.InnerXML = append(property.InnerXML, checksum...)
-		property.InnerXML = append(property.InnerXML, "</checksum>"...)
 		properties[xmlName] = property
 	}
 
 	var stat fs.FileInfo
 	stat, err = f.Stat()
 	if err == nil {
-		xmlName.Space = "DAV:"
+		xmlName.Space = "zrok:"
 		xmlName.Local = "lastmodified"
 		property.XMLName = xmlName
 		property.InnerXML = strconv.AppendInt(nil, stat.ModTime().Unix(), 10)
@@ -102,19 +98,17 @@ func (f *webdavFile) Patch(proppatches []Proppatch) ([]Propstat, error) {
 	return []Propstat{stat}, nil
 }
 
-func (f *webdavFile) md5() (string, error) {
+func (f *webdavFile) checksum() (string, error) {
 	file, err := os.Open(f.name)
 	if err != nil {
 		return "", err
 	}
 	defer file.Close()
-	hash := md5.New()
+	hash := sha512.New()
 	if _, err := io.Copy(hash, file); err != nil {
 		return "", err
 	}
-	xhash := fmt.Sprintf("%x", hash.Sum(nil))
+	return fmt.Sprintf("%x", hash.Sum(nil)), nil
-	logrus.Infof("hashed %v = %v", f.name, xhash)
-	return xhash, nil
 }
 
 // A Dir implements FileSystem using the native file system restricted to a

endpoints/drive/webdav/webdav.go

@@ -8,6 +8,7 @@ package webdav // import "golang.org/x/net/webdav"
 import (
 	"errors"
 	"fmt"
+	"github.com/sirupsen/logrus"
 	"io"
 	"net/http"
 	"net/url"
@@ -287,6 +288,10 @@ func (h *Handler) handlePut(w http.ResponseWriter, r *http.Request) (status int,
 		return http.StatusInternalServerError, err
 	}
 	w.Header().Set("ETag", etag)
+	ts := r.Header.Get("zrok-timestamp")
+	if ts != "" {
+		logrus.Infof("zrok-timestamp = %v", ts)
+	}
 	return http.StatusCreated, nil
 }
 

util/sync/filesystem.go

@@ -61,7 +61,7 @@ func (t *FilesystemTarget) recurse(path string, d fs.DirEntry, err error) error
 }
 
 func (t *FilesystemTarget) ReadStream(path string) (io.ReadCloser, error) {
-	return os.Open(path)
+	return os.Open(filepath.Join(t.cfg.Root, path))
 }
 
 func (t *FilesystemTarget) WriteStream(path string, stream io.Reader, mode os.FileMode) error {

util/sync/webdav.go

@@ -1,6 +1,7 @@
 package sync
 
 import (
+	"fmt"
 	"github.com/openziti/zrok/util/sync/webdavClient"
 	"github.com/pkg/errors"
 	"io"
@@ -66,6 +67,7 @@ func (t *WebDAVTarget) ReadStream(path string) (io.ReadCloser, error) {
 }
 
 func (t *WebDAVTarget) WriteStream(path string, stream io.Reader, mode os.FileMode) error {
+	t.c.SetHeader("zrok-timestamp", fmt.Sprintf("%d", time.Now().UnixNano()))
 	return t.c.WriteStream(path, stream, mode)
 }
 

util/sync/webdavClient/client.go

@@ -47,7 +47,7 @@ func NewAuthClient(uri string, auth Authorizer) *Client {
 
 // SetHeader lets us set arbitrary headers for a given client
 func (c *Client) SetHeader(key, value string) {
-	c.headers.Add(key, value)
+	c.headers.Set(key, value)
 }
 
 // SetInterceptor lets us set an arbitrary interceptor for a given client
@@ -417,7 +417,6 @@ func (c *Client) Write(path string, data []byte, _ os.FileMode) (err error) {
 
 // WriteStream writes a stream
 func (c *Client) WriteStream(path string, stream io.Reader, _ os.FileMode) (err error) {
-
 	err = c.createParentCollection(path)
 	if err != nil {
 		return err