Skip to content

prevent recursion when moving a file to the trashbin#14656

Merged
MorrisJobke merged 1 commit intomasterfrom
trash-prevent-recursion
Mar 13, 2019
Merged

prevent recursion when moving a file to the trashbin#14656
MorrisJobke merged 1 commit intomasterfrom
trash-prevent-recursion

Conversation

@icewind1991
Copy link
Member

@icewind1991 icewind1991 commented Mar 13, 2019

Depending on how the backend performs the "move to trash", the trashbin might get triggered again, by pausing the trash while performing the move we prevent a possible infinite loop.

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label Mar 13, 2019
@icewind1991 icewind1991 added this to the Nextcloud 16 milestone Mar 13, 2019
@icewind1991
Copy link
Member Author

icewind1991 commented Mar 13, 2019

/backport to stable15

@faily-bot
Copy link

faily-bot bot commented Mar 13, 2019

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 16948: failure

DB=sqlite, ENABLE_REDIS=false, PHP=7.3

Show full log 
There was 1 failure:

1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.

/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186

--

There was 1 risky test:

1) OCA\TwoFactorBackupCodes\Tests\Db\BackupCodeMapperTest::testInsertArgonEncryptedCodes
This test did not perform any assertions

DB=mysqlmb4, ENABLE_REDIS=false, PHP=7.3

Show full log 
There was 1 failure:

1) Tests\Core\Command\Config\AppsEnableTest::testCommandInput with data set #8 (array('updatenotification', 'contacts'), array('admin'), 0, 'updatenotification enabled fo... admin')
Failed asserting that 'updatenotification enabled for groups: admin\n
Server error: `GET https://github.com/nextcloud/contacts/releases/download/v3.0.5/contacts.tar.gz` resulted in a `502 Bad Gateway` response:\n
<!DOCTYPE html>\n
<html>\n
  <head>\n
    <meta http-equiv="Content-type" content="text/html; charset=utf-8">\n
    <meta http-e (truncated...)\n
\n
' contains "updatenotification enabled for groups: admin
contacts enabled for groups: admin".

/drone/src/github.com/nextcloud/server/tests/Core/Command/Apps/AppsEnableTest.php:69

--

There was 1 risky test:

1) OCA\TwoFactorBackupCodes\Tests\Db\BackupCodeMapperTest::testInsertArgonEncryptedCodes
This test did not perform any assertions

TESTS=integration-federation_features

  • build/integration/federation_features/federated.feature:183
  • build/integration/federation_features/federated.feature:232
  • build/integration/federation_features/federated.feature:247
  • build/integration/federation_features/federated.feature:263
Show full log 
[Wed Mar 13 10:57:34 2019] 127.0.0.1:55970 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/incoming_server2server_group_share_enabled
[Wed Mar 13 10:57:35 2019] 127.0.0.1:56010 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/outgoing_server2server_group_share_enabled
  Scenario: Reshare a federated shared file                                                             # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:183
    Given Using server "REMOTE"                                                                         # FederationContext::usingServer()
[Wed Mar 13 10:57:36 2019] 127.0.0.1:33214 [404]: /ocs/v2.php/cloud/users/user1
[Wed Mar 13 10:57:39 2019] 127.0.0.1:33254 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 10:58:05 2019] 127.0.0.1:33460 [200]: /ocs/v1.php/cloud/users/user1
[Wed Mar 13 10:58:07 2019] 127.0.0.1:34578 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                             # FederationContext::assureUserExists()
[Wed Mar 13 10:58:07 2019] 127.0.0.1:34606 [404]: /ocs/v2.php/cloud/users/user2
[Wed Mar 13 10:58:12 2019] 127.0.0.1:34628 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 10:58:36 2019] 127.0.0.1:34758 [200]: /ocs/v1.php/cloud/users/user2
[Wed Mar 13 10:58:37 2019] 127.0.0.1:35488 [200]: /ocs/v2.php/cloud/users/user2
    And user "user2" exists                                                                             # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                            # FederationContext::usingServer()
[Wed Mar 13 10:58:38 2019] 127.0.0.1:58376 [404]: /ocs/v2.php/cloud/users/user0
[Wed Mar 13 10:58:41 2019] 127.0.0.1:58396 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 10:59:01 2019] 127.0.0.1:58470 [200]: /ocs/v1.php/cloud/users/user0
[Wed Mar 13 10:59:03 2019] 127.0.0.1:59028 [200]: /ocs/v2.php/cloud/users/user0
    And user "user0" exists                                                                             # FederationContext::assureUserExists()
