From 2c0f3fa4bb38b4c87f7bbb733e63d63159e85198 Mon Sep 17 00:00:00 2001 From: Gentle <5901220123@xcu.edu.cn> Date: Fri, 30 Oct 2026 12:52:56 +0900 Subject: [PATCH] fix(webdav): handle percent-encoding case in DAV hrefs Compare DAV base paths literally after normalizing percent-encoded hex digits. Preserve the original relative path and reject missing or empty bases explicitly. Fixes nextcloud/android-library#2190 Assisted-by: Codex:GPT-6 Signed-off-by: Gentle <5901220123@xcu.edu.cn> --- .../lib/common/network/WebdavEntryIT.kt | 28 ++++++ .../android/lib/common/network/WebdavEntry.kt | 13 ++- .../lib/common/network/WebdavEntryTest.kt | 93 ++++++++++++++++++- 3 files changed, 129 insertions(+), 5 deletions(-) create mode 100644 library/src/androidTest/java/com/owncloud/android/lib/common/network/WebdavEntryIT.kt diff --git a/library/src/androidTest/java/com/owncloud/android/lib/common/network/WebdavEntryIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/common/network/WebdavEntryIT.kt new file mode 100644 index 0000000000..588b8cc8f8 --- /dev/null +++ b/library/src/androidTest/java/com/owncloud/android/lib/common/network/WebdavEntryIT.kt @@ -0,0 +1,28 @@ +/* + * Nextcloud Android Library + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: MIT + */ +package com.owncloud.android.lib.common.network + +import com.owncloud.android.AbstractIT +import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation +import com.owncloud.android.lib.resources.files.ReadFolderRemoteOperation +import org.junit.Assert.assertTrue +import org.junit.Test + +class WebdavEntryIT : AbstractIT() { + @Test + fun testRootMetadataAndListing() { + val metadata = ReadFileRemoteOperation(ROOT_PATH).execute(client) + assertTrue("Root metadata request failed", metadata.isSuccess) + + val listing = ReadFolderRemoteOperation(ROOT_PATH).execute(client) + assertTrue("Root listing request failed", listing.isSuccess) + } + + companion object { + private const val ROOT_PATH = "/" + } +} diff --git a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt index 45178b9ed2..c0a75894e6 100644 --- a/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt +++ b/library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt @@ -114,8 +114,11 @@ class WebdavEntry constructor( val ncNamespace = Namespace.getNamespace(NAMESPACE_NC) if (ms.status.isNotEmpty()) { uri = ms.href - path = - uri!!.split(splitElement.toRegex(), limit = 2).toTypedArray()[1].replace("//", "/") + val normalizedUri = normalizePercentEncoding(uri!!) + val normalizedBase = normalizePercentEncoding(splitElement) + val baseIndex = normalizedUri.indexOf(normalizedBase) + require(normalizedBase.isNotEmpty() && baseIndex >= 0) { "DAV href does not contain the base path" } + path = uri!!.substring(baseIndex + splitElement.length).replace("//", "/") var status = ms.status[0].statusCode if (status == CODE_PROP_NOT_FOUND && ms.status.size > 1) { status = ms.status[1].statusCode @@ -633,6 +636,12 @@ class WebdavEntry constructor( } companion object { + private val PERCENT_ENCODED_BYTE = Regex("%[0-9a-fA-F]{2}") + + // Only hexadecimal digits in escapes are case-insensitive (RFC 3986, section 6.2.2.1). + private fun normalizePercentEncoding(value: String): String = + PERCENT_ENCODED_BYTE.replace(value) { it.value.uppercase() } + private val TAG = WebdavEntry::class.java.simpleName const val NAMESPACE_OC = "http://owncloud.org/ns" const val NAMESPACE_NC = "http://nextcloud.org/ns" diff --git a/library/src/test/java/com/owncloud/android/lib/common/network/WebdavEntryTest.kt b/library/src/test/java/com/owncloud/android/lib/common/network/WebdavEntryTest.kt index 59bf5f8818..64ad637fc6 100644 --- a/library/src/test/java/com/owncloud/android/lib/common/network/WebdavEntryTest.kt +++ b/library/src/test/java/com/owncloud/android/lib/common/network/WebdavEntryTest.kt @@ -12,12 +12,97 @@ import com.owncloud.android.lib.resources.files.model.FileLockType import org.apache.jackrabbit.webdav.MultiStatus import org.apache.jackrabbit.webdav.xml.DomUtil import org.junit.Assert.assertEquals +import org.junit.Assert.assertThrows import org.junit.Assert.assertTrue import org.junit.Test import org.w3c.dom.Element import java.io.ByteArrayInputStream class WebdavEntryTest { + @Test + fun testPercentEncodingHexCaseInBasePath() { + val upperBase = "/remote.php/dav/files/%E6%B5%8B%E8%AF%95/" + val lowerBase = "/remote.php/dav/files/%e6%b5%8b%e8%af%95/" + val mixedBase = "/remote.php/dav/files/%e6%B5%8b%E8%aF%95/" + + for (base in listOf(upperBase, lowerBase, mixedBase)) { + for (hrefBase in listOf(upperBase, lowerBase, mixedBase)) { + assertEquals("", entryWithHref(hrefBase, base).path) + assertEquals("Photo.JPG", entryWithHref(hrefBase + "Photo.JPG", base).path) + } + } + } + + @Test + fun testLiteralBasePathWithRegexMetacharacters() { + val base = "/remote.php/dav/files/test[1]+(work)/" + assertEquals("test.md", entryWithHref(base + "test.md", base).path) + } + + @Test + fun testPreservesEncodedRelativePath() { + val base = "/remote.php/dav/files/%E6%B5%8B/" + val relativePath = "Photo%2fName%25+%e6%b5%8b.JPG" + assertEquals(relativePath, entryWithHref(base.lowercase() + relativePath, base).path) + } + + @Test + fun testAbsoluteHref() { + val base = "/remote.php/dav/files/%E6%B5%8B/" + assertEquals("test.md", entryWithHref("https://example.org" + base.lowercase() + "test.md", base).path) + } + + @Test + fun testRootWithoutTrailingBaseSeparator() { + val base = "/remote.php/dav/files/%E6%B5%8B" + assertEquals("/", entryWithHref(base.lowercase() + "/", base).path) + } + + @Test + fun testLegacyWebdavAndUploadPaths() { + assertEquals("test.md", entryWithHref("/remote.php/webdav/test.md", "/remote.php/webdav/").path) + assertEquals( + "uploads/test/test.md", + entryWithHref("/remote.php/dav/uploads/test//test.md", "/remote.php/dav/").path + ) + } + + @Test + fun testRejectsDifferentPathCase() { + assertThrows(IllegalArgumentException::class.java) { + entryWithHref("/remote.php/dav/files/Test/test.md", "/remote.php/dav/files/test/") + } + } + + @Test + fun testDoesNotDecodeEncodedSeparators() { + assertThrows(IllegalArgumentException::class.java) { + entryWithHref("/remote.php/dav/files/test%2Fother/test.md", "/remote.php/dav/files/test/other/") + } + assertThrows(IllegalArgumentException::class.java) { + entryWithHref("/remote.php/dav/files/test%252f/test.md", "/remote.php/dav/files/test%252F/") + } + } + + @Test + fun testRejectsEmptyBasePath() { + assertThrows(IllegalArgumentException::class.java) { + entryWithHref("/remote.php/dav/files/test/test.md", "") + } + } + + @Test + fun testRejectsRegexWildcardMatch() { + assertThrows(IllegalArgumentException::class.java) { + entryWithHref("/remoteXphp/dav/files/test/test.md", "/remote.php/dav/files/test/") + } + } + + private fun entryWithHref( + href: String, + base: String + ): WebdavEntry = WebdavEntry(getMultiStatus(href).responses[0], base) + companion object { private const val EXAMPLE_MULTI_STATUS = """ @@ -67,15 +152,17 @@ class WebdavEntryTest { """ - private fun getElement(): Element { + private fun getElement(href: String): Element { + val xml = EXAMPLE_MULTI_STATUS.replace("/remote.php/dav/files/test/test.md", href) val document = DomUtil.parseDocument( - ByteArrayInputStream(EXAMPLE_MULTI_STATUS.toByteArray()) + ByteArrayInputStream(xml.toByteArray()) ) return document.documentElement } - private fun getMultiStatus(): MultiStatus = MultiStatus.createFromXml(getElement()) + private fun getMultiStatus(href: String = "/remote.php/dav/files/test/test.md"): MultiStatus = + MultiStatus.createFromXml(getElement(href)) } @Test