Skip to content
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.

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

Do not set the default quota if no suitable quota can be found #28404

Merged
merged 2 commits into from Aug 16, 2017

Conversation

@jvillafanez
Copy link
Member

commented Jul 17, 2017

Description

Do not set the default quota if no suitable quota can be found. Setting the default quota seems a wrong choice.

Related Issue

#28309

Motivation and Context

How Has This Been Tested?

manually tested

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

Port to 10.0 will be needed.

@PVince81

@PVince81

This comment has been minimized.

Copy link
Member

commented Jul 17, 2017

How Has This Been Tested?

@jvillafanez

This comment has been minimized.

Copy link
Member Author

commented Jul 17, 2017

I've tested manually

@PVince81

This comment has been minimized.

Copy link
Member

commented Jul 17, 2017

@jvillafanez and I guess you'll leave it up to QA to guess what the test steps were ?

@jvillafanez

This comment has been minimized.

Copy link
Member Author

commented Jul 17, 2017

  1. Setup a LDAP connection without quota info in the advanced tab
  2. Go to the users page and setup a quota for one of the LDAP users from there.
  3. Make sure the lastFeatureRefresh in the user's preferences hasn't been updated for 1 day (you can delete the key from the DB)
  4. Run the occ ldap:check-user with the target user.
  5. Login with the target user
  6. Go to the personal page and check the quota.

Previously, the quota would be the default one (set in the users page). Now the quota shouldn't change.

Note that these steps might not be 100% failproof. Sometimes I had to go back to step 3 and repeat.

There could also be other scenarios which could trigger this issue. I think the key point is to remove the lastFeatureRefresh from the DB and check the user's existence in order to force an update of the user's information.

@cdamken

This comment has been minimized.

Copy link
Member

commented Jul 21, 2017

The expected behavior:

1.- ownCloud default quota is set as 1 choice.
2.- Administrators can modify the quota in the user page.
3.- If LDAP quota is set -> overrides ownCloud quotas.
4.- If quota per attribute in LDAP is set -> overrides LDAP quota.

ref: owncloud/enterprise#1813 (comment)

@PVince81

This comment has been minimized.

Copy link
Member

commented Aug 16, 2017

and if no quota is set inside of LDAP at all (no quota attributes), don't override the local quota.

@jvillafanez please rebase and move this forward.

Copy link
Member

left a comment

👍

@jvillafanez jvillafanez force-pushed the ldap_keep_quota branch from f60d767 to 7663922 Aug 16, 2017
@jvillafanez

This comment has been minimized.

Copy link
Member Author

commented Aug 16, 2017

Rebased

@jvillafanez

This comment has been minimized.

Copy link
Member Author

commented Aug 16, 2017

Checking tests failures...

@PVince81 PVince81 merged commit 0048977 into stable9.1 Aug 16, 2017
3 checks passed
3 checks passed
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details
@PVince81 PVince81 deleted the ldap_keep_quota branch Aug 16, 2017
@lock

This comment has been minimized.

Copy link

commented Aug 2, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Aug 2, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
5 participants
You can’t perform that action at this time.