[Wed Mar 13 10:59:05 2019] 127.0.0.1:36308 [200]: /ocm-provider/
[Wed Mar 13 10:59:05 2019] 127.0.0.1:36320 [201]: /index.php/ocm/shares
[Wed Mar 13 10:59:05 2019] 127.0.0.1:59048 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
[Wed Mar 13 10:59:07 2019] 127.0.0.1:36380 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending
[Wed Mar 13 10:59:08 2019] 127.0.0.1:59314 [200]: //ocm-provider/
[Wed Mar 13 10:59:08 2019] 127.0.0.1:59320 [201]: /index.php/ocm/notifications
[Wed Mar 13 10:59:08 2019] 127.0.0.1:59326 [200]: //ocs-provider/
[Wed Mar 13 10:59:08 2019] 127.0.0.1:59330 [200]: /ocs/v2.php/cloud/shares/8/accept?format=json
[Wed Mar 13 10:59:08 2019] 127.0.0.1:36428 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/9
    And User "user1" from server "REMOTE" accepts last pending share                                    # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                           # FederationContext::usingServer()
    And As an "user1"                                                                                   # FederationContext::asAn()
[Wed Mar 13 10:59:09 2019] 127.0.0.1:59468 [200]: //ocs-provider/
[Wed Mar 13 10:59:09 2019] 127.0.0.1:59534 [200]: //status.php
[Wed Mar 13 10:59:09 2019] 127.0.0.1:59536 [200]: //status.php
[Wed Mar 13 10:59:09 2019] 127.0.0.1:59538 [200]: /index.php/apps/files_sharing/shareinfo?t=KRVK3NXg7Ssch8V
[Wed Mar 13 10:59:09 2019] 127.0.0.1:36496 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    When creating a share with                                                                          # FederationContext::creatingShare()
      | path        | /textfile0 (2).txt |
      | shareType   | 0                  |
      | shareWith   | user2              |
      | permissions | 19                 |
    Then the OCS status code should be "100"                                                            # FederationContext::theOCSStatusCodeShouldBe()
      Failed asserting that SimpleXMLElement Object &000000005d5ba8fc000000005489fab0 (
          0 => '404'
      ) matches expected '100'.
    And the HTTP status code should be "200"                                                            # FederationContext::theHTTPStatusCodeShouldBe()
    And Share fields of last share match with                                                           # FederationContext::checkShareFields()
      | id                     | A_NUMBER           |
      | item_type              | file               |
      | item_source            | A_NUMBER           |
      | share_type             | 0                  |
      | file_source            | A_NUMBER           |
      | path                   | /textfile0 (2).txt |
      | permissions            | 19                 |
      | stime                  | A_NUMBER           |
      | storage                | A_NUMBER           |
      | mail_send              | 1                  |
      | uid_owner              | user1              |
      | file_parent            | A_NUMBER           |
      | displayname_owner      | user1              |
      | share_with             | user2              |
      | share_with_displayname | user2              |
[Wed Mar 13 10:59:19 2019] 127.0.0.1:59542 [200]: /ocs/v1.php/cloud/users/user0
[Wed Mar 13 10:59:20 2019] 127.0.0.1:60342 [404]: /ocs/v2.php/cloud/users/user0
[Wed Mar 13 10:59:31 2019] 127.0.0.1:60982 [200]: //ocm-provider/
[Wed Mar 13 10:59:31 2019] 127.0.0.1:60984 [400]: /index.php/ocm/notifications
[Wed Mar 13 10:59:31 2019] error while sending notification for federated share: Client error: `POST http://localhost:8080/index.php/ocm/notifications` resulted in a `400 Bad request` response:
{"message":"Can not find share with ID: 8"}

[Wed Mar 13 11:02:04 2019] 127.0.0.1:36654 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/incoming_server2server_group_share_enabled
[Wed Mar 13 11:02:05 2019] 127.0.0.1:36666 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/outgoing_server2server_group_share_enabled
  Scenario: Overwrite a federated shared folder as recipient                                             # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:232
    Given Using server "REMOTE"                                                                          # FederationContext::usingServer()
