Skip to content

Add quota restrictions options - #28009

Merged
julien-nc merged 1 commit into
masterfrom
enh/21045/quota-restrictions
Jul 30, 2021
Merged

Add quota restrictions options#28009
julien-nc merged 1 commit into
masterfrom
enh/21045/quota-restrictions

Conversation

@julien-nc

@julien-ncjulien-nc commented Jul 16, 2021•
edited
Loading

Copy link
Copy Markdown
Member

refs #21045

2 new Files app config options:

  • allow_unlimited_quota to toggle unlimited quota
  • max_quota to set the maximum quota that can be affected to users

A few things are taken care of:

  • Do not show unlimited suggestion when adding a member, editing a member and in default quota selection
  • Do not allow to manually set unlimited quota as default quota or as user quota
  • If unlimited quota is not allowed, it has to be avoided as the default_quota fallback value (when not set). The first quota preset is used instead.

Existing quota values and default quota are not affected by these changes. If the default quota or a user's quota has been set to unlimited, switching off unlimited quotas won't change the values. Only future affectations will be denied.

Quota presets are already configurable with the quota_preset config value of the Files app.
The remaining issue's item to address is

Entering of free custom values should be allowable or deniable

Feel free to add other reviewers 😁.

@julien-ncjulien-nc added this to the Nextcloud 23 milestone Jul 16, 2021
@julien-nc

julien-nc commented Jul 16, 2021

Copy link
Copy Markdown
MemberAuthor

/compile amend /

@npmbuildbot-nextcloud
npmbuildbot-nextcloudBotforce-pushed the enh/21045/quota-restrictions branch from 6972429 to c5f72c5CompareJuly 16, 2021 12:35
@julien-nc
julien-ncforce-pushed the enh/21045/quota-restrictions branch from c5f72c5 to 78c3c81CompareJuly 19, 2021 09:24
@julien-nc

julien-nc commented Jul 19, 2021

Copy link
Copy Markdown
MemberAuthor

/compile amend /

@npmbuildbot-nextcloud
npmbuildbot-nextcloudBotforce-pushed the enh/21045/quota-restrictions branch from 78c3c81 to d26c684CompareJuly 19, 2021 09:37
juliusknorr
juliusknorr reviewed Jul 19, 2021
View reviewed changes
Comment threadapps/provisioning_api/lib/Controller/AppConfigController.php Outdated
juliusknorr
juliusknorr reviewed Jul 19, 2021
View reviewed changes
Comment threadapps/provisioning_api/lib/Controller/UsersController.php Outdated
juliusknorr
juliusknorr reviewed Jul 19, 2021
View reviewed changes
Comment threadapps/provisioning_api/lib/Controller/UsersController.php Outdated
juliusknorr
juliusknorr reviewed Jul 19, 2021
View reviewed changes
Comment threadlib/private/User/User.php

// if unlimited quota is not allowed => avoid getting 'unlimited' as default_quota fallback value
// use the first preset instead
$allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';

@juliusknorrjuliusknorrJul 19, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would be nice if that could be covered by some tests

@julien-ncjulien-ncJul 19, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@juliushaertl Thanks for the review. I made an attempt to implement some tests in tests/lib/User/UserTest.php.

I'm having trouble to run those tests locally. I've played with

./autotest.sh sqlite lib/User/UserTest.php

but it always says Cannot open file "lib/User/UserTest".
Any idea or hint?

@juliusknorrjuliusknorrJul 19, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

running them with the full path should work:

NOCOVERAGE=1 ./autotest.sh sqlite tests/lib/User/UserTest.php

Otherwise you can also run server tests from within phpstorm by using the proper bootstrap file in tests/bootstrap.php

image

@julien-ncjulien-ncJul 19, 2021

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Thanks a lot. Still not working when using autotest.sh. Nevermind, working fine with PhpStorm.

After a little fight with PhpUnit, here are 2 small tests 😁.

@juliusknorrjuliusknorr added the pending documentation This pull request needs an associated documentation update label Jul 19, 2021
@julien-nc
julien-ncforce-pushed the enh/21045/quota-restrictions branch 3 times, most recently from d4e6a65 to b467c0aCompareJuly 19, 2021 15:46
@artonge

artonge commented Jul 20, 2021

Copy link
Copy Markdown
Collaborator

/compile amend /

@npmbuildbot-nextcloud
npmbuildbot-nextcloudBotforce-pushed the enh/21045/quota-restrictions branch from b467c0a to 8943546CompareJuly 20, 2021 09:48
@julien-nc

julien-nc commented Jul 28, 2021

Copy link
Copy Markdown
MemberAuthor

I guess we can wait for #28202

@julien-nc
julien-ncforce-pushed the enh/21045/quota-restrictions branch from 8943546 to ea77adaCompareJuly 29, 2021 11:06
@julien-nc

julien-nc commented Jul 29, 2021

Copy link
Copy Markdown
MemberAuthor

/compile amend /

1 similar comment
@Pytal

Pytal commented Jul 29, 2021

Copy link
Copy Markdown
Member

/compile amend /

Julien Veyssier@npmbuildbot-nextcloud
refs#21045add app config to disable unlimited quota and to set max …
416d10f
…quota
avoid unlimited quota as default_quota fallback value if unlimited quota is not allowed
avoid getting/setting/displaying unlimited default quota if not allowed
implement tests for unlimited quota restrictions
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
@nextcloud-command
nextcloud-commandforce-pushed the enh/21045/quota-restrictions branch from ea77ada to 416d10fCompareJuly 29, 2021 19:31
@julien-nc

julien-nc commented Jul 30, 2021

Copy link
Copy Markdown
MemberAuthor

Drone CI failure is not related (missing dependencies in nodb step).

@julien-nc

julien-nc commented Jul 30, 2021

Copy link
Copy Markdown
MemberAuthor

/backport to stable22

@julien-nc
julien-nc merged commit 7170c03 into masterJul 30, 2021
@julien-nc
julien-nc deleted the enh/21045/quota-restrictions branch July 30, 2021 08:26
@backportbot-nextcloud

backportbot-nextcloudBot commented Jul 30, 2021

Copy link
Copy Markdown

The backport to stable22 failed. Please do this backport manually.

@szaimen

This comment has been minimized.

Sign in to view
@julien-ncjulien-nc mentioned this pull request Jul 30, 2021
Merged
@PytalPytal mentioned this pull request Aug 6, 2021
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@juliusknorrjuliusknorrjuliusknorr approved these changes
@PytalPytalPytal approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@skjnldsvskjnldsvAwaiting requested review from skjnldsv
@szaimenszaimenAwaiting requested review from szaimen
@artongeartongeAwaiting requested review from artonge
@CarlSchwanCarlSchwanAwaiting requested review from CarlSchwan

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsenhancementfeature: filesfeature: settingspending documentationThis pull request needs an associated documentation update

Projects

None yet

Milestone

Nextcloud 23

Development

Successfully merging this pull request may close these issues.

6 participants

@julien-nc@artonge@Pytal@szaimen@juliusknorr@skjnldsv