cherrypy-foundation 1.0.0a11__py3-none-any.whl → 1.0.0a12__py3-none-any.whl

cherrypy_foundation/plugins/ldap.py

@@ -63,7 +63,7 @@ def first_attribute(attributes, keys, default=None):
             value = attributes[attr]
             if isinstance(value, list):
                 if len(value) == 0:
-                    pass
+                    continue
                 return value[0]
             else:
                 return value

cherrypy_foundation/plugins/tests/test_ldap.py

@@ -19,13 +19,13 @@ Created on Oct 17, 2015
 @author: Patrik Dufresne <patrik@ikus-soft.com>
 """
 import os
-from unittest import mock, skipUnless
+from unittest import TestCase, mock, skipUnless
 
 import cherrypy
 import ldap3
 from cherrypy.test import helper
 
-from .. import ldap  # noqa
+from ..ldap import all_attribute, first_attribute  # noqa
 
 original_connection = ldap3.Connection
 
@@ -35,6 +35,79 @@ def mock_ldap_connection(*args, **kwargs):
     return original_connection(*args, client_strategy=ldap3.MOCK_ASYNC, **kwargs)
 
 
+class LdapFirstAttributeTest(TestCase):
+
+    def test_no_keys_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertIsNone(first_attribute(attributes, None))
+        self.assertEqual(first_attribute(attributes, [], default="fallback"), "fallback")
+
+    def test_single_key_with_scalar_value(self):
+        attributes = {"uid": "jdoe"}
+        self.assertEqual(first_attribute(attributes, "uid"), "jdoe")
+
+    def test_single_key_with_list_value(self):
+        attributes = {"mail": ["john@example.com", "alt@example.com"]}
+        self.assertEqual(first_attribute(attributes, "mail"), "john@example.com")
+
+    def test_empty_list_value_is_skipped(self):
+        attributes = {
+            "mail": [],
+            "uid": ["jdoe"],
+        }
+        self.assertEqual(first_attribute(attributes, ["mail", "uid"]), "jdoe")
+
+    def test_missing_first_key_uses_next_key(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(first_attribute(attributes, ["sn", "cn"]), "John Doe")
+
+    def test_all_keys_missing_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(first_attribute(attributes, ["sn", "uid"], default="unknown"), "unknown")
+
+    def test_key_not_found_without_default_returns_none(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertIsNone(first_attribute(attributes, "uid"))
+
+
+class LdapAllAttributeTest(TestCase):
+
+    def test_no_keys_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertIsNone(all_attribute(attributes, None))
+        self.assertEqual(all_attribute(attributes, [], default="fallback"), "fallback")
+
+    def test_single_key_with_scalar_value(self):
+        attributes = {"uid": "jdoe"}
+        self.assertEqual(all_attribute(attributes, "uid"), ["jdoe"])
+
+    def test_single_key_with_list_value(self):
+        attributes = {"mail": ["john@example.com", "alt@example.com"]}
+        self.assertEqual(all_attribute(attributes, "mail"), ["john@example.com"])
+
+    def test_multiple_keys_collect_values(self):
+        attributes = {
+            "uid": "jdoe",
+            "cn": ["John Doe"],
+        }
+        self.assertEqual(all_attribute(attributes, ["uid", "cn"]), ["jdoe", "John Doe"])
+
+    def test_missing_keys_are_skipped(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(all_attribute(attributes, ["sn", "cn", "uid"]), ["John Doe"])
+
+    def test_all_keys_missing_returns_default(self):
+        attributes = {"cn": ["John Doe"]}
+        self.assertEqual(all_attribute(attributes, ["sn", "uid"], default=[]), [])
+
+    def test_empty_list_value_is_appended_as_empty_list(self):
+        attributes = {
+            "mail": [],
+            "uid": "jdoe",
+        }
+        self.assertEqual(all_attribute(attributes, ["mail", "uid"]), [[], "jdoe"])
+
+
 class LdapPluginTest(helper.CPWebCase):
 
     @classmethod

{cherrypy_foundation-1.0.0a11.dist-info → cherrypy_foundation-1.0.0a12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cherrypy-foundation
-Version: 1.0.0a11
+Version: 1.0.0a12
 Summary: CherryPy Foundation
 Author-email: Patrik Dufresne <patrik@ikus-soft.com>
 License: GPLv3

{cherrypy_foundation-1.0.0a11.dist-info → cherrypy_foundation-1.0.0a12.dist-info}/RECORD

@@ -81,13 +81,13 @@ cherrypy_foundation/components/vendor/typeahead/jquery.typeahead.min.css,sha256=
 cherrypy_foundation/components/vendor/typeahead/jquery.typeahead.min.js,sha256=eFBtgouYdW587kYINWsjkN-UR8GVWAG_fQe1fpJfjOw,47828
 cherrypy_foundation/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/plugins/db.py,sha256=46S-2kR9BHVYRN9cxWwYfzY2WkpEVBCpx1ubsJolYfA,10108
-cherrypy_foundation/plugins/ldap.py,sha256=hehNXGYWLSh_tqqbI_sZdFGjC9uJAyeZ-vMNPai9s_w,9909
+cherrypy_foundation/plugins/ldap.py,sha256=PxZp-2tHy73CegiIV5pKnfWe0WOCqNRIYQR8aIh1UEs,9913
 cherrypy_foundation/plugins/restapi.py,sha256=S5GIxHL0M3Wcs33fyVOb0RfX1FXbp2fqUxJ_ufqBrD4,2843
 cherrypy_foundation/plugins/scheduler.py,sha256=McTR72GGTuW7UZKco_Czmp09PfqJ-aHXJxh7h9BFZvA,10777
 cherrypy_foundation/plugins/smtp.py,sha256=yTCUj2XzrJEJ84CIbYcrCUAP6Mg59aZfu6OZDGQyJbQ,7479
 cherrypy_foundation/plugins/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cherrypy_foundation/plugins/tests/test_db.py,sha256=PELi5ojj8VqcXyPbpaig2Ac4ZqlR_gEPGUYrWJPANWg,3921
-cherrypy_foundation/plugins/tests/test_ldap.py,sha256=7EhFvhxwDCCBoNlAD5XpZxLtKvkrjpQxrtCHMT9wkQ4,14393
+cherrypy_foundation/plugins/tests/test_ldap.py,sha256=j0QUIxqeEBgN4VLvczUlw0xMM_ldPWVHCceAJzU71Jg,17269
 cherrypy_foundation/plugins/tests/test_scheduler.py,sha256=I-ZuQhMvCCvqFDwukwsyz_UkdJJ8JSLTkAanUo24GCE,3564
 cherrypy_foundation/plugins/tests/test_scheduler_db.py,sha256=-iZnLgb3qsJzs0p7JAw6TQswRtExCmHAtYXqRNPZn7U,3101
 cherrypy_foundation/plugins/tests/test_smtp.py,sha256=qs5yezIpSXkBmLmFlqckfPW7NmntHZxQjDSkdQG_dNE,4183
@@ -126,8 +126,8 @@ cherrypy_foundation/tools/tests/locales/fr/LC_MESSAGES/messages.po,sha256=6_Sk9I
 cherrypy_foundation/tools/tests/templates/test_jinja2.html,sha256=v9AHxksbBvzE7sesPqE61HMhsvU4juXt3E0ZQo-zXVQ,190
 cherrypy_foundation/tools/tests/templates/test_jinja2_i18n.html,sha256=98S51dgG7Vb4rvMZNZvomw1D9pBiM4g6pdlxAgvrxXA,373
 cherrypy_foundation/tools/tests/templates/test_jinjax.html,sha256=NT19UaUzm8FRKOIc6H6HNGPDJU6KATnakd8zf3BCeAs,153
-cherrypy_foundation-1.0.0a11.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
-cherrypy_foundation-1.0.0a11.dist-info/METADATA,sha256=01n5K1GISPi32NOQ8r3x1eV6qNd5x7ZS0tpJON9mUe4,2023
-cherrypy_foundation-1.0.0a11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cherrypy_foundation-1.0.0a11.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
-cherrypy_foundation-1.0.0a11.dist-info/RECORD,,
+cherrypy_foundation-1.0.0a12.dist-info/licenses/LICENSE.md,sha256=trSLYs5qlaow_bBwsLTRKpmTXsXzFksM_YUCMqrgAJQ,35149
+cherrypy_foundation-1.0.0a12.dist-info/METADATA,sha256=bVj-ivyQaks7eDS4cxGDbq0I1OhKXejr5Rq9EUo81xc,2023
+cherrypy_foundation-1.0.0a12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cherrypy_foundation-1.0.0a12.dist-info/top_level.txt,sha256=B1vQPTLYhpKJ6W0JkRCWyAf8RPcnwJWdYxixv75-4ew,20
+cherrypy_foundation-1.0.0a12.dist-info/RECORD,,