[Wed Mar 13 11:02:06 2019] 127.0.0.1:42066 [404]: /ocs/v2.php/cloud/users/user1
[Wed Mar 13 11:02:09 2019] 127.0.0.1:42088 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 11:02:30 2019] 127.0.0.1:42174 [200]: /ocs/v1.php/cloud/users/user1
[Wed Mar 13 11:02:31 2019] 127.0.0.1:43082 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                              # FederationContext::assureUserExists()
[Wed Mar 13 11:02:32 2019] 127.0.0.1:43158 [404]: /ocs/v2.php/cloud/users/user2
[Wed Mar 13 11:02:36 2019] 127.0.0.1:43222 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 11:02:56 2019] 127.0.0.1:43402 [200]: /ocs/v1.php/cloud/users/user2
[Wed Mar 13 11:02:58 2019] 127.0.0.1:43698 [200]: /ocs/v2.php/cloud/users/user2
    And user "user2" exists                                                                              # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                             # FederationContext::usingServer()
[Wed Mar 13 11:02:59 2019] 127.0.0.1:38334 [404]: /ocs/v2.php/cloud/users/user0
[Wed Mar 13 11:03:01 2019] 127.0.0.1:38358 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 11:03:23 2019] 127.0.0.1:38462 [200]: /ocs/v1.php/cloud/users/user0
[Wed Mar 13 11:03:24 2019] 127.0.0.1:39248 [200]: /ocs/v2.php/cloud/users/user0
    And user "user0" exists                                                                              # FederationContext::assureUserExists()
[Wed Mar 13 11:03:26 2019] 127.0.0.1:44750 [200]: /ocm-provider/
[Wed Mar 13 11:03:26 2019] 127.0.0.1:44754 [201]: /index.php/ocm/shares
[Wed Mar 13 11:03:26 2019] 127.0.0.1:39296 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE"         # FederationContext::federateSharing()
[Wed Mar 13 11:03:27 2019] 127.0.0.1:44778 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending
[Wed Mar 13 11:03:28 2019] 127.0.0.1:39498 [200]: //ocm-provider/
[Wed Mar 13 11:03:28 2019] 127.0.0.1:39500 [201]: /index.php/ocm/notifications
[Wed Mar 13 11:03:28 2019] 127.0.0.1:39502 [200]: //ocs-provider/
[Wed Mar 13 11:03:28 2019] 127.0.0.1:39504 [200]: /ocs/v2.php/cloud/shares/10/accept?format=json
[Wed Mar 13 11:03:28 2019] 127.0.0.1:44856 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/11
    And User "user1" from server "REMOTE" accepts last pending share                                     # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                            # FederationContext::usingServer()
    And As an "user1"                                                                                    # FederationContext::asAn()
    And User "user1" modifies text of "/textfile0.txt" with text "BLABLABLA"                             # FederationContext::modifyTextOfFile()
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39566 [200]: //ocs-provider/
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39568 [401]: /public.php/webdav/textfile0.txt
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39570 [404]: /public.php/webdav/textfile0.txt
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39572 [200]: //status.php
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39574 [200]: //status.php
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39576 [200]: /index.php/apps/files_sharing/shareinfo?t=gDuRz6MPGJHZJ1F
[Wed Mar 13 11:03:30 2019] Undefined index: size at /drone/src/github.com/nextcloud/server/lib/private/Files/View.php#1324
[Wed Mar 13 11:03:30 2019] Undefined index: storage_mtime at /drone/src/github.com/nextcloud/server/lib/private/Files/Cache/Watcher.php#126
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39578 [207]: /public.php/webdav/
[Wed Mar 13 11:03:30 2019] Undefined index: etag at /drone/src/github.com/nextcloud/server/lib/private/Files/Storage/DAV.php#784
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39584 [200]: //status.php
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39586 [200]: //status.php
[Wed Mar 13 11:03:30 2019] 127.0.0.1:39588 [200]: /index.php/apps/files_sharing/shareinfo?t=gDuRz6MPGJHZJ1F
[Wed Mar 13 11:03:30 2019] Undefined index: mimetype at /drone/src/github.com/nextcloud/server/lib/private/Files/Cache/Watcher.php#108
[Wed Mar 13 11:03:30 2019] 127.0.0.1:44922 [404]: /remote.php/webdav/PARENT%20(2)/textfile0.txt
    When User "user1" uploads file "../../data/user1/files/textfile0.txt" to "/PARENT (2)/textfile0.txt" # FederationContext::userUploadsAFileTo()
      Client error: `PUT http://localhost:8180/remote.php/webdav/PARENT%20(2)/textfile0.txt` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    And Downloading file "/PARENT (2)/textfile0.txt" with range "bytes=0-8"                              # FederationContext::downloadFileWithRange()
    Then Downloaded content should be "BLABLABLA"                                                        # FederationContext::downloadedContentShouldBe()
