msad 0.2.1__tar.gz → 0.3.2__tar.gz

msad-0.3.2/.gitignore

@@ -0,0 +1,129 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/

{msad-0.2.1/msad.egg-info → msad-0.3.2}/PKG-INFO

@@ -1,17 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: msad
-Version: 0.2.1
-Summary: msad is a library and commandline for interacting with Active Directory
-Home-page: https://github.com/matteoredaelli/msad
-Author: Matteo Redaelli
-Author-email: matteo.redaelli@gmail.com
-License: GPL
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3
+Version: 0.3.2
+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
+Author-email: Matteo Redaelli <matteo.redaelli@gmail.com>
+License-Expression: GPL-3.0-or-later
+License-File: LICENSE
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-License-File: LICENSE
 
 # msAD
 
@@ -23,13 +22,59 @@ msad is a library and command line tool for working with an Active Directory / L
 - change AD passwords
 - check if a user is disabled or locked, group membership
 
-## Install
+
+## Usage
 
 ```bash
-pip install msad
+msad --help
 ```
 
-## Usage
+```text
+ COMMAND is one of the following:
+
+     add_member
+       Adds the user to a group (using DN or sAMAccountName)
+
+     change_password
+
+     check_user
+       Get some info about a user: is it locked? disabled? password expired?
+
+     group_flat_members
+       Extract all the (nested) members of a group
+
+     group_member
+       Check if the user is a member of a group (using DN or sAMAccountName)
+
+     group_members
+       Extract the direct members of a group
+
+     has_expired_password
+       Check is user has the expired password
+
+     has_never_expires_password
+       Check if a user has never expires password
+
+     is_disabled
+       Check if a user is disabled
+
+     is_locked
+       Check if the user is locked
+
+     remove_member
+       Remove the user from a group (using DN or sAMAccountName)
+
+     search
+
+     user_groups
+       Extract the list of groups of a user (using DN or sAMAccountName)
+
+     users
+       Find users inside AD. The filter can be the cn or userPrincipalName or samaccoutnname or mail to be searched. Can contain *
+
+```
+
+## Sample
 
 I find useful to add an alias in my ~/.bash_aliases
 
@@ -61,11 +106,9 @@ msad --out_format csv --attributes samaccountname,mail,sn,givenName group_flat_m
 
 ## License
 
-Copyright © 2021 Matteo Redaelli
+Copyright © 2021 2022 Matteo Redaelli
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
-
-

msad-0.2.1/PKG-INFO → msad-0.3.2/README.md

@@ -1,18 +1,3 @@
-Metadata-Version: 2.1
-Name: msad
-Version: 0.2.1
-Summary: msad is a library and commandline for interacting with Active Directory
-Home-page: https://github.com/matteoredaelli/msad
-Author: Matteo Redaelli
-Author-email: matteo.redaelli@gmail.com
-License: GPL
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
 # msAD
 
 
@@ -23,13 +8,59 @@ msad is a library and command line tool for working with an Active Directory / L
 - change AD passwords
 - check if a user is disabled or locked, group membership
 
-## Install
+
+## Usage
 
 ```bash
-pip install msad
+msad --help
 ```
 
-## Usage
+```text
+ COMMAND is one of the following:
+
+     add_member
+       Adds the user to a group (using DN or sAMAccountName)
+
+     change_password
+
+     check_user
+       Get some info about a user: is it locked? disabled? password expired?
+
+     group_flat_members
+       Extract all the (nested) members of a group
+
+     group_member
+       Check if the user is a member of a group (using DN or sAMAccountName)
+
+     group_members
+       Extract the direct members of a group
+
+     has_expired_password
+       Check is user has the expired password
+
+     has_never_expires_password
+       Check if a user has never expires password
+
+     is_disabled
+       Check if a user is disabled
+
+     is_locked
+       Check if the user is locked
+
+     remove_member
+       Remove the user from a group (using DN or sAMAccountName)
+
+     search
+
+     user_groups
+       Extract the list of groups of a user (using DN or sAMAccountName)
+
+     users
+       Find users inside AD. The filter can be the cn or userPrincipalName or samaccoutnname or mail to be searched. Can contain *
+
+```
+
+## Sample
 
 I find useful to add an alias in my ~/.bash_aliases
 
@@ -61,11 +92,9 @@ msad --out_format csv --attributes samaccountname,mail,sn,givenName group_flat_m
 
 ## License
 
-Copyright © 2021 Matteo Redaelli
+Copyright © 2021 2022 Matteo Redaelli
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
-
-

msad-0.3.2/pyproject.toml

@@ -0,0 +1,28 @@
+[project]
+name = "msad"
+version = "0.3.2"
+authors = [
+  { name="Matteo Redaelli", email="matteo.redaelli@gmail.com" },
+]
+description = "msad is a commandline for interacting with Active Directory"
+readme = "README.md"
+requires-python = ">=3.9"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+]
+license = "GPL-3.0-or-later"
+#license = {file = "LICENSE"}
+license-files = ["LICENSE"]
+#license-expression = "*"
+
+[project.urls]
+Homepage = "https://github.com/matteoredaelli/msad"
+Issues = "https://github.com/matteoredaelli/msad/issues"
+
+[project.scripts]
+msad = "msad:command_line"
+
+[build-system]
+requires = ["hatchling >= 1.26"]
+build-backend = "hatchling.build"

msad-0.3.2/requirements.txt

@@ -0,0 +1,4 @@
+ldap3
+gssapi
+cryptography
+fire

