-
-
Notifications
You must be signed in to change notification settings - Fork 34
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
Changing the LDAP Admin filter can change existing LDAP authenticating users #96
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently if you clear the LDAP Admin Filter field, it resets to the default '(objectClass=JellyfinAdministrator)' which is a little confusing. This patch changes the code to set the state to '_disabled_' when persisting to the plugin configuration. The backend then checks for that value and only applies the LDAP filter if the field does not equal '_disabled_'. Signed-off-by: James Ketrenos <[email protected]>
…filter If an AdminFilter is set, and if the current user's admin access does not match the state of that filter applied to that user, update their status. NOTE: If an AdminFilter is *not* set, no existing users will have their access changed. Signed-off-by: James Ketrenos <[email protected]>
The provider that is set is the only one that is checked, so the extra check is not needed |
crobibero
reviewed
Nov 5, 2021
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.
Additionally, we do 4 spaces for indentation
crobibero
reviewed
Nov 5, 2021
Co-authored-by: Cody Robibero <[email protected]>
Co-authored-by: Cody Robibero <[email protected]>
Co-authored-by: Cody Robibero <[email protected]>
Signed-off-by: James Ketrenos <[email protected]>
Fixed the ws and merged in your changes. Thanks for the edits. |
Signed-off-by: James Ketrenos <[email protected]>
crobibero
approved these changes
Nov 6, 2021
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This two patch series performs the following:
Note the question toward the bottom of the second patch -- I wasn't sure if the authentication flow is run for all users, or only those users that have their authenticationProviderId set to the LDAP-Auth. Currently the patch checks to make sure the current provider is set to LDAP prior to updating any access.