[Wed Mar 13 11:03:39 2019] 127.0.0.1:39642 [200]: /ocs/v1.php/cloud/users/user0
[Wed Mar 13 11:03:40 2019] 127.0.0.1:39940 [404]: /ocs/v2.php/cloud/users/user0
[Wed Mar 13 11:03:48 2019] 127.0.0.1:40410 [200]: //ocm-provider/
[Wed Mar 13 11:03:48 2019] 127.0.0.1:40412 [400]: /index.php/ocm/notifications
[Wed Mar 13 11:03:48 2019] error while sending notification for federated share: Client error: `POST http://localhost:8080/index.php/ocm/notifications` resulted in a `400 Bad request` response:
{"message":"Can not find share with ID: 10"}

[Wed Mar 13 11:04:00 2019] 127.0.0.1:40768 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/incoming_server2server_group_share_enabled
[Wed Mar 13 11:04:01 2019] 127.0.0.1:40794 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/outgoing_server2server_group_share_enabled
  Scenario: Overwrite a federated shared file as recipient using old chunking                           # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:247
    Given Using server "REMOTE"                                                                         # FederationContext::usingServer()
[Wed Mar 13 11:04:02 2019] 127.0.0.1:46208 [404]: /ocs/v2.php/cloud/users/user1
[Wed Mar 13 11:04:04 2019] 127.0.0.1:46226 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 11:04:23 2019] 127.0.0.1:46298 [200]: /ocs/v1.php/cloud/users/user1
[Wed Mar 13 11:04:24 2019] 127.0.0.1:46870 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                             # FederationContext::assureUserExists()
[Wed Mar 13 11:04:25 2019] 127.0.0.1:46886 [404]: /ocs/v2.php/cloud/users/user2
[Wed Mar 13 11:04:28 2019] 127.0.0.1:46904 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 11:04:47 2019] 127.0.0.1:46988 [200]: /ocs/v1.php/cloud/users/user2
[Wed Mar 13 11:04:49 2019] 127.0.0.1:47616 [200]: /ocs/v2.php/cloud/users/user2
    And user "user2" exists                                                                             # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                            # FederationContext::usingServer()
[Wed Mar 13 11:04:49 2019] 127.0.0.1:42266 [404]: /ocs/v2.php/cloud/users/user0
[Wed Mar 13 11:04:52 2019] 127.0.0.1:42294 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 11:05:13 2019] 127.0.0.1:42382 [200]: /ocs/v1.php/cloud/users/user0
[Wed Mar 13 11:05:14 2019] 127.0.0.1:43014 [200]: /ocs/v2.php/cloud/users/user0
    And user "user0" exists                                                                             # FederationContext::assureUserExists()
[Wed Mar 13 11:05:15 2019] 127.0.0.1:48482 [200]: /ocm-provider/
[Wed Mar 13 11:05:16 2019] 127.0.0.1:48484 [201]: /index.php/ocm/shares
[Wed Mar 13 11:05:16 2019] 127.0.0.1:43042 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    And User "user0" from server "LOCAL" shares "/textfile0.txt" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
[Wed Mar 13 11:05:17 2019] 127.0.0.1:48498 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending
[Wed Mar 13 11:05:18 2019] 127.0.0.1:43168 [200]: //ocm-provider/
[Wed Mar 13 11:05:18 2019] 127.0.0.1:43170 [201]: /index.php/ocm/notifications
[Wed Mar 13 11:05:18 2019] 127.0.0.1:43174 [200]: //ocs-provider/
[Wed Mar 13 11:05:18 2019] 127.0.0.1:43176 [200]: /ocs/v2.php/cloud/shares/11/accept?format=json
[Wed Mar 13 11:05:18 2019] 127.0.0.1:48530 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/12
    And User "user1" from server "REMOTE" accepts last pending share                                    # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                           # FederationContext::usingServer()
    And As an "user1"                                                                                   # FederationContext::asAn()
