0001-ldap-fix-indentation-of-LDAPObject.result3-fixes-312.patch

Benjamin Dauvergne, 11 mars 2019 16:51

Voir les différences: en ligne côte à côte

Subject: [PATCH] ldap: fix indentation of LDAPObject.result3() (fixes #31273)

 src/authentic2/backends/ldap_backend.py | 36 ++++++++++++-------------
 tests/test_ldap.py                      | 24 +++++++++++++++++
 2 files changed, 42 insertions(+), 18 deletions(-)

                     new_modlist.append((mod_op, mod_typ, mod_vals))
                 return NativeLDAPObject.modify_s(self, dn, new_modlist)
         def result3(self, msgid=ldap.RES_ANY, all=1, timeout=None, resp_ctrl_classes=None):
             result_type, data, msgid, serverctrls = NativeLDAPObject.result3(self,
                                                                              msgid=msgid,
                                                                              all=all,
                                                                              timeout=timeout,
                                                                              resp_ctrl_classes=resp_ctrl_classes)
             if data:
                 data = self._convert_results_to_unicode(data)
             return result_type, data, msgid, serverctrls
             def result3(self, msgid=ldap.RES_ANY, all=1, timeout=None, resp_ctrl_classes=None):
                 result_type, data, msgid, serverctrls = NativeLDAPObject.result3(self,
                                                                                  msgid=msgid,
                                                                                  all=all,
                                                                                  timeout=timeout,
                                                                                  resp_ctrl_classes=resp_ctrl_classes)
                 if data:
                     data = self._convert_results_to_unicode(data)
                 return result_type, data, msgid, serverctrls
     elif PYTHON_LDAP3 is False:
         class LDAPObject(NativeLDAPObject):
-...
                     new_modlist.append((mod_op, mod_typ, mod_vals))
                 return NativeLDAPObject.modify_s(self, dn, new_modlist)
         def result3(self, msgid=ldap.RES_ANY, all=1, timeout=None, resp_ctrl_classes=None):
             result_type, data, msgid, serverctrls = NativeLDAPObject.result3(self,
                                                                              msgid=msgid,
                                                                              all=all,
                                                                              timeout=timeout,
                                                                              resp_ctrl_classes=resp_ctrl_classes)
             if data:
                 data = self._convert_results_to_unicode(data)
             return result_type, data, msgid, serverctrls
             def result3(self, msgid=ldap.RES_ANY, all=1, timeout=None, resp_ctrl_classes=None):
                 result_type, data, msgid, serverctrls = NativeLDAPObject.result3(self,
                                                                                  msgid=msgid,
                                                                                  all=all,
                                                                                  timeout=timeout,
                                                                                  resp_ctrl_classes=resp_ctrl_classes)
                 if data:
                     data = self._convert_results_to_unicode(data)
                 return result_type, data, msgid, serverctrls
     def map_text(d):

     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import os
     import json
     import pytest
     import mock
-...
             'use_tls': False,
             'attributes': ['jpegPhoto'],
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         result = client.post('/login/', {'login-password-submit': '1',
                                          'username': USERNAME,
                                          'password': PASS}, follow=True)
-...
             'basedn': u'o=ôrga',
             'use_tls': False,
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         result = client.post('/login/', {'login-password-submit': '1',
                                          'username': USERNAME,
                                          'password': PASS}, follow=True)
-...
             'is_superuser': True,
             'is_staff': True,
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         utils.login(app, simple_user, path='/admin/')
         utils.login(app, UID, password=PASS, path='/admin/')
-...
             'use_tls': False,
             'ou_slug': 'test',
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         result = client.post('/login/', {'login-password-submit': '1',
                                          'username': USERNAME,
                                          'password': PASS}, follow=True)
-...
             'use_tls': False,
             'ou_slug': 'test',
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         with pytest.raises(ImproperlyConfigured):
             client.post('/login/', {'login-password-submit': '1',
                                     'username': USERNAME,
-...
                 [u'cn=group1,o=ôrga', ['Group1']],
             ],
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         assert Group.objects.filter(name='Group1').count() == 0
         response = client.post('/login/', {'login-password-submit': '1',
                                            'username': USERNAME,
-...
             ],
             'group_filter': '(&(memberUid={uid})(objectClass=posixGroup))',
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         assert Group.objects.filter(name='Group2').count() == 0
         response = client.post('/login/', {'login-password-submit': '1',
                                            'username': USERNAME,
-...
             ],
             'group_filter': '(&(memberUid={uid})(objectClass=posixGroup))',
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         response = client.post('/login/', {'login-password-submit': '1',
                                            'username': USERNAME,
                                            'password': PASS}, follow=True)
-...
             'use_tls': False,
             'groupsu': [u'cn=group1,o=ôrga'],
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         response = client.post('/login/', {'login-password-submit': '1',
                                            'username': USERNAME,
                                            'password': PASS}, follow=True)
-...
             'use_tls': False,
             'groupstaff': [u'cn=group1,o=ôrga'],
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         response = client.post('/login/', {'login-password-submit': '1',
                                            'username': 'etienne.michu',
                                            'password': PASS}, follow=True)
-...
             ],
             'group_filter': '(&(memberUid={uid})(objectClass=posixGroup))',
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         save = mock.Mock(wraps=ldap_backend.LDAPUser.save)
         ldap_backend.LDAPUser.save = MethodType(save, None, ldap_backend.LDAPUser)
         bulk_create = mock.Mock(wraps=django.db.models.query.QuerySet.bulk_create)
-...
             'group_filter': '(&(memberUid={uid})(objectClass=posixGroup))',
             'set_mandatory_roles': ['tech', 'admin'],
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         list(ldap_backend.LDAPBackend.get_users())
         assert User.objects.first().roles.count() == 2
-...
             'group_filter': '(&(memberUid={uid})(objectClass=posixGroup))',
             'set_mandatory_roles': ['tech', 'admin'],
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         list(ldap_backend.LDAPBackend.get_users())
         assert User.objects.first().roles.count() == 0
-...
                     '{0}to * by dn.subtree="o=ôrga" none by * manage'
                 ])
             ])
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         return slapd
-...
             'group_filter': '(&(memberUid={uid})(objectClass=posixGroup))',
             'set_mandatory_roles': ['tech', 'admin'],
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         response = app.get('/login/')
         response.form.set('username', USERNAME)
         response.form.set('password', PASS)
