Skip to content

"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files

serve dlna: log unescaped paths - fixes #7370

phatlc556940ea4417
diff --git a/cmd/serve/dlna/dlna_util.go b/cmd/serve/dlna/dlna_util.go
index 92b1fd4c4..1e2829ae7 100644
--- a/cmd/serve/dlna/dlna_util.go
+++ b/cmd/serve/dlna/dlna_util.go
@@ -153,7 +153,7 @@ func (lrw *loggingResponseWriter) logRequest(code int, err any) {
err = ""
}
- fs.LogLevelPrintf(level, lrw.request.URL, "%s %s %d %s %s",
+ fs.LogLevelPrintf(level, lrw.request.URL.Path, "%s %s %d %s %s",
lrw.request.RemoteAddr, lrw.request.Method, code,
lrw.request.Header.Get("SOAPACTION"), err)
}
diff --git a/cmd/serve/dlna/dlna_util_test.go b/cmd/serve/dlna/dlna_util_test.go
index 836b1eb3d..21fb7062f 100644
--- a/cmd/serve/dlna/dlna_util_test.go
+++ b/cmd/serve/dlna/dlna_util_test.go
@@ -1,8 +1,11 @@
package dlna
import (
+ "net/http"
+ "net/http/httptest"
"testing"
+ "github.com/rclone/rclone/cmd/bisync/bilib"
"github.com/stretchr/testify/assert"
)
@@ -46,3 +49,13 @@ func TestAdjustXML(t *testing.T) {
})
}
}
+
+func TestLoggingUnescapedPath(t *testing.T) {
+ handler := logging(http.NotFoundHandler())
+ req := httptest.NewRequest("GET", "/r/%D0%91%D0%B0%D1%80%D0%B4%D1%8B/file%20name.mp3", nil)
+ logged := bilib.CaptureOutput(func() {
+ handler.ServeHTTP(httptest.NewRecorder(), req)
+ })
+
+ assert.Contains(t, string(logged), "ERROR : /r/Барды/file name.mp3: ")
+}