diff --git a/docs/logs.md b/docs/logs.md
index 72dce4ea..b0614530 100644
--- a/docs/logs.md
+++ b/docs/logs.md
@@ -13,7 +13,7 @@ The logs can be divided into the following categories:
- `sender` string. `Upload` or `Download`
- `time` string. Date/time with millisecond precision
- `level` string
- - `local_addr` string. IP/port of the local address the connection arrived on. For example `127.0.0.1:1234`
+ - `local_addr` string. IP/port of the local address the connection arrived on. For FTP protocol this is the address for the control connection. For example `127.0.0.1:1234`
- `remote_addr` string. IP and, optionally, port of the remote client. For example `127.0.0.1:1234` or `127.0.0.1`
- `elapsed_ms`, int64. Elapsed time, as milliseconds, for the upload/download
- `size_bytes`, int64. Size, as bytes, of the download/upload
diff --git a/go.mod b/go.mod
index 160aed9d..61b17a68 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962
github.com/StackExchange/wmi v1.2.0 // indirect
github.com/alexedwards/argon2id v0.0.0-20210511081203-7d35d68092b8
- github.com/aws/aws-sdk-go v1.40.6
+ github.com/aws/aws-sdk-go v1.40.7
github.com/cockroachdb/cockroach-go/v2 v2.1.1
github.com/eikenb/pipeat v0.0.0-20210603033007-44fc3ffce52b
github.com/fatih/color v1.12.0 // indirect
@@ -71,5 +71,5 @@ require (
replace (
github.com/jlaffaye/ftp => github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9
golang.org/x/crypto => github.com/drakkan/crypto v0.0.0-20210515063737-edf1d3b63536
- golang.org/x/net => github.com/drakkan/net v0.0.0-20210615043241-a7f9e02422df
+ golang.org/x/net => github.com/drakkan/net v0.0.0-20210725074420-30b60d4a1e60
)
diff --git a/go.sum b/go.sum
index 3d82dbe3..fe7e8259 100644
--- a/go.sum
+++ b/go.sum
@@ -122,8 +122,8 @@ github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZo
github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
-github.com/aws/aws-sdk-go v1.40.6 h1:JCQfi5MD8cW0PCAzr88hj9tj4BdEJkAy8EyAJ6c8I/k=
-github.com/aws/aws-sdk-go v1.40.6/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
+github.com/aws/aws-sdk-go v1.40.7 h1:dD5+UZxedqHeE4WakJHEhTsEARYlq8kHkYEf89R1tEo=
+github.com/aws/aws-sdk-go v1.40.7/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -183,8 +183,8 @@ github.com/drakkan/crypto v0.0.0-20210515063737-edf1d3b63536 h1:3DJdhj83IA3NjlVz
github.com/drakkan/crypto v0.0.0-20210515063737-edf1d3b63536/go.mod h1:M1JpE4lvRI5LLrE7yTCWfhbsy5rx3oZVjGZad4XMwWc=
github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9 h1:LPH1dEblAOO/LoG7yHPMtBLXhQmjaga91/DDjWk9jWA=
github.com/drakkan/ftp v0.0.0-20201114075148-9b9adce499a9/go.mod h1:2lmrmq866uF2tnje75wQHzmPXhmSWUt7Gyx2vgK1RCU=
-github.com/drakkan/net v0.0.0-20210615043241-a7f9e02422df h1:o8U0zL5q0haPlq9Ce+/7GsXHgsmALoIK/hjQDGKi0Co=
-github.com/drakkan/net v0.0.0-20210615043241-a7f9e02422df/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+github.com/drakkan/net v0.0.0-20210725074420-30b60d4a1e60 h1:qGPbhCgKiOglRLoNPgAwdTOp3xW3TC96RSGLkmVdsd0=
+github.com/drakkan/net v0.0.0-20210725074420-30b60d4a1e60/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
diff --git a/webdavd/webdavd_test.go b/webdavd/webdavd_test.go
index 3b9cef63..3331350e 100644
--- a/webdavd/webdavd_test.go
+++ b/webdavd/webdavd_test.go
@@ -14,6 +14,7 @@ import (
"os/exec"
"path"
"path/filepath"
+ "regexp"
"runtime"
"strings"
"sync"
@@ -652,6 +653,110 @@ func TestBasicHandlingCryptFs(t *testing.T) {
assert.Len(t, common.Connections.GetStats(), 0)
}
+func TestLockAfterDelete(t *testing.T) {
+ u := getTestUser()
+ user, _, err := httpdtest.AddUser(u, http.StatusCreated)
+ assert.NoError(t, err)
+
+ client := getWebDavClient(user, false, nil)
+ assert.NoError(t, checkBasicFunc(client))
+ testFilePath := filepath.Join(homeBasePath, testFileName)
+ testFileSize := int64(65535)
+ err = createTestFile(testFilePath, testFileSize)
+ assert.NoError(t, err)
+ err = uploadFile(testFilePath, testFileName, testFileSize, client)
+ assert.NoError(t, err)
+ lockBody := ``
+ req, err := http.NewRequest("LOCK", fmt.Sprintf("http://%v/%v", webDavServerAddr, testFileName), bytes.NewReader([]byte(lockBody)))
+ assert.NoError(t, err)
+ req.SetBasicAuth(u.Username, u.Password)
+ httpClient := httpclient.GetHTTPClient()
+ resp, err := httpClient.Do(req)
+ assert.NoError(t, err)
+ assert.Equal(t, http.StatusOK, resp.StatusCode)
+ response, err := io.ReadAll(resp.Body)
+ assert.NoError(t, err)
+ re := regexp.MustCompile(`\.*`)
+ lockToken := string(re.Find(response))
+ lockToken = strings.Replace(lockToken, "", "", 1)
+ lockToken = strings.Replace(lockToken, "", "", 1)
+ err = resp.Body.Close()
+ assert.NoError(t, err)
+
+ req, err = http.NewRequest(http.MethodDelete, fmt.Sprintf("http://%v/%v", webDavServerAddr, testFileName), nil)
+ assert.NoError(t, err)
+ req.Header.Set("If", fmt.Sprintf("(%v)", lockToken))
+ req.SetBasicAuth(u.Username, u.Password)
+ resp, err = httpClient.Do(req)
+ assert.NoError(t, err)
+ assert.Equal(t, http.StatusNoContent, resp.StatusCode)
+ err = resp.Body.Close()
+ assert.NoError(t, err)
+ // if we try to lock again it must succeed, the lock must be deleted with the object
+ req, err = http.NewRequest("LOCK", fmt.Sprintf("http://%v/%v", webDavServerAddr, testFileName), bytes.NewReader([]byte(lockBody)))
+ assert.NoError(t, err)
+ req.SetBasicAuth(u.Username, u.Password)
+ resp, err = httpClient.Do(req)
+ assert.NoError(t, err)
+ assert.Equal(t, http.StatusCreated, resp.StatusCode)
+ err = resp.Body.Close()
+ assert.NoError(t, err)
+
+ _, err = httpdtest.RemoveUser(user, http.StatusOK)
+ assert.NoError(t, err)
+ err = os.RemoveAll(user.GetHomeDir())
+ assert.NoError(t, err)
+}
+
+func TestRenameWithLock(t *testing.T) {
+ u := getTestUser()
+ user, _, err := httpdtest.AddUser(u, http.StatusCreated)
+ assert.NoError(t, err)
+
+ client := getWebDavClient(user, false, nil)
+ assert.NoError(t, checkBasicFunc(client))
+ testFilePath := filepath.Join(homeBasePath, testFileName)
+ testFileSize := int64(65535)
+ err = createTestFile(testFilePath, testFileSize)
+ assert.NoError(t, err)
+ err = uploadFile(testFilePath, testFileName, testFileSize, client)
+ assert.NoError(t, err)
+
+ lockBody := ``
+ req, err := http.NewRequest("LOCK", fmt.Sprintf("http://%v/%v", webDavServerAddr, testFileName), bytes.NewReader([]byte(lockBody)))
+ assert.NoError(t, err)
+ req.SetBasicAuth(u.Username, u.Password)
+ httpClient := httpclient.GetHTTPClient()
+ resp, err := httpClient.Do(req)
+ assert.NoError(t, err)
+ assert.Equal(t, http.StatusOK, resp.StatusCode)
+ response, err := io.ReadAll(resp.Body)
+ assert.NoError(t, err)
+ re := regexp.MustCompile(`\.*`)
+ lockToken := string(re.Find(response))
+ lockToken = strings.Replace(lockToken, "", "", 1)
+ lockToken = strings.Replace(lockToken, "", "", 1)
+ err = resp.Body.Close()
+ assert.NoError(t, err)
+ // MOVE with a lock should succeeded
+ req, err = http.NewRequest("MOVE", fmt.Sprintf("http://%v/%v", webDavServerAddr, testFileName), nil)
+ assert.NoError(t, err)
+ req.Header.Set("If", fmt.Sprintf("(%v)", lockToken))
+ req.Header.Set("Overwrite", "T")
+ req.Header.Set("Destination", path.Join("/", testFileName+"1"))
+ req.SetBasicAuth(u.Username, u.Password)
+ resp, err = httpClient.Do(req)
+ assert.NoError(t, err)
+ assert.Equal(t, http.StatusCreated, resp.StatusCode)
+ err = resp.Body.Close()
+ assert.NoError(t, err)
+
+ _, err = httpdtest.RemoveUser(user, http.StatusOK)
+ assert.NoError(t, err)
+ err = os.RemoveAll(user.GetHomeDir())
+ assert.NoError(t, err)
+}
+
func TestPropPatch(t *testing.T) {
u := getTestUser()
u.Username = u.Username + "1"