{msad-0.2.1 → msad-0.3.2/src}/msad/command_line.py

@@ -75,7 +75,8 @@ class AD:
     add/remove members to/from groups,
     change password
     check if a user is locked, disabled
-    check if a user's password is expired"""
+    check if a user's password is expired
+    ..."""
 
     def __init__(
         self,
@@ -94,7 +95,9 @@ class AD:
         try:
             self._conn = _get_connection(host, port, use_ssl, sso, user, password)
         except:
-            logging.error("Cannot loging to Active Directory. Bye")
+            logging.error(
+                f"Cannot login to Active Directory (host: {host}, port: {port}). Bye"
+            )
             sys.exit(1)
         self._attributes = attributes
         self._sep = sep
@@ -158,6 +161,9 @@ class AD:
         """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)
@@ -241,6 +247,10 @@ BANNER = """
 | |  | | ___) |/ ___ \ | |_| |
 |_|  |_||____//_/   \_\|____/ 
                               
+https://github.com/matteoredaelli/msad
+
+https://pypi.org/project/msad/
+
 """
 
 

{msad-0.2.1 → msad-0.3.2/src}/msad/user.py

@@ -70,24 +70,20 @@ def has_never_expires_password(conn, search_base, user):
     return True if len(result) == 1 else None
 
 
-def password_changed_in_days(conn, search_base, user):
+def password_changed_in_days(conn, search_base, user, limit=1000):
     search_filter = f"(samaccountname={user})"
     result = search(
-        conn, search_base, search_filter, limit=1, attributes=["pwdLastSet"]
+        conn, search_base, search_filter, limit=limit, attributes=["sAMAccountName","pwdLastSet"]
     )
 
     if len(result) == 0:
         return None
-    result = result[0]["pwdLastSet"]
-    logging.info(f"Password changed at {result}")
+
     now = datetime.datetime.now()
+    result = [ {"sAMAccountName": u["sAMAccountName"],
+                "days": (now - u["pwdLastSet"].replace(tzinfo=None)).days} for u in result]
 
-    if result == 0:
-        return True
-    else:
-        delta = now - result.replace(tzinfo=None)
-        days = delta.days
-        return days
+    return result
 
 
 def has_expired_password(conn, search_base, user, max_age):

msad-0.2.1/README.md

@@ -1,54 +0,0 @@
-# msAD
-
-
-msad is a library and command line tool for working with an Active Directory / LDAP server. It can be used for:
-- search objects (users, groups, computers,..)
-- search group members
-- add/remove members to/from AD groups using DN or sAMaccoutName
-- change AD passwords
-- check if a user is disabled or locked, group membership
-
-## Install
-
-```bash
-pip install msad
-```
-
-## Usage
-
-I find useful to add an alias in my ~/.bash_aliases
-
-```bash
-alias msad='/usr/local/bin/msad --host=dmc1it.group.redaelli.org --port=636 --search_base dc=group,dc=redaelli,dc=org'
-```
-
-Retreive info about a user
-
-```bash
-msad check_user matteo 90 \[qliksense_analyzer,qliksense_professional\] 2>/dev/null
-```
-
-```json
-{"is_disabled": false}
-{"is_locked": false}
-{"has_never_expires_password": false}
-{"has_expired_password": false}
-{"membership_qliksense_analyzer": false}
-{"membership_qliksense_professional": true}
-```
-
-Getting nested group members (it is a pages search, it can retreive more than 1000 users)
-
-```bash
-msad --out_format csv --attributes samaccountname,mail,sn,givenName group_flat_members "dc=group,dc=redaelli,dc=org" --group_name "qliksense_admin"
-```
-
-
-## License
-
-Copyright © 2021 Matteo Redaelli
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.

msad-0.2.1/msad.egg-info/SOURCES.txt

@@ -1,16 +0,0 @@
-LICENSE
-README.md
-setup.cfg
-setup.py
-msad/__init__.py
-msad/ad.py
-msad/command_line.py
-msad/group.py
-msad/search.py
-msad/user.py
-msad.egg-info/PKG-INFO
-msad.egg-info/SOURCES.txt
-msad.egg-info/dependency_links.txt
-msad.egg-info/entry_points.txt
-msad.egg-info/requires.txt
-msad.egg-info/top_level.txt

msad-0.2.1/msad.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

msad-0.2.1/msad.egg-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-msad = msad.command_line:main
-

msad-0.2.1/msad.egg-info/requires.txt

@@ -1,2 +0,0 @@
-fire
-ldap3

msad-0.2.1/msad.egg-info/top_level.txt

@@ -1 +0,0 @@
-msad

msad-0.2.1/setup.cfg

@@ -1,8 +0,0 @@
-[metadata]
-description-file = README.md
-license_files = LICENSE
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

msad-0.2.1/setup.py

@@ -1,41 +0,0 @@
-# Copyright (c) 2021 Matteo Redaelli
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import setuptools
-
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-setuptools.setup(
-    name="msad",
-    version="0.2.1",
-    author="Matteo Redaelli",
-    author_email="matteo.redaelli@gmail.com",
-    description="msad is a library and commandline for interacting with Active Directory",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/matteoredaelli/msad",
-    packages=setuptools.find_packages(),
-    license="GPL",
-    entry_points={
-        "console_scripts": ["msad=msad.command_line:main"],
-    },
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "Operating System :: OS Independent",
-    ],
-    install_requires=["ldap3", "fire"],
-    python_requires=">=3.6",
-)