Webdav returns all checksums + integration tests

owncloud · Mar 15, 2017 · 014530b · 014530b
1 parent d3dd0c8
commit 014530b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -340,7 +340,7 @@ public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node)
 			});
 
 			$propFind->handle(self::CHECKSUMS_PROPERTYNAME, function() use ($node) {
-				$checksum = $node->getChecksum('sha1');
+				$checksum = $node->getChecksum();
 				if ($checksum === NULL || $checksum === '') {
 					return null;
 				}

diff --git a/tests/integration/features/checksums.feature b/tests/integration/features/checksums.feature
@@ -11,7 +11,7 @@ Feature: checksums
     And user "user0" exists
     And user "user0" uploads file "data/textfile.txt" to "/myChecksumFile.txt" with checksum "MD5:d70b40f177b14b470d1756a3c12b963a"
     When user "user0" request the checksum of "/myChecksumFile.txt" via propfind
-    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f"
+    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f MD5:d70b40f177b14b470d1756a3c12b963a ADLER32:8ae90960"
 
   Scenario: Uploading a file with checksum should return the checksum in the download header
     Given using old dav path
@@ -26,7 +26,7 @@ Feature: checksums
     And user "user0" uploads file "data/textfile.txt" to "/myChecksumFile.txt" with checksum "MD5:d70b40f177b14b470d1756a3c12b963a"
     When User "user0" moves file "/myChecksumFile.txt" to "/myMovedChecksumFile.txt"
     And user "user0" request the checksum of "/myMovedChecksumFile.txt" via propfind
-    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f"
+    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f MD5:d70b40f177b14b470d1756a3c12b963a ADLER32:8ae90960"
 
   Scenario: Moving file with checksum should return the checksum in the download header
     Given using old dav path
@@ -43,7 +43,7 @@ Feature: checksums
     And user "user0" uploads chunk file "2" of "3" with "BBBBB" to "/myChecksumFile.txt" with checksum "MD5:45a72715acdd5019c5be30bdbb75233e"
     And user "user0" uploads chunk file "3" of "3" with "CCCCC" to "/myChecksumFile.txt" with checksum "MD5:45a72715acdd5019c5be30bdbb75233e"
     When user "user0" request the checksum of "/myChecksumFile.txt" via propfind
-    Then The webdav checksum should match "SHA1:acfa6b1565f9710d4d497c6035d5c069bd35a8e8"
+    Then The webdav checksum should match "SHA1:acfa6b1565f9710d4d497c6035d5c069bd35a8e8 MD5:45a72715acdd5019c5be30bdbb75233e ADLER32:1ecd03df"
 
   Scenario: Uploading a chunked file with checksum should return the checksum in the download header
     Given using old dav path
@@ -73,7 +73,7 @@ Feature: checksums
     And user "user0" exists
     And user "user0" uploads file "data/textfile.txt" to "/myChecksumFile.txt" with checksum "MD5:d70b40f177b14b470d1756a3c12b963a"
     When user "user0" request the checksum of "/myChecksumFile.txt" via propfind
-    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f"
+    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f MD5:d70b40f177b14b470d1756a3c12b963a ADLER32:8ae90960"
 
   Scenario: Uploading a file with checksum should return the checksum in the download header using new dav path
     Given using new dav path
@@ -88,7 +88,7 @@ Feature: checksums
     And user "user0" uploads file "data/textfile.txt" to "/myChecksumFile.txt" with checksum "MD5:d70b40f177b14b470d1756a3c12b963a"
     When User "user0" moved file "/myChecksumFile.txt" to "/myMovedChecksumFile.txt"
     And user "user0" request the checksum of "/myMovedChecksumFile.txt" via propfind
-    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f"
+    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f MD5:d70b40f177b14b470d1756a3c12b963a ADLER32:8ae90960"
 
   Scenario: Moving file with checksum should return the checksum in the download header using new dav path
     Given using new dav path
@@ -104,7 +104,7 @@ Feature: checksums
     And user "user0" uploads file "data/textfile.txt" to "/myChecksumFile.txt" with checksum "MD5:d70b40f177b14b470d1756a3c12b963a"
     When User "user0" copies file "/myChecksumFile.txt" to "/myChecksumFileCopy.txt"
     And user "user0" request the checksum of "/myChecksumFileCopy.txt" via propfind
-    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f"
+    Then The webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f MD5:d70b40f177b14b470d1756a3c12b963a ADLER32:8ae90960"
 
   Scenario: Copying file with checksum should return the checksum in the download header using new dav path
     Given using new dav path
@@ -121,7 +121,7 @@ Feature: checksums
     And user "user0" uploads chunk file "2" of "3" with "BBBBB" to "/myChecksumFile.txt" with checksum "MD5:45a72715acdd5019c5be30bdbb75233e"
     And user "user0" uploads chunk file "3" of "3" with "CCCCC" to "/myChecksumFile.txt" with checksum "MD5:45a72715acdd5019c5be30bdbb75233e"
     When user "user0" request the checksum of "/myChecksumFile.txt" via propfind
-    Then The webdav checksum should match "SHA1:acfa6b1565f9710d4d497c6035d5c069bd35a8e8"
+    Then The webdav checksum should match "SHA1:acfa6b1565f9710d4d497c6035d5c069bd35a8e8 MD5:45a72715acdd5019c5be30bdbb75233e ADLER32:1ecd03df"
 
   Scenario: Uploading a chunked file with checksum should return the checksum in the download header using new dav path
     Given using new dav path