-
Notifications
You must be signed in to change notification settings - Fork 5
Do not block access for ALL AD users when the license user limit is exceeded #116 #112
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
base: master
Are you sure you want to change the base?
Conversation
…eded#192 - [Dev checkpoint]
…eded#192 - Reminder
…eded#192 * Switch to user disabling system
…eded#192 * Some Cleanup
…eded#192 * Add User Manager Impl (WIP)
…eded#192 * Try to implement user disabling lazily (WIP)
…eded#192 * Disable the login instead of disabling users one by one (WIP)
…eded#192 * Reorder code * Add login error message when about to exceed the user limit * Add logging
…eded#192 * Remove preemptive blocking of user creation
...ory-api/src/main/java/com/xwiki/activedirectory/internal/ActiveDirectoryAuthServiceImpl.java
Outdated
Show resolved
Hide resolved
| return this.licensor.hasLicensure(EXTENSION_ID); | ||
| } | ||
|
|
||
| private boolean shouldBypassLicense(String username, XWikiContext context) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be worth to include this in the AuthExtensionUserManager interface, with a more suggestive name, to make it easier for other auth extensions to add the user limit bypass behavior from this PR. WDYT?
…eded#192 * Fix logger error * Fix checkstyle
…xceeded xwikisas#116 * Add special case when the user limit might be exceeded by new AD user
…xceeded xwikisas#116 * Remove unused translations
Test casesThe license used for testing has a user limit of 5 users.
I didn't test login methods other than the login form, such as using |
Fix for issue xwikisas/application-licensing#192
Depends on PR
xwikisas/application-licensing#194xwikisas/application-licensing#207What was implemented:
getUserDocFromUsername(String, XWikiContext)is actually used. The rest are remainders from other attempts on this issue, though some might be nice to have.Special cases
Active Directory license user limit is 5 for these examples
AD License user limit is reached exactly (5/5 users)
AD License user limit is exceeded (6/5 users)