[Wed Mar 13 11:05:20 2019] 127.0.0.1:43302 [200]: //ocs-provider/
[Wed Mar 13 11:05:20 2019] 127.0.0.1:43304 [401]: /public.php/webdav/
[Wed Mar 13 11:05:20 2019] 127.0.0.1:43306 [207]: /public.php/webdav/
[Wed Mar 13 11:05:22 2019] 127.0.0.1:43344 [200]: //status.php
[Wed Mar 13 11:05:22 2019] 127.0.0.1:43346 [200]: //status.php
[Wed Mar 13 11:05:22 2019] 127.0.0.1:43348 [200]: /index.php/apps/files_sharing/shareinfo?t=7MxYL49LRiCTFlT
[Wed Mar 13 11:05:22 2019] 127.0.0.1:48566 [404]: /remote.php/webdav/textfile0%20(2).txt-chunking-42-3-0
    And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/textfile0 (2).txt"                 # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
      Client error: `PUT http://localhost:8180/remote.php/webdav/textfile0%20(2).txt-chunking-42-3-0` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    And user "user1" uploads chunk file "2" of "3" with "BBBBB" to "/textfile0 (2).txt"                 # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
    And user "user1" uploads chunk file "3" of "3" with "CCCCC" to "/textfile0 (2).txt"                 # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
    When Downloading file "/textfile0 (2).txt" with range "bytes=0-4"                                   # FederationContext::downloadFileWithRange()
    Then Downloaded content should be "AAAAA"                                                           # FederationContext::downloadedContentShouldBe()
[Wed Mar 13 11:05:33 2019] 127.0.0.1:43354 [200]: /ocs/v1.php/cloud/users/user0
[Wed Mar 13 11:05:34 2019] 127.0.0.1:43556 [404]: /ocs/v2.php/cloud/users/user0
[Wed Mar 13 11:05:42 2019] 127.0.0.1:43848 [200]: //ocm-provider/
[Wed Mar 13 11:05:42 2019] 127.0.0.1:43850 [400]: /index.php/ocm/notifications
[Wed Mar 13 11:05:42 2019] error while sending notification for federated share: Client error: `POST http://localhost:8080/index.php/ocm/notifications` resulted in a `400 Bad request` response:
{"message":"Can not find share with ID: 11"}

[Wed Mar 13 11:05:54 2019] 127.0.0.1:44384 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/incoming_server2server_group_share_enabled
[Wed Mar 13 11:05:55 2019] 127.0.0.1:44418 [200]: /ocs/v1.php/apps/testing/api/v1/app/files_sharing/outgoing_server2server_group_share_enabled
  Scenario: Overwrite a federated shared folder as recipient using old chunking                  # /drone/src/github.com/nextcloud/server/build/integration/federation_features/federated.feature:263
    Given Using server "REMOTE"                                                                  # FederationContext::usingServer()
[Wed Mar 13 11:05:55 2019] 127.0.0.1:49834 [404]: /ocs/v2.php/cloud/users/user1
[Wed Mar 13 11:05:59 2019] 127.0.0.1:49870 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 11:06:18 2019] 127.0.0.1:50006 [200]: /ocs/v1.php/cloud/users/user1
[Wed Mar 13 11:06:19 2019] 127.0.0.1:50808 [200]: /ocs/v2.php/cloud/users/user1
    And user "user1" exists                                                                      # FederationContext::assureUserExists()
[Wed Mar 13 11:06:20 2019] 127.0.0.1:50820 [404]: /ocs/v2.php/cloud/users/user2
[Wed Mar 13 11:06:22 2019] 127.0.0.1:50832 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 11:06:35 2019] 127.0.0.1:50976 [200]: /ocs/v1.php/cloud/users/user2
[Wed Mar 13 11:06:36 2019] 127.0.0.1:51152 [200]: /ocs/v2.php/cloud/users/user2
    And user "user2" exists                                                                      # FederationContext::assureUserExists()
    And Using server "LOCAL"                                                                     # FederationContext::usingServer()
[Wed Mar 13 11:06:37 2019] 127.0.0.1:45790 [404]: /ocs/v2.php/cloud/users/user0
[Wed Mar 13 11:06:38 2019] 127.0.0.1:45798 [200]: /ocs/v1.php/cloud/users
[Wed Mar 13 11:06:55 2019] 127.0.0.1:45812 [200]: /ocs/v1.php/cloud/users/user0
[Wed Mar 13 11:06:56 2019] 127.0.0.1:46308 [200]: /ocs/v2.php/cloud/users/user0
    And user "user0" exists                                                                      # FederationContext::assureUserExists()
