0002-Fix-somes-pep8-errors.patch
src/authentic2/backends/ldap_backend.py | ||
---|---|---|
108 | 108 |
def update_request(self): |
109 | 109 |
request = StoreRequestMiddleware.get_request() |
110 | 110 |
if request: |
111 |
assert not request.session is None
|
|
111 |
assert request.session is not None
|
|
112 | 112 |
self.init_to_session(request.session) |
113 | 113 | |
114 | 114 |
def init_from_request(self): |
115 | 115 |
request = StoreRequestMiddleware.get_request() |
116 |
assert request and not request.session is None
|
|
116 |
assert request and request.session is not None
|
|
117 | 117 |
self.init_from_session(request.session) |
118 | 118 | |
119 | 119 |
def keep_password(self, password): |
... | ... | |
558 | 558 |
role, error = self.get_role(block, role_id=role_name) |
559 | 559 |
if role is None: |
560 | 560 |
log.warning('error %s: couldn\'t retrieve role %r', |
561 |
error, role_name) |
|
561 |
error, role_name)
|
|
562 | 562 |
continue |
563 | 563 |
# Add missing roles |
564 | 564 |
if dn in role_dns and role not in roles: |
... | ... | |
660 | 660 |
if group not in groups: |
661 | 661 |
user.groups.add(group) |
662 | 662 | |
663 | ||
664 | 663 |
def populate_mandatory_roles(self, user, block): |
665 | 664 |
mandatory_roles = block.get('set_mandatory_roles') |
666 | 665 |
if not mandatory_roles: |
... | ... | |
673 | 672 |
role, error = self.get_role(block, role_id=role_name) |
674 | 673 |
if role is None: |
675 | 674 |
log.warning('error %s: couldn\'t retrieve role %r', |
676 |
error, role_name) |
|
675 |
error, role_name)
|
|
677 | 676 |
continue |
678 | 677 |
if role not in roles: |
679 | 678 |
user.roles.add(role) |
... | ... | |
728 | 727 |
attributes = set() |
729 | 728 |
attributes.update(map(str, block['attributes'])) |
730 | 729 |
for field in ('email_field', 'fname_field', 'lname_field', |
731 |
'member_of_attribute'): |
|
730 |
'member_of_attribute'):
|
|
732 | 731 |
if block[field]: |
733 | 732 |
attributes.add(block[field]) |
734 | 733 |
for external_id_tuple in block['external_id_tuples']: |
tests/test_ldap.py | ||
---|---|---|
165 | 165 |
assert not user.check_password(PASS) |
166 | 166 |
assert 'password' not in client.session['ldap-data'] |
167 | 167 | |
168 | ||
168 | 169 |
@pytest.mark.django_db |
169 | 170 |
def test_double_login(slapd, simple_user, settings, app): |
170 | 171 |
settings.LDAP_AUTH_SETTINGS = [{ |
171 |
- |