Skip to content

[stable18] Fix default internal expiration date #24161

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
rullzer merged 16 commits into from
Nov 16, 2020
Merged

[stable18] Fix default internal expiration date #24161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1d0a70e
Use the shorter phpunit syntax for mocked return values in ManagerTest
ChristophWurst Mar 25, 2020
f592384
Fix typos in method names
danxuliu Nov 11, 2020
e9dfa13
Fix typo in variable name
danxuliu Nov 11, 2020
66eb123
Remove extra spaces
danxuliu Nov 12, 2020
4789709
Remove wrong and misleading comment
danxuliu Nov 11, 2020
aaeaed0
Add unit tests to enforce a relaxed default share expiration date
danxuliu Nov 11, 2020
f4f39fc
Fix unit test for verifying enforced expire date too far in the future
danxuliu Nov 11, 2020
eae5fa8
Fix unit test for verifying enforced valid expiration date.
danxuliu Nov 12, 2020
6cf3c29
Fix unit test method name
danxuliu Nov 12, 2020
2f8f06f
Fix unit test for expiration date without date but with default
danxuliu Nov 12, 2020
c138d2d
Add unit test for expiration date with date and with default
danxuliu Nov 12, 2020
713e879
Add explicit time to test date for clarity
danxuliu Nov 12, 2020
bae712b
Fix default internal expiration date
danxuliu Nov 12, 2020
68f67d9
Add unit tests for "validateExpirationDateInternal"
danxuliu Nov 12, 2020
aadd0ab
Reset app configs by deleting the values instead of setting the defaults
danxuliu Nov 12, 2020
47ca9e3
Add integration tests for creating shares with default expiration dates
danxuliu Nov 12, 2020
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
Add integration tests for creating shares with default expiration dates 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Nov 16, 2020
commit 47ca9e39970a41767cfd355576a3629551014963
6 changes: 6 additions & 0 deletions build/integration/features/bootstrap/SharingContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ class SharingContext implements Context, SnippetAcceptingContext {

protected function resetAppConfigs() {
$this->deleteServerConfig('core', 'shareapi_default_permissions');
$this->deleteServerConfig('core', 'shareapi_default_internal_expire_date');
$this->deleteServerConfig('core', 'shareapi_internal_expire_after_n_days');
$this->deleteServerConfig('core', 'internal_defaultExpDays');
$this->deleteServerConfig('core', 'shareapi_default_expire_date');
$this->deleteServerConfig('core', 'shareapi_expire_after_n_days');
$this->deleteServerConfig('core', 'link_defaultExpDays');
$this->deleteServerConfig('sharebymail', 'enforcePasswordProtection');
}
}
106 changes: 106 additions & 0 deletions build/integration/sharing_features/sharing-v1.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,112 @@ Feature: sharing
And Share fields of last share match with
| permissions | 7 |

Scenario: Creating a new internal share with default expiration date
Given user "user0" exists
And user "user1" exists
And As an "user0"
And parameter "shareapi_default_internal_expire_date" of app "core" is set to "yes"
And parameter "shareapi_internal_expire_after_n_days" of app "core" is set to "3"
When creating a share with
| path | welcome.txt |
| shareWith | user1 |
| shareType | 0 |
And the OCS status code should be "100"
And the HTTP status code should be "200"
And Getting info of last share
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Share fields of last share match with
| expiration | +3 days |

Scenario: Creating a new internal share with relaxed default expiration date
Given user "user0" exists
And user "user1" exists
And As an "user0"
And parameter "shareapi_default_internal_expire_date" of app "core" is set to "yes"
And parameter "shareapi_internal_expire_after_n_days" of app "core" is set to "3"
And parameter "internal_defaultExpDays" of app "core" is set to "1"
When creating a share with
| path | welcome.txt |
| shareWith | user1 |
| shareType | 0 |
And the OCS status code should be "100"
And the HTTP status code should be "200"
And Getting info of last share
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Share fields of last share match with
| expiration | +1 days |

Scenario: Creating a new internal share with relaxed default expiration date too large
Given user "user0" exists
And user "user1" exists
And As an "user0"
And parameter "shareapi_default_internal_expire_date" of app "core" is set to "yes"
And parameter "shareapi_internal_expire_after_n_days" of app "core" is set to "3"
And parameter "internal_defaultExpDays" of app "core" is set to "10"
When creating a share with
| path | welcome.txt |
| shareWith | user1 |
| shareType | 0 |
And the OCS status code should be "100"
And the HTTP status code should be "200"
And Getting info of last share
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Share fields of last share match with
| expiration | +3 days |

Scenario: Creating a new link share with default expiration date
Given user "user0" exists
And As an "user0"
And parameter "shareapi_default_expire_date" of app "core" is set to "yes"
And parameter "shareapi_expire_after_n_days" of app "core" is set to "3"
When creating a share with
| path | welcome.txt |
| shareType | 3 |
And the OCS status code should be "100"
And the HTTP status code should be "200"
And Getting info of last share
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Share fields of last share match with
| expiration | +3 days |

Scenario: Creating a new link share with relaxed default expiration date
Given user "user0" exists
And As an "user0"
And parameter "shareapi_default_expire_date" of app "core" is set to "yes"
And parameter "shareapi_expire_after_n_days" of app "core" is set to "3"
And parameter "link_defaultExpDays" of app "core" is set to "1"
When creating a share with
| path | welcome.txt |
| shareType | 3 |
And the OCS status code should be "100"
And the HTTP status code should be "200"
And Getting info of last share
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Share fields of last share match with
| expiration | +1 days |

Scenario: Creating a new link share with relaxed default expiration date too large
Given user "user0" exists
And As an "user0"
And parameter "shareapi_default_expire_date" of app "core" is set to "yes"
And parameter "shareapi_expire_after_n_days" of app "core" is set to "3"
And parameter "link_defaultExpDays" of app "core" is set to "10"
When creating a share with
| path | welcome.txt |
| shareType | 3 |
And the OCS status code should be "100"
And the HTTP status code should be "200"
And Getting info of last share
Then the OCS status code should be "100"
And the HTTP status code should be "200"
And Share fields of last share match with
| expiration | +3 days |

Scenario: getting all shares of a user using that user
Given user "user0" exists
And user "user1" exists
Expand Down