-...
             'basedn': u'o=ôrga',
             'use_tls': False,
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         assert User.objects.count() == 0
         # first login
         response = app.get('/login/')
-...
             'use_tls': False,
             'user_can_change_password': False,
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         assert User.objects.count() == 0
         # first login
         response = app.get('/login/')
-...
             'basedn': u'o=ôrga',
             'use_tls': False,
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         result = client.post('/login/', {'login-password-submit': '1',
                                          'username': USERNAME,
                                          'password': PASS}, follow=True)
-...
                 },
+            ]
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         # create a locality attribute
         models.Attribute.objects.create(
-...
             'basedn': u'o=ôrga',
             'use_tls': False,
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         user = authenticate(username=u'etienne.michu', password=u'passé')
         assert user
         assert user.check_password(u'passé')
-...
             'ou_slug': ou1.slug,
             'use_tls': False,
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         settings.A2_LOGIN_FORM_OU_SELECTOR = True
         # Check login to the wrong ou does not work
-...
             'basedn': u'o=ôrga',
             'use_tls': False,
         }]
         settings.LDAP_AUTH_SETTINGS = json.loads(json.dumps(settings.LDAP_AUTH_SETTINGS))
         settings.A2_LOGIN_FORM_OU_SELECTOR = True
         # Check login to the wrong ou does not work
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-ldap-fix-indentation-of-LDAPObject.result3-fixes-312.patch