Skip to content

LDAP to not register new users when outside of fair use or over limits - #33945

Merged
szaimen merged 4 commits into
masterfrom
fix/noid/fair-use-ldap
Oct 21, 2022
Merged

LDAP to not register new users when outside of fair use or over limits#33945
szaimen merged 4 commits into
masterfrom
fix/noid/fair-use-ldap

Conversation

@blizzz

@blizzzblizzz commented Sep 7, 2022

Copy link
Copy Markdown
Member

In UserManager::createUser we check whether the instance is over limits (subscription or one-click-instance) and would refuse to add users. It works for local backends only. This PR offers a comfort method for assertion and makes the LDAP backend taking advantage of it.

@blizzzblizzz added the 2. developing Work in progress label Sep 7, 2022
@blizzzblizzz added this to the Nextcloud 25 milestone Sep 7, 2022
This was referenced Sep 7, 2022
Merged
Merged
@skjnldsvskjnldsv mentioned this pull request Sep 15, 2022
Merged
This was referenced Sep 20, 2022
Closed
Merged
@blizzzblizzz modified the milestones: Nextcloud 25, Nextcloud 26Sep 22, 2022
@blizzz
LDAP to no register new users when outside of fair use or over limits
8e8acf2
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz

blizzz commented Oct 18, 2022

Copy link
Copy Markdown
MemberAuthor

Downside of the current solution: With on-demand mapping, an end user may face an infinite spinner when trying to share a file, when a user would have to be mapped. The sharing frontend code does not handle well 500 results.

My idea now is to perhaps react on the request: throw the exception only when the request is done via provisioning api, otherwise just skip mapping.

@blizzz
[LDAP] throw exception only against prov api
50d4963
- unbreaks functionality for end users when on demand mapping takes
place
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
improve admin notification experience
7d3457e
- do not stack notifications, replace them
- and replace them once a day only
- with LDAP it might end in total spam terror (also push) otherwise
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
blizzzforce-pushed the fix/noid/fair-use-ldap branch from 2fc503c to 7d3457eCompareOctober 18, 2022 21:36
@blizzz
blizzz marked this pull request as ready for review October 18, 2022 21:37
@blizzzblizzz added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 18, 2022
@blizzz

blizzz commented Oct 18, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable25

@blizzz

blizzz commented Oct 18, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to stable24

szaimen
szaimen reviewed Oct 20, 2022
View reviewed changes
Comment threadlib/private/Support/Subscription/Assertion.php Outdated
PVince81
PVince81 reviewed Oct 21, 2022
View reviewed changes
Comment threadapps/user_ldap/lib/Jobs/CleanUp.php
PVince81
PVince81 reviewed Oct 21, 2022
View reviewed changes
Comment threadapps/user_ldap/lib/Mapping/UserMapping.php
@blizzz@szaimen
extended hint message
bff2376
Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: blizzz <blizzz@arthur-schiwon.de>
PVince81
PVince81 approved these changes Oct 21, 2022
View reviewed changes

@PVince81PVince81 left a comment

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.

👍 code looks fine

szaimen
szaimen approved these changes Oct 21, 2022
View reviewed changes

@szaimenszaimen left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🐘

@szaimenszaimen added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 21, 2022
@szaimen

szaimen commented Oct 21, 2022

Copy link
Copy Markdown
Contributor

Can someone restart drone? Not sure if the failure is really related...

@PVince81

PVince81 commented Oct 21, 2022

Copy link
Copy Markdown
Member

yeah, a bit weird:

 The Language column in Users Settings could not be found after 100 seconds (NoSuchElementException)

I've restarted the Drone builds

@szaimen
szaimen merged commit 47da08f into masterOct 21, 2022
@szaimen
szaimen deleted the fix/noid/fair-use-ldap branch October 21, 2022 16:53
This was referenced Oct 21, 2022
Merged
Merged
@come-nccome-nc mentioned this pull request Oct 24, 2022
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PVince81PVince81PVince81 approved these changes
@szaimenszaimenszaimen approved these changes
@CarlSchwanCarlSchwanAwaiting requested review from CarlSchwan
@come-nccome-ncAwaiting requested review from come-nc
@nickvergessennickvergessenAwaiting requested review from nickvergessen

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishfeature: ldap

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

3 participants

@blizzz@szaimen@PVince81