[Wed Mar 13 11:06:57 2019] 127.0.0.1:51712 [200]: /ocm-provider/
[Wed Mar 13 11:06:57 2019] 127.0.0.1:51718 [201]: /index.php/ocm/shares
[Wed Mar 13 11:06:57 2019] 127.0.0.1:46314 [200]: /ocs/v1.php/apps/files_sharing/api/v1/shares
    And User "user0" from server "LOCAL" shares "/PARENT" with user "user1" from server "REMOTE" # FederationContext::federateSharing()
[Wed Mar 13 11:06:58 2019] 127.0.0.1:51720 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending
[Wed Mar 13 11:06:58 2019] 127.0.0.1:46404 [200]: //ocm-provider/
[Wed Mar 13 11:06:58 2019] 127.0.0.1:46408 [201]: /index.php/ocm/notifications
[Wed Mar 13 11:06:58 2019] 127.0.0.1:46412 [200]: //ocs-provider/
[Wed Mar 13 11:06:58 2019] 127.0.0.1:46414 [200]: /ocs/v2.php/cloud/shares/12/accept?format=json
[Wed Mar 13 11:06:58 2019] 127.0.0.1:51730 [200]: /ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/13
    And User "user1" from server "REMOTE" accepts last pending share                             # FederationContext::acceptLastPendingShare()
    And Using server "REMOTE"                                                                    # FederationContext::usingServer()
    And As an "user1"                                                                            # FederationContext::asAn()
[Wed Mar 13 11:06:59 2019] 127.0.0.1:46432 [200]: //ocs-provider/
[Wed Mar 13 11:06:59 2019] 127.0.0.1:46436 [200]: //status.php
[Wed Mar 13 11:06:59 2019] 127.0.0.1:46438 [200]: //status.php
[Wed Mar 13 11:06:59 2019] 127.0.0.1:46440 [200]: /index.php/apps/files_sharing/shareinfo?t=wqEHtg2QoGOFlr4
[Wed Mar 13 11:06:59 2019] Undefined index: size at /drone/src/github.com/nextcloud/server/lib/private/Files/View.php#1324
[Wed Mar 13 11:06:59 2019] Undefined index: storage_mtime at /drone/src/github.com/nextcloud/server/lib/private/Files/Cache/Watcher.php#126
[Wed Mar 13 11:06:59 2019] 127.0.0.1:46442 [401]: /public.php/webdav/
[Wed Mar 13 11:06:59 2019] 127.0.0.1:46444 [207]: /public.php/webdav/
[Wed Mar 13 11:06:59 2019] Undefined index: etag at /drone/src/github.com/nextcloud/server/lib/private/Files/Storage/DAV.php#784
[Wed Mar 13 11:06:59 2019] 127.0.0.1:46450 [200]: //status.php
[Wed Mar 13 11:06:59 2019] 127.0.0.1:46452 [200]: //status.php
[Wed Mar 13 11:06:59 2019] 127.0.0.1:46454 [200]: /index.php/apps/files_sharing/shareinfo?t=wqEHtg2QoGOFlr4
[Wed Mar 13 11:06:59 2019] Undefined index: mimetype at /drone/src/github.com/nextcloud/server/lib/private/Files/Cache/Watcher.php#108
[Wed Mar 13 11:06:59 2019] 127.0.0.1:51804 [404]: /remote.php/webdav/PARENT%20(2)/textfile0.txt-chunking-42-3-0
    And user "user1" uploads chunk file "1" of "3" with "AAAAA" to "/PARENT (2)/textfile0.txt"   # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
      Client error: `PUT http://localhost:8180/remote.php/webdav/PARENT%20(2)/textfile0.txt-chunking-42-3-0` resulted in a `404 Not Found` response:
      <?xml version="1.0" encoding="utf-8"?>
      <d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
        <s:exception>Sabre\DA (truncated...)
       (GuzzleHttp\Exception\ClientException)
    And user "user1" uploads chunk file "2" of "3" with "BBBBB" to "/PARENT (2)/textfile0.txt"   # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
    And user "user1" uploads chunk file "3" of "3" with "CCCCC" to "/PARENT (2)/textfile0.txt"   # FederationContext::userUploadsChunkFileOfWithToWithChecksum()
    When Downloading file "/PARENT (2)/textfile0.txt" with range "bytes=3-13"                    # FederationContext::downloadFileWithRange()
    Then Downloaded content should be "AABBBBBCCCC"                                              # FederationContext::downloadedContentShouldBe()
