Correctly append slash to HTTP store paths as per #112

remotehttp.go

@@ -37,9 +37,8 @@ func NewRemoteHTTPStoreBase(location *url.URL, opt StoreOptions) (*RemoteHTTPBas
 		return nil, fmt.Errorf("unsupported scheme %s, expected http or https", location.Scheme)
 	}
 	// Make sure we have a trailing / on the path
-	u := *location
-	if !strings.HasSuffix(u.Path, "/") {
-		u.Path = u.Path + "/"
+	if !strings.HasSuffix(location.Path, "/") {
+		location.Path = location.Path + "/"
 	}
 
 	// Build a TLS client config

remotehttp_test.go

@@ -0,0 +1,42 @@
+package desync
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"testing"
+)
+
+func TestHTTPStoreURL(t *testing.T) {
+	var requestURI string
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		requestURI = r.RequestURI
+	}))
+	defer ts.Close()
+	u, _ := url.Parse(ts.URL)
+
+	chunkID := ChunkID{1, 2, 3, 4}
+	tests := map[string]struct {
+		storePath  string
+		serverPath string
+	}{
+		"no path":             {"", "/0102/0102030400000000000000000000000000000000000000000000000000000000.cacnk"},
+		"slash only":          {"/", "/0102/0102030400000000000000000000000000000000000000000000000000000000.cacnk"},
+		"no trailing slash":   {"/path", "/path/0102/0102030400000000000000000000000000000000000000000000000000000000.cacnk"},
+		"with trailing slash": {"/path/", "/path/0102/0102030400000000000000000000000000000000000000000000000000000000.cacnk"},
+		"long path":           {"/path1/path2", "/path1/path2/0102/0102030400000000000000000000000000000000000000000000000000000000.cacnk"},
+	}
+	for name, test := range tests {
+		t.Run(name, func(t *testing.T) {
+			u.Path = test.storePath
+			s, err := NewRemoteHTTPStore(u, StoreOptions{})
+			if err != nil {
+				t.Fatal(err)
+			}
+			s.GetChunk(chunkID)
+			if requestURI != test.serverPath {
+				t.Fatalf("got request uri '%s', want '%s'", requestURI, test.serverPath)
+			}
+		})
+	}
+}