Skip to content

[stable22] Fix removing remote shares when the remote server is unreachable #29565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 6 commits into from
Mar 10, 2022
Merged

[stable22] Fix removing remote shares when the remote server is unreachable #29565

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92e1072
Add integration tests for deleting federated shares
danxuliu Jan 22, 2021
60b8116
Add integration tests for listing federated shares
danxuliu Apr 8, 2021
6e45663
Add integration tests for federated shares from unavailable servers
danxuliu Jan 22, 2021
2421282
Return false in hasUpdated when storage is not available
PVince81 Oct 21, 2021
3f08a6d
Update psalm baseline
PVince81 Oct 22, 2021
8206b38
Update lib/private/Files/Storage/Wrapper/Availability.php add void
PVince81 Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add integration tests for listing federated shares 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu @backportbot
danxuliu authored and backportbot[bot] committed Nov 5, 2021
commit 60b8116f4b928f776ad3c62a8d10b6ef348f6aff
32 changes: 32 additions & 0 deletions build/integration/features/bootstrap/FederationContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
*/
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;
use Behat\Gherkin\Node\TableNode;

require __DIR__ . '/../../vendor/autoload.php';

Expand Down Expand Up @@ -96,6 +97,37 @@ public function federateGroupSharing($sharerUser, $sharerServer, $sharerPath, $s
$this->usingServer($previous);
}

/**
* @Then remote share :count is returned with
*
* @param int $number
* @param TableNode $body
*/
public function remoteShareXIsReturnedWith(int $number, TableNode $body) {
$this->theHTTPStatusCodeShouldBe('200');
$this->theOCSStatusCodeShouldBe('100');

if (!($body instanceof TableNode)) {
return;
}

$returnedShare = $this->getXmlResponse()->data[0];
if ($returnedShare->element) {
$returnedShare = $returnedShare->element[$number];
}

$defaultExpectedFields = [
'id' => 'A_NUMBER',
'remote_id' => 'A_NUMBER',
'accepted' => '1',
];
$expectedFields = array_merge($defaultExpectedFields, $body->getRowsHash());

foreach ($expectedFields as $field => $value) {
$this->assertFieldIsInReturnedShare($field, $value, $returnedShare);
}
}

/**
* @When /^User "([^"]*)" from server "(LOCAL|REMOTE)" accepts last pending share$/
* @param string $user
Expand Down
42 changes: 42 additions & 0 deletions build/integration/federation_features/federated.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,48 @@ Feature: federated



Scenario: List federated share from another server not accepted yet
Given Using server "LOCAL"
And user "user0" exists
Given Using server "REMOTE"
And user "user1" exists
# Rename file so it has a unique name in the target server (as the target
# server may have its own /textfile0.txt" file)
And User "user1" copies file "/textfile0.txt" to "/remote-share.txt"
And User "user1" from server "REMOTE" shares "/remote-share.txt" with user "user0" from server "LOCAL"
And Using server "LOCAL"
When As an "user0"
And sending "GET" to "/apps/files_sharing/api/v1/remote_shares"
Then the list of returned shares has 0 shares

Scenario: List federated share from another server
Given Using server "LOCAL"
And user "user0" exists
Given Using server "REMOTE"
And user "user1" exists
# Rename file so it has a unique name in the target server (as the target
# server may have its own /textfile0.txt" file)
And User "user1" copies file "/textfile0.txt" to "/remote-share.txt"
And User "user1" from server "REMOTE" shares "/remote-share.txt" with user "user0" from server "LOCAL"
And Using server "LOCAL"
And User "user0" from server "LOCAL" accepts last pending share
When As an "user0"
And sending "GET" to "/apps/files_sharing/api/v1/remote_shares"
Then the list of returned shares has 1 shares
And remote share 0 is returned with
| remote | http://localhost:8180/ |
| name | /remote-share.txt |
| owner | user1 |
| user | user0 |
| mountpoint | /remote-share.txt |
| mimetype | text/plain |
| mtime | A_NUMBER |
| permissions | 27 |
| type | file |
| file_id | A_NUMBER |



Scenario: Delete federated share with another server
Given Using server "LOCAL"
And user "user0" exists
Expand Down