[Wed Mar 13 11:07:08 2019] 127.0.0.1:46462 [200]: /ocs/v1.php/cloud/users/user0
[Wed Mar 13 11:07:08 2019] 127.0.0.1:46832 [404]: /ocs/v2.php/cloud/users/user0
[Wed Mar 13 11:07:14 2019] 127.0.0.1:47218 [200]: //ocm-provider/
[Wed Mar 13 11:07:14 2019] 127.0.0.1:47220 [400]: /index.php/ocm/notifications
[Wed Mar 13 11:07:14 2019] error while sending notification for federated share: Client error: `POST http://localhost:8080/index.php/ocm/notifications` resulted in a `400 Bad request` response:
{"message":"Can not find share with ID: 12"}

TESTS=acceptance, TESTS-ACCEPTANCE=app-files

  • tests/acceptance/features/app-files.feature:60
  • tests/acceptance/features/app-files.feature:72
  • tests/acceptance/features/app-files.feature:79
  • tests/acceptance/features/app-files.feature:97
  • tests/acceptance/features/app-files.feature:126
  • tests/acceptance/features/app-files.feature:133
Show full log 
  Scenario: viewing a favorite file in its folder does not prevent opening the details view in "All files" section # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:60
    Given I am logged in                                                                                           # LoginPageContext::iAmLoggedIn()
    And I mark "welcome.txt" as favorite                                                                           # FileListContext::iMarkAsFavorite()
    And I see that "welcome.txt" is marked as favorite                                                             # FileListContext::iSeeThatIsMarkedAsFavorite()
    And I open the "Favorites" section                                                                             # AppNavigationContext::iOpenTheSection()
    And I open the details view for "welcome.txt"                                                                  # FileListContext::iOpenTheDetailsViewFor()
      Row for file welcome.txt in file list could not be found after 100 seconds
      File actions menu button for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)
    And I see that the details view is open                                                                        # FilesAppContext::iSeeThatTheDetailsViewIsOpen()
    And I view "welcome.txt" in folder                                                                             # FileListContext::iViewInFolder()
    And I see that the current section is "All files"                                                              # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    When I open the details view for "welcome.txt"                                                                 # FileListContext::iOpenTheDetailsViewFor()
    Then I see that the details view is open                                                                       # FilesAppContext::iSeeThatTheDetailsViewIsOpen()

  Scenario: show recent files                                                 # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:72
    Given I am logged in                                                      # LoginPageContext::iAmLoggedIn()
    And I create a new folder named "Folder just created"                     # FileListContext::iCreateANewFolderNamed()
    When I open the "Recent" section                                          # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Recent"                           # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "Folder just created" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file Folder just created in file list could not be found after 100 seconds (NoSuchElementException)

  Scenario: show recent files for a second time                               # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:79
    Given I am logged in                                                      # LoginPageContext::iAmLoggedIn()
    And I open the "Recent" section                                           # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "Recent"                            # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I open the "All files" section                                        # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "All files"                         # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I create a new folder named "Folder just created"                     # FileListContext::iCreateANewFolderNamed()
    When I open the "Recent" section                                          # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Recent"                           # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "Folder just created" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file Folder just created in file list could not be found after 100 seconds (NoSuchElementException)

  Scenario: show favorites for a second time                          # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:97
    Given I am logged in                                              # LoginPageContext::iAmLoggedIn()
    And I open the "Favorites" section                                # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "Favorites"                 # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I open the "All files" section                                # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "All files"                 # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I mark "welcome.txt" as favorite                              # FileListContext::iMarkAsFavorite()
    When I open the "Favorites" section                               # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Favorites"                # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "welcome.txt" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)

  Scenario: show deleted files                                        # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:126
    Given I am logged in                                              # LoginPageContext::iAmLoggedIn()
    And I delete "welcome.txt"                                        # FileListContext::iDelete()
    When I open the "Deleted files" section                           # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Deleted files"            # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "welcome.txt" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)

  Scenario: show deleted files for a second time                      # /drone/src/github.com/nextcloud/server/tests/acceptance/features/app-files.feature:133
    Given I am logged in                                              # LoginPageContext::iAmLoggedIn()
    And I open the "Deleted files" section                            # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "Deleted files"             # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I open the "All files" section                                # AppNavigationContext::iOpenTheSection()
    And I see that the current section is "All files"                 # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    And I delete "welcome.txt"                                        # FileListContext::iDelete()
    When I open the "Deleted files" section                           # AppNavigationContext::iOpenTheSection()
    Then I see that the current section is "Deleted files"            # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    Then I see that the file list contains a file named "welcome.txt" # FileListContext::iSeeThatTheFileListContainsAFileNamed()
      Row for file welcome.txt in file list could not be found after 100 seconds (NoSuchElementException)

