fix(proxy): [OCISDEV-330] add webdav without trailing slash

Added the `/webdav` endpoint without a trailing slash into the proxy default config.
This makes sure that requests to `/webdav` without a trailing slash are handled
by ocdav service instead of web service.

Author: LukasHirt

changelog/unreleased/fix-add-webdav-without-trailing-slash-into-proxy-default-config.md

@@ -0,0 +1,7 @@
+Bugfix: Add webdav without trailing slash into proxy default config
+
+We've added the `/webdav` endpoint without a trailing slash into the proxy default config.
+
+https://github.com/owncloud/ocis/pull/11677
+https://github.com/owncloud/ocis/issues/10346
+https://github.com/owncloud/ocis/issues/10334

services/proxy/pkg/config/defaults/defaultconfig.go

@@ -217,6 +217,10 @@ func DefaultPolicies() []config.Policy {
 					Endpoint: "/webdav/",
 					Service:  "com.owncloud.web.ocdav",
 				},
+				{
+					Endpoint: "/webdav",
+					Service:  "com.owncloud.web.ocdav",
+				},
 				{
 					Endpoint:    "/status",
 					Service:     "com.owncloud.web.ocdav",

tests/acceptance/expected-failures-without-remotephp.md

@@ -131,72 +131,13 @@
 - [coreApiWebdavOperations/search.feature:153](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavOperations/search.feature#L153)
 - [coreApiWebdavOperations/search.feature:231](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavOperations/search.feature#L231)
 
-#### [Cannot create new TUS upload resource using /webdav without remote.php - returns html instead](https://github.com/owncloud/ocis/issues/10346)
-
-- [apiSpaces/tusUpload.feature:66](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/tusUpload.feature#L66)
-- [apiSpaces/tusUpload.feature:122](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/tusUpload.feature#L122)
-- [coreApiWebdavUploadTUS/creationWithUploadExtension.feature:42](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature#L42)
-- [coreApiWebdavUploadTUS/uploadFile.feature:17](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L17)
-- [coreApiWebdavUploadTUS/uploadFile.feature:18](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L18)
-- [coreApiWebdavUploadTUS/uploadFile.feature:19](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L19)
-- [coreApiWebdavUploadTUS/uploadFile.feature:20](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L20)
-- [coreApiWebdavUploadTUS/uploadFile.feature:21](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L21)
-- [coreApiWebdavUploadTUS/uploadFile.feature:22](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L22)
-- [coreApiWebdavUploadTUS/uploadFile.feature:23](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L23)
-- [coreApiWebdavUploadTUS/uploadFile.feature:48](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L48)
-- [coreApiWebdavUploadTUS/uploadFile.feature:49](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L49)
-- [coreApiWebdavUploadTUS/uploadFile.feature:50](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L50)
-- [coreApiWebdavUploadTUS/uploadFile.feature:51](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L51)
-- [coreApiWebdavUploadTUS/uploadFile.feature:52](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L52)
-- [coreApiWebdavUploadTUS/uploadFile.feature:53](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L53)
-- [coreApiWebdavUploadTUS/uploadFile.feature:54](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L54)
-- [coreApiWebdavUploadTUS/uploadFile.feature:78](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L78)
-- [coreApiWebdavUploadTUS/uploadFile.feature:90](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L90)
-- [coreApiWebdavUploadTUS/uploadFile.feature:103](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L103)
-- [coreApiWebdavUploadTUS/uploadFile.feature:115](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L115)
-- [coreApiWebdavUploadTUS/uploadFile.feature:129](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L129)
-- [coreApiWebdavUploadTUS/uploadFile.feature:141](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L141)
-- [coreApiWebdavUploadTUS/uploadFile.feature:155](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L155)
-- [coreApiWebdavUploadTUS/uploadFile.feature:177](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L177)
-- [coreApiWebdavUploadTUS/uploadFile.feature:200](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L200)
-- [coreApiWebdavUploadTUS/uploadFile.feature:233](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L233)
-- [coreApiWebdavUploadTUS/uploadFile.feature:216](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L216)
-- [coreApiWebdavUploadTUS/uploadFileMtime.feature:17](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L17)
-- [coreApiWebdavUploadTUS/uploadFileMtime.feature:29](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L29)
-- [coreApiWebdavUploadTUS/uploadFileMtime.feature:42](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L42)
-- [coreApiWebdavUploadTUS/uploadFileMtime.feature:55](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L55)
-- [coreApiWebdavUploadTUS/uploadFileMtime.feature:70](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L70)
-- [coreApiWebdavUploadTUS/uploadFileMtimeShares.feature:30](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature#L30)
-- [coreApiWebdavUploadTUS/uploadFileMtimeShares.feature:50](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature#L50)
-- [coreApiWebdavUploadTUS/uploadFileMtimeShares.feature:72](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature#L72)
-- [coreApiWebdavUploadTUS/uploadFileMtimeShares.feature:93](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature#L93)
-- [coreApiWebdavUploadTUS/uploadToMoveFolder.feature:21](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToMoveFolder.feature#L21)
-- [coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature:19](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature#L19)
-- [coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature:36](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature#L36)
-- [coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature:62](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature#L62)
-- [coreApiWebdavUploadTUS/uploadToShare.feature:30](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L30)
-- [coreApiWebdavUploadTUS/uploadToShare.feature:51](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L51)
-- [coreApiWebdavUploadTUS/uploadToShare.feature:74](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L74)
-- [coreApiWebdavUploadTUS/uploadToShare.feature:96](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L96)
-- [coreApiWebdavUploadTUS/uploadToShare.feature:116](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature#L116)
-
-#### [PROPFIND to /webdav root (old dav path) without remote.php returns html instead of xml](https://github.com/owncloud/ocis/issues/10334)
-
-- [coreApiAuth/webDavAuth.feature:15](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiAuth/webDavAuth.feature#L15)
-- [coreApiAuth/webDavAuth.feature:25](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiAuth/webDavAuth.feature#L25)
-- [coreApiShareManagementToShares/moveReceivedShare.feature:49](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature#L49)
-- [coreApiShareManagementToShares/moveReceivedShare.feature:130](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature#L130)
-- [coreApiShareManagementToShares/moveReceivedShare.feature:129](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature#L129)
-- [coreApiWebdavOperations/propfind.feature:25](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavOperations/propfind.feature#L25)
-- [coreApiWebdavOperations/propfind.feature:26](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavOperations/propfind.feature#L26)
-- [coreApiWebdavOperations/propfind.feature:36](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavOperations/propfind.feature#L36)
-
 #### [Trying to create .. resource with /webdav root (old dav path) without remote.php returns html](https://github.com/owncloud/ocis/issues/10339)
 
 - [coreApiWebdavProperties/createFileFolder.feature:176](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L176)
 - [coreApiWebdavProperties/createFileFolder.feature:177](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L177)
 - [coreApiWebdavProperties/createFileFolder.feature:196](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L196)
 - [coreApiWebdavProperties/createFileFolder.feature:197](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavProperties/createFileFolder.feature#L197)
+- [coreApiWebdavUploadTUS/uploadFile.feature:177](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature#L177)
 
 Note: always have an empty line at the end of this file.
 The bash script that processes this file requires that the last line has a newline on the end.

tests/acceptance/features/apiSpaces/tusUpload.feature

@@ -42,7 +42,7 @@ Feature: upload resources using TUS protocol
       | test.txt   |
       | upload.txt |
 
-  @issue-10346
+
   Scenario Outline: upload a zero-byte file inside a shared folder
     Given using <dav-path-version> DAV path
     And user "Brian" has been created with default attributes
@@ -98,7 +98,7 @@ Feature: upload resources using TUS protocol
       | Access-Control-Expose-Headers | Tus-Resumable, Upload-Offset, Location |
     And for user "Alice" the content of the file "textfile.txt" of the space "new-space" should be ""
 
-  @issue-8003 @issue-10346
+  @issue-8003
   Scenario Outline: replace a shared file with zero-byte file
     Given using <dav-path-version> DAV path
     And user "Brian" has been created with default attributes

tests/acceptance/features/coreApiAuth/webDavAuth.feature

@@ -6,7 +6,7 @@ Feature: auth
   Background:
     Given user "Alice" has been created with default attributes
 
-  @smokeTest @issue-10334
+  @smokeTest
   Scenario Outline: using WebDAV anonymously
     When a user requests "<dav-path>" with "PROPFIND" and no authentication
     Then the HTTP status code should be "401"
@@ -16,7 +16,7 @@ Feature: auth
       | /dav/files/%username% |
       | /dav/spaces/%spaceid% |
 
-  @smokeTest @issue-10334
+  @smokeTest
   Scenario Outline: using WebDAV with basic auth
     When user "Alice" requests "<dav-path>" with "PROPFIND" using basic auth
     Then the HTTP status code should be "207"

tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature

@@ -9,7 +9,7 @@ Feature: sharing
       | Brian    |
       | Carol    |
 
-  @issue-8242 @issue-10334
+  @issue-8242
   Scenario Outline: sharer renames the shared item (old/new webdav)
     Given user "Alice" has uploaded file with content "foo" to "sharefile.txt"
     And using <dav-path-version> DAV path
@@ -88,7 +88,7 @@ Feature: sharing
       | dav-path                                 | dav-path-personal     |
       | /dav/spaces/%shares_drive_id%            | /dav/spaces/%spaceid% |
 
-  @issue-8242 @issue-10334 @env-config
+  @issue-8242 @env-config
   Scenario Outline: share receiver renames the shared item (old/new webdav)
     Given user "Alice" has uploaded file with content "foo" to "/sharefile.txt"
     And the administrator has enabled the permissions role "Secure Viewer"

tests/acceptance/features/coreApiWebdavOperations/propfind.feature

@@ -13,7 +13,7 @@ Feature: PROPFIND
       | /dav/files  |
       | /dav/spaces |
 
-  @issue-10334
+
   Scenario Outline: send PROPFIND request to "/dav/(files|spaces)" with depth header
     Given user "Alice" has been created with default attributes
     When user "Alice" requests "<dav-path>" with "PROPFIND" using basic auth and with headers

tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature

@@ -28,7 +28,7 @@ Feature: tests of the creation extension see https://tus.io/protocols/resumable-
       | new              |
       | spaces           |
 
-  @issue-10346
+
   Scenario Outline: creating a new resource and upload data in multiple bytes using creation with upload extension
     Given using <dav-path-version> DAV path
     When user "Alice" creates file "textFile.txt" and uploads content "12345" in the same request using the TUS protocol on the WebDAV API

tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature

@@ -6,7 +6,7 @@ Feature: upload file
   Background:
     Given user "Alice" has been created with default attributes
 
-  @issue-10346
+
   Scenario Outline: upload a file and check download content
     Given using <dav-path-version> DAV path
     When user "Alice" uploads file with content "uploaded content" to "<file-name>" using the TUS protocol on the WebDAV API
@@ -36,7 +36,7 @@ Feature: upload file
       | spaces           | /?fi=le&%#2 . txt |
       | spaces           | /# %ab ab?=ed     |
 
-  @issue-10346
+
   Scenario Outline: upload a file into a folder and check download content
     Given using <dav-path-version> DAV path
     And user "Alice" has created folder "<folder-name>"
@@ -67,7 +67,7 @@ Feature: upload file
       | spaces           | /folder ?2.txt                   | file ?2.txt                   |
       | spaces           | /?fi=le&%#2 . txt                | # %ab ab?=ed                  |
 
-  @issue-10346
+
   Scenario Outline: upload chunked file with TUS
     Given using <dav-path-version> DAV path
     When user "Alice" uploads file with content "uploaded content" in 3 chunks to "/myChunkedFile.txt" using the TUS protocol on the WebDAV API
@@ -79,7 +79,7 @@ Feature: upload file
       | new              |
       | spaces           |
 
-  @issue-10346
+
   Scenario Outline: upload 1 byte chunks with TUS
     Given using <dav-path-version> DAV path
     When user "Alice" uploads file with content "0123456789" in 10 chunks to "/myChunkedFile.txt" using the TUS protocol on the WebDAV API
@@ -91,7 +91,7 @@ Feature: upload file
       | new              |
       | spaces           |
 
-  @issue-10346
+
   Scenario Outline: upload to overwriting a file
     Given using <dav-path-version> DAV path
     And user "Alice" has uploaded file with content "original content" to "textfile.txt"
@@ -104,7 +104,7 @@ Feature: upload file
       | new              |
       | spaces           |
 
-  @issue-10346
+
   Scenario Outline: upload a file and no version is available
     Given using <dav-path-version> DAV path
     When user "Alice" uploads file with content "uploaded content" to "/upload.txt" using the TUS protocol on the WebDAV API
@@ -116,7 +116,7 @@ Feature: upload file
       | new              |
       | spaces           |
 
-  @issue-10346
+
   Scenario Outline: upload a file twice and versions are available
     Given using <dav-path-version> DAV path
     When user "Alice" uploads file with content "uploaded content" to "/upload.txt" using the TUS protocol on the WebDAV API
@@ -130,7 +130,7 @@ Feature: upload file
       | new              |
       | spaces           |
 
-  @issue-10346
+
   Scenario Outline: upload a file in chunks with TUS and no version is available
     Given using <dav-path-version> DAV path
     When user "Alice" uploads file with content "0123456789" in 10 chunks to "/myChunkedFile.txt" using the TUS protocol on the WebDAV API
@@ -142,7 +142,7 @@ Feature: upload file
       | new              |
       | spaces           |
 
-  @issue-10346
+
   Scenario Outline: upload a twice file in chunks with TUS and versions are available
     Given using <dav-path-version> DAV path
     When user "Alice" uploads file with content "0123456789" in 10 chunks to "/myChunkedFile.txt" using the TUS protocol on the WebDAV API
@@ -156,7 +156,7 @@ Feature: upload file
       | new              |
       | spaces           |
 
-  @issue-10334
+
   Scenario Outline: upload a file with invalid-name
     Given using <dav-path-version> DAV path
     When user "Alice" creates a new TUS resource on the WebDAV API with these headers:
@@ -186,7 +186,7 @@ Feature: upload file
       | spaces           | "my\\file"              | bXkMaWxl                     |
       | spaces           | ".."                    | Li4=                         |
 
-  @issue-10346
+
   Scenario Outline: upload a zero-byte file
     Given using <dav-path-version> DAV path
     When user "Alice" uploads file "filesForUpload/zerobyte.txt" to "textfile.txt" using the TUS protocol on the WebDAV API
@@ -201,7 +201,7 @@ Feature: upload file
       | new              |
       | spaces           |
 
-  @issue-8003 @issue-10346
+  @issue-8003
   Scenario Outline: replace a file with zero-byte file
     Given using <dav-path-version> DAV path
     And user "Alice" has uploaded file with content "This is TUS upload" to "textfile.txt"
@@ -217,7 +217,7 @@ Feature: upload file
       | new              |
       | spaces           |
 
-  @issue-8003 @issue-10346
+  @issue-8003
   Scenario Outline: replace a file inside a folder with zero-byte file
     Given using <dav-path-version> DAV path
     And user "Alice" has created folder "testFolder"