-
Notifications
You must be signed in to change notification settings - Fork 13
Fix subgroups #43
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
Merged
Merged
Fix subgroups #43
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
2c2504d
fix: ldap subgroups are now handled correctly without erroring
BigSpaceships 83a0b5c
feat: added ability to just get member uids
BigSpaceships ffb666a
feat: documented uids option
BigSpaceships 336acbe
fix: flattened if and broke up method
BigSpaceships File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,7 @@ def __init__(self, lib, search_val): | |
| raise KeyError("Invalid Search Name") | ||
|
|
||
| @reconnect_on_fail | ||
| def get_members(self): | ||
| def get_members(self, uids=False): | ||
| """Return all members in the group as CSHMember objects""" | ||
| res = self.__con__.search_s( | ||
| self.__ldap_base_dn__, | ||
|
|
@@ -40,13 +40,17 @@ def get_members(self): | |
|
|
||
| ret = [] | ||
| for val in res: | ||
| val = val[1]['uid'][0] | ||
| try: | ||
| ret.append(val.decode('utf-8')) | ||
| except UnicodeDecodeError: | ||
| ret.append(val) | ||
| except KeyError: | ||
| continue | ||
| if 'uid' in val[1]: | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Flatten this block: if 'uid' not in val[1]:
continue
val = ... |
||
| val = val[1]['uid'][0] | ||
| try: | ||
| ret.append(val.decode('utf-8')) | ||
| except UnicodeDecodeError: | ||
| ret.append(val) | ||
| except KeyError: | ||
| continue | ||
|
|
||
| if uids: | ||
| return ret | ||
|
|
||
| return [CSHMember(self.__lib__, | ||
| result, | ||
|
|
||
Oops, something went wrong.
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.
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.
Why not just make a
def get_member_uids(self)?uids=Falseimplies thatuids=Truewill return whatuids=Falsedoes but also with UIDs, not return less. At least clarify the parameter (uids_only?) and add documentation as to what it returns.