TESTS=acceptance, TESTS-ACCEPTANCE=users

  • tests/acceptance/features/users.feature:116
Show full log 
  Scenario: change display name                                        # /drone/src/github.com/nextcloud/server/tests/acceptance/features/users.feature:116
    Given I act as Jane                                                # ActorContext::iActAs()
    And I am logged in as the admin                                    # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the User settings                                       # SettingsMenuContext::iOpenTheUserSettings()
    And I see that the list of users contains the user user0           # UsersSettingsContext::iSeeThatTheListOfUsersContainsTheUser()
    And I see that the displayName of user0 is user0                   # UsersSettingsContext::iSeeThatTheFieldOfUserIs()
    When I set the displayName for user0 to user1                      # UsersSettingsContext::iSetTheFieldForUserTo()
    And I see that the displayName cell for user user0 is done loading # UsersSettingsContext::iSeeThatTheCellForUserIsDoneLoading()
    Then I see that the displayName of user0 is user1                  # UsersSettingsContext::iSeeThatTheFieldOfUserIs()
      Failed asserting that two strings are equal.
      --- Expected
      +++ Actual
      @@ @@
      -'user0'
      +'user1'

TESTS=acceptance, TESTS-ACCEPTANCE=apps

  • tests/acceptance/features/apps.feature:66
  • tests/acceptance/features/apps.feature:83
Show full log 
  Scenario: Show section from app store                       # /drone/src/github.com/nextcloud/server/tests/acceptance/features/apps.feature:66
    Given I act as Jane                                       # ActorContext::iActAs()
    And I am logged in as the admin                           # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the Apps management                            # SettingsMenuContext::iOpenTheAppsManagement()
    And I see that the current section is "Your apps"         # AppNavigationContext::iSeeThatTheCurrentSectionIs()
    When I open the "Files" section                           # AppNavigationContext::iOpenTheSection()
      Files section item in App Navigation could not be found after 100 seconds (NoSuchElementException)
    Then I see that there some apps listed from the app store # AppsManagementContext::iSeeThatThereSomeAppsListedFromTheAppStore()
    And I see that the current section is "Files"             # AppNavigationContext::iSeeThatTheCurrentSectionIs()

  Scenario: Install an app from the app store                     # /drone/src/github.com/nextcloud/server/tests/acceptance/features/apps.feature:83
    Given I act as Jane                                           # ActorContext::iActAs()
    And I am logged in as the admin                               # LoginPageContext::iAmLoggedInAsTheAdmin()
    And I open the Apps management                                # SettingsMenuContext::iOpenTheAppsManagement()
    And I open the "Tools" section                                # AppNavigationContext::iOpenTheSection()
    And I click on the "Antivirus for files" app                  # AppsManagementContext::iClickOnTheApp()
      Row for app Antivirus for files in Apps Management could not be found after 100 seconds (NoSuchElementException)
    And I see that the app details are shown                      # AppsManagementContext::iSeeThatTheAppDetailsAreShown()
    Then I download and enable the "Antivirus for files" app      # AppsManagementContext::iDownloadAndEnableTheApp()
    And I see that the "Antivirus for files" app has been enabled # AppsManagementContext::iSeeThatTheAppHasBeenEnabled()

rullzer
rullzer approved these changes Mar 13, 2019
View reviewed changes
Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense

MorrisJobke
MorrisJobke approved these changes Mar 13, 2019
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code makes sense 👍

@MorrisJobke MorrisJobke merged commit cdd84d6 into master Mar 13, 2019
@MorrisJobke MorrisJobke deleted the trash-prevent-recursion branch March 13, 2019 16:16
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Mar 13, 2019
Merged
@backportbot-nextcloud
Copy link

backportbot-nextcloud bot commented Mar 13, 2019

backport to stable15 in #14661

@MorrisJobke MorrisJobke mentioned this pull request Mar 20, 2019
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzer rullzer rullzer approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

Assignees

No one assigned

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

3 participants

@icewind1991 @rullzer @MorrisJobke