Skip to content

Synchronise yoga with upstream #53

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.

Sign up for GitHub

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

Open
github-actions wants to merge 1 commit into
base: stackhpc/yoga
Choose a base branch
from
Open

Synchronise yoga with upstream #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions keystone/identity/backends/ldap/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,14 +254,18 @@ def __init__(self, conf):
self.enabled_default = conf.ldap.user_enabled_default
self.enabled_invert = conf.ldap.user_enabled_invert
self.enabled_emulation = conf.ldap.user_enabled_emulation
self.attribute_ignore = conf.ldap.user_attribute_ignore

def _ldap_res_to_model(self, res):
obj = super(UserApi, self)._ldap_res_to_model(res)
if self.enabled_mask != 0:
enabled = int(obj.get('enabled', self.enabled_default))
obj['enabled'] = ((enabled & self.enabled_mask) !=
self.enabled_mask)
elif self.enabled_invert and not self.enabled_emulation:
elif (
not self.enabled_emulation
and 'enabled' not in self.attribute_ignore
):
# This could be a bool or a string. If it's a string,
# we need to convert it so we can invert it properly.
enabled = obj.get('enabled', self.enabled_default)
Expand All @@ -270,7 +274,10 @@ def _ldap_res_to_model(self, res):
enabled = True
else:
enabled = False
obj['enabled'] = not enabled
if self.enabled_invert:
obj['enabled'] = not enabled
else:
obj['enabled'] = enabled
obj['dn'] = res[0]

return obj
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/fix_ldap_enabled_boolean-6281eb00e5aaed26.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
Ldap identity backend did not interpret the enabled field as boolean.
Loading