diff --git a/.woodpecker.star b/.woodpecker.star index 434de2d95..d93803244 100644 --- a/.woodpecker.star +++ b/.woodpecker.star @@ -188,7 +188,7 @@ config = { "skip": True, }, "accountsHashDifficulty": { - "skip": True, + "skip": False, "suites": [ "apiAccountsHashDifficulty", ], @@ -218,14 +218,14 @@ config = { "suites": [ "apiAntivirus", ], - "skip": True, + "skip": False, "antivirusNeeded": True, "extraServerEnvironment": { "ANTIVIRUS_SCANNER_TYPE": "clamav", "ANTIVIRUS_CLAMAV_SOCKET": "tcp://clamav:3310", "POSTPROCESSING_STEPS": "virusscan", - "OCIS_ASYNC_UPLOADS": True, - "OCIS_ADD_RUN_SERVICES": "antivirus", + "OC_ASYNC_UPLOADS": True, + "OC_ADD_RUN_SERVICES": "antivirus", "ANTIVIRUS_DEBUG_ADDR": "0.0.0.0:9297", }, }, @@ -233,7 +233,7 @@ config = { "suites": [ "apiSearchContent", ], - "skip": True, + "skip": False, "tikaNeeded": True, }, "ocm": { @@ -276,10 +276,10 @@ config = { "suites": [ "apiAuthApp", ], - "skip": True, + "skip": False, "withRemotePhp": [True], "extraServerEnvironment": { - "OCIS_ADD_RUN_SERVICES": "auth-app", + "OC_ADD_RUN_SERVICES": "auth-app", "PROXY_ENABLE_APP_AUTH": True, }, }, @@ -293,8 +293,8 @@ config = { "extraServerEnvironment": { "ANTIVIRUS_SCANNER_TYPE": "clamav", "ANTIVIRUS_CLAMAV_SOCKET": "tcp://clamav:3310", - "OCIS_ASYNC_UPLOADS": True, - "OCIS_ADD_RUN_SERVICES": "antivirus", + "OC_ASYNC_UPLOADS": True, + "OC_ADD_RUN_SERVICES": "antivirus", }, }, }, @@ -950,7 +950,6 @@ def localApiTests(ctx, name, suites, storage = "decomposed", extra_environment = environment = { "TEST_SERVER_URL": OC_URL, "TEST_SERVER_FED_URL": OC_FED_URL, - "OCIS_REVA_DATA_ROOT": "%s" % (dirs["ocisRevaDataRoot"] if storage == "owncloud" else ""), "SEND_SCENARIO_LINE_REFERENCES": True, "STORAGE_DRIVER": storage, "BEHAT_SUITES": ",".join(suites), @@ -2861,7 +2860,6 @@ def wopiCollaborationService(name): def tikaService(): return [{ "name": "tika", - "type": "docker", "image": APACHE_TIKA, "detach": True, }, { diff --git a/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md b/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md index 3ed19e458..6a1e3fecb 100644 --- a/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md +++ b/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md @@ -196,6 +196,9 @@ - [apiAntivirus/antivirus.feature:309](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L309) - [apiAntivirus/antivirus.feature:310](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L310) - [apiAntivirus/antivirus.feature:311](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L311) +- [apiAntivirus/antivirus.feature:312](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L312) +- [apiAntivirus/antivirus.feature:313](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L313) +- [apiAntivirus/antivirus.feature:314](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L314) - [apiNotification/deprovisioningNotification.feature:127](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiNotification/deprovisioningNotification.feature#L127) - [apiNotification/notification.feature:284](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiNotification/notification.feature#L284) - [apiNotification/notification.feature:285](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiNotification/notification.feature#L285) @@ -212,6 +215,27 @@ - [apiSearch1/search.feature:466](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSearch1/search.feature#L466) - [apiSearch1/search.feature:467](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiSearch1/search.feature#L467) +#### [No notification triggered for .zip virus file](https://github.com/opencloud-eu/opencloud/issues/382) +- [apiAntivirus/antivirus.feature:41](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L41) +- [apiAntivirus/antivirus.feature:43](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L43) +- [apiAntivirus/antivirus.feature:45](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L45) +- [apiAntivirus/antivirus.feature:69](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L69) +- [apiAntivirus/antivirus.feature:71](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L71) +- [apiAntivirus/antivirus.feature:73](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L73) +- [apiAntivirus/antivirus.feature:115](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L115) +- [apiAntivirus/antivirus.feature:117](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L117) +- [apiAntivirus/antivirus.feature:119](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L119) +- [apiAntivirus/antivirus.feature:141](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L141) +- [apiAntivirus/antivirus.feature:143](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L143) +- [apiAntivirus/antivirus.feature:145](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L145) +- [apiAntivirus/antivirus.feature:169](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L169) +- [apiAntivirus/antivirus.feature:171](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L171) +- [apiAntivirus/antivirus.feature:173](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L173) +- [apiAntivirus/antivirus.feature:199](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L199) +- [apiAntivirus/antivirus.feature:201](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L201) +- [apiAntivirus/antivirus.feature:203](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L203) +- [apiAntivirus/antivirus.feature:228](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L228) +- [apiAntivirus/antivirus.feature:253](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiAntivirus/antivirus.feature#L253) 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. diff --git a/tests/acceptance/features/apiAntivirus/antivirus.feature b/tests/acceptance/features/apiAntivirus/antivirus.feature index 30684ead2..b78e469af 100644 --- a/tests/acceptance/features/apiAntivirus/antivirus.feature +++ b/tests/acceptance/features/apiAntivirus/antivirus.feature @@ -33,7 +33,7 @@ Feature: antivirus Then the HTTP status code should be "201" And user "Alice" should get a notification with subject "Virus found" and message: | message | - | Virus found in . Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in . Upload not possible. Virus: Eicar-Signature | And as "Alice" file "" should not exist Examples: | dav-path-version | file-name | new-file-name | @@ -54,7 +54,7 @@ Feature: antivirus And the HTTP status code should be "201" And user "Alice" should get a notification with subject "Virus found" and message: | message | - | Virus found in . Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in . Upload not possible. Virus: Eicar-Signature | And as "Alice" file "" should not exist But as "Alice" file "/normalfile.txt" should exist And the content of file "/normalfile.txt" for user "Alice" should be: @@ -107,7 +107,7 @@ Feature: antivirus Then the HTTP status code should be "201" And user "Alice" should get a notification with subject "Virus found" and message: | message | - | Virus found in . Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in . Upload not possible. Virus: Eicar-Signature | And as "Alice" file "/uploadFolder/" should not exist Examples: | dav-path-version | file-name | new-file-name | @@ -133,7 +133,7 @@ Feature: antivirus Then the HTTP status code should be "201" And user "Alice" should get a notification with subject "Virus found" and message: | message | - | Virus found in . Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in . Upload not possible. Virus: Eicar-Signature | And as "Alice" file "/uploadFolder/" should not exist Examples: | dav-path-version | file-name | new-file-name | @@ -160,7 +160,7 @@ Feature: antivirus Then the HTTP status code should be "201" And user "Brian" should get a notification with subject "Virus found" and message: | message | - | Virus found in . Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in . Upload not possible. Virus: Eicar-Signature | And as "Brian" file "/Shares/uploadFolder/" should not exist And as "Alice" file "/uploadFolder/" should not exist Examples: @@ -190,7 +190,7 @@ Feature: antivirus Then the HTTP status code should be "201" And user "Brian" should get a notification with subject "Virus found" and message: | message | - | Virus found in . Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in . Upload not possible. Virus: Eicar-Signature | And as "Brian" file "/Shares/uploadFolder/" should not exist And as "Alice" file "/uploadFolder/" should not exist Examples: @@ -212,14 +212,14 @@ Feature: antivirus Then the HTTP status code should be "201" And user "Alice" should get a notification for resource "" with subject "Virus found" and message: | message | - | Virus found in . Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in . Upload not possible. Virus: Eicar-Signature | And for user "Alice" folder "uploadFolder" of the space "new-space" should not contain these entries: | | When user "Alice" uploads a file "filesForUpload/filesWithVirus/" to "/" in space "new-space" using the WebDAV API Then the HTTP status code should be "201" And user "Alice" should get a notification for resource "" with subject "Virus found" and message: | message | - | Virus found in . Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in . Upload not possible. Virus: Eicar-Signature | And for user "Alice" the space "new-space" should not contain these entries: | / | Examples: @@ -242,7 +242,7 @@ Feature: antivirus Then the HTTP status code should be "201" And user "Brian" should get a notification with subject "Virus found" and message: | message | - | Virus found in . Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in . Upload not possible. Virus: Eicar-Signature | And for user "Brian" the space "new-space" should not contain these entries: | / | And for user "Alice" the space "new-space" should not contain these entries: @@ -273,7 +273,7 @@ Feature: antivirus Then the HTTP status code should be "201" And user "Alice" should get a notification with subject "Virus found" and message: | message | - | Virus found in aFileWithVirus.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | Virus found in aFileWithVirus.txt. Upload not possible. Virus: Eicar-Signature | And as "Alice" file "/aFileWithVirus.txt" should not exist Examples: | dav-path-version | @@ -294,7 +294,7 @@ Feature: antivirus | new | | spaces | - @issue-enterprise-5706 @issue-183 + @issue-enterprise-5706 @issue-183 @issue-369 Scenario Outline: upload a file with virus and get notification in different languages Given user "Alice" has switched the system language to "" using the Graph API And using DAV path @@ -305,13 +305,13 @@ Feature: antivirus | | And as "Alice" file "/aFileWithVirus.txt" should not exist Examples: - | dav-path-version | language | subject | message | - | old | es | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus: Win.Test.EICAR_HDB-1 | - | new | es | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus: Win.Test.EICAR_HDB-1 | - | spaces | es | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus: Win.Test.EICAR_HDB-1 | - | old | de | Virus gefunden | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: Win.Test.EICAR_HDB-1 | - | new | de | Virus gefunden | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: Win.Test.EICAR_HDB-1 | - | spaces | de | Virus gefunden | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: Win.Test.EICAR_HDB-1 | + | dav-path-version | language | subject | message | + | old | es | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus: Eicar-Signature | + | new | es | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus: Eicar-Signature | + | spaces | es | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Eicar-Signature | + | old | de | Virus gefunden | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: Eicar-Signature | + | new | de | Virus gefunden | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: Eicar-Signature | + | spaces | de | Virus gefunden | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: Eicar-Signature | @issue-enterprise-5709 Scenario Outline: try to create a version of file by uploading virus content @@ -477,7 +477,7 @@ Feature: antivirus When user "Brian" uploads a file "filesForUpload/filesWithVirus/eicar.com" to "text.txt" in space "new-space" using the WebDAV API Then the HTTP status code should be "204" And user "Brian" should get a notification with subject "Virus found" and message: - | message | - | Virus found in text.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 | + | message | + | Virus found in text.txt. Upload not possible. Virus: Eicar-Signature | And for user "Brian" the content of the file "/text.txt" of the space "new-space" should be "hello world" And for user "Alice" the content of the file "/text.txt" of the space "new-space" should be "hello world" diff --git a/tests/acceptance/filesForUpload/filesWithVirus/eicar.com b/tests/acceptance/filesForUpload/filesWithVirus/eicar.com new file mode 100644 index 000000000..704cac859 --- /dev/null +++ b/tests/acceptance/filesForUpload/filesWithVirus/eicar.com @@ -0,0 +1 @@ +X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*