msad 0.4.5__py3-none-any.whl → 0.5.0__py3-none-any.whl

msad/main.py

@@ -157,62 +157,6 @@ def _pprint(ldapresult, out_format="json", sep="\t"):
                 result = result + sep.join(new_values) + "\n"
         return result
 
-    # def users(self, user):
-    #     """Find users inside AD. The
-    #     filter can be the cn or userPrincipalName or samaccoutnname or mail to be searched. Can contain *
-    #     """
-    #     result = msad.users(
-    #         self._conn, self._search_base, user, attributes=self._attributes
-    #     )
-    #     return self._pprint(result)
-
-    # def is_disabled(self, user):
-    #     """Check if a user is disabled"""
-    #     return msad.user.is_disabled(self._conn, self._search_base, user)
-
-    # def is_locked(self, user):
-    #     """Check if the user is locked"""
-    #     return msad.user.is_locked(self._conn, self._search_base, user)
-
-    # def password_changed_in_days(self, user):
-    #     return msad.user.password_changed_in_days(self._conn, self._search_base, user)
-    
-    # def has_expired_password(self, user, max_age):
-    #     """Check is user has the expired password"""
-    #     return msad.has_expired_password(self._conn, self._search_base, user, max_age)
-
-    # def has_never_expires_password(self, user):
-    #     """Check if a user has never expires password"""
-    #     return msad.has_never_expires_password(self._conn, self._search_base, user)
-
-    # def check_user(self, user, max_age, groups=[]):
-    #     """Get some info about a user: is it locked? disabled? password expired?"""
-    #     return msad.check_user(self._conn, self._search_base, user, max_age, groups)
-
-
-
-    # def user_groups(self, user_name=None, user_dn=None):
-    #     """Extract the list of groups of a user (using DN or sAMAccountName)"""
-    #     return msad.user.user_groups(
-    #         self._conn, self._search_base, self._limit, user_name, user_dn
-    #     )
-
-
-    # def group_member(
-    #     self, group_name=None, group_dn=None, user_name=None, user_dn=None
-    # ):
-    #     """Check if the user is a member of a group (using DN or sAMAccountName)"""
-    #     return msad.group_member(
-    #         conn=self._conn,
-    #         search_base=self._search_base,
-    #         group_name=group_name,
-    #         group_dn=group_dn,
-    #         user_name=user_name,
-    #         user_dn=user_dn,
-    #     )
-
-
-
 app = typer.Typer()
 
 @app.command()

msad/user.py

@@ -69,7 +69,7 @@ def has_never_expires_password(conn, search_base: str, user: str):
     return True if len(result) == 1 else None
 
 
-def password_changed_in_days(conn, search_base: str, user: str, max_age: int, limit: int = 2000):
+def password_changed_in_days(conn, search_base: str, user: str):
     #    return search(conn, search_base, search_filter, attributes=attributes)
     search_filter = f"(samaccountname={user})"
     result = search(
@@ -83,12 +83,11 @@ def password_changed_in_days(conn, search_base: str, user: str, max_age: int, li
     now = datetime.datetime.now()
 
     if result == 0:
-        return True
+        return "Unknown"
     else:
         delta = now - result.replace(tzinfo=None)
         days = delta.days
-        return True if days > max_age else False
-
+        return days
 
 def check_user(conn, search_base:str, user:str, max_age:int, groups=[]):
     # result = {}
@@ -102,10 +101,7 @@ def check_user(conn, search_base:str, user:str, max_age:int, groups=[]):
         }
     )
     yield (
-        {"password_changed_in_days": password_changed_in_days(conn, search_base, user, max_age)}
-    )
-    yield (
-        {"has_expired_password": has_expired_password(conn, search_base, user, max_age)}
+        {"password_changed_in_days": password_changed_in_days(conn, search_base, user)}
     )
     for group in groups:
         yield (

{msad-0.4.5.dist-info → msad-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: msad
-Version: 0.4.5
+Version: 0.5.0
 Summary: msad is a commandline for interacting with Active Directory
 Project-URL: Homepage, https://github.com/matteoredaelli/msad
 Project-URL: Issues, https://github.com/matteoredaelli/msad/issues

msad-0.5.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+msad/__init__.py,sha256=DJ6egXlvzOK_k0XlN7BpmMRuwu4MM7eQoxLE0Ou-sLI,63
+msad/__main__.py,sha256=RCZmmoCNOWC7rAfIDm_LaymsybXIzE6McYbUEEkf9P8,60
+msad/ad.py,sha256=C3dknAgRY6Jnotk0RgPSye7uzNxUd-7B3oGloGR674E,5679
+msad/group.py,sha256=3HNpXfYK4yXxDNsXn72JOZSMEwjj0kMiDvVBca1oVuI,2510
+msad/main.py,sha256=JyLcTl9n2ERoJ4XE62Exd-Bv6q-srDbb4TrIsqh3jc8,8417
+msad/search.py,sha256=ADbUD8j_Tbh2XIWUYiWcgkg6pmKDciIL3DnCHf_Twzs,3478
+msad/user.py,sha256=PSBkica6EshYCeOnDDBwlijacvG4jY_v4mvlWNLibD4,4076
+msad-0.5.0.dist-info/METADATA,sha256=PuBh9MISrSo6R9F0s2xuA9Pf_xN0BZ6MAoFVg_K6WMA,2378
+msad-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+msad-0.5.0.dist-info/entry_points.txt,sha256=UKSjeppC0YX2dfybmBfxLXCqF_HMZFfPX1MRw88rtpI,39
+msad-0.5.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+msad-0.5.0.dist-info/RECORD,,

msad-0.4.5.dist-info/RECORD

@@ -1,12 +0,0 @@
-msad/__init__.py,sha256=DJ6egXlvzOK_k0XlN7BpmMRuwu4MM7eQoxLE0Ou-sLI,63
-msad/__main__.py,sha256=RCZmmoCNOWC7rAfIDm_LaymsybXIzE6McYbUEEkf9P8,60
-msad/ad.py,sha256=C3dknAgRY6Jnotk0RgPSye7uzNxUd-7B3oGloGR674E,5679
-msad/group.py,sha256=3HNpXfYK4yXxDNsXn72JOZSMEwjj0kMiDvVBca1oVuI,2510
-msad/main.py,sha256=5wBSPOZPkOnYfe-gow1YFt65FpawJooZ3eOKp_RFP0A,10573
-msad/search.py,sha256=ADbUD8j_Tbh2XIWUYiWcgkg6pmKDciIL3DnCHf_Twzs,3478
-msad/user.py,sha256=p6n9vQRo1xwccDZEcZPr-7NvU3zjMtidf0-gWtdmrrg,4250
-msad-0.4.5.dist-info/METADATA,sha256=hC_5HkxKer445LubdECYUISFAr0XhIs3MuFGqHD46ek,2378
-msad-0.4.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-msad-0.4.5.dist-info/entry_points.txt,sha256=UKSjeppC0YX2dfybmBfxLXCqF_HMZFfPX1MRw88rtpI,39
-msad-0.4.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-msad-0.4.5.dist-info/RECORD,,