Merge pull request #46 from PaperMtn/develop

Develop

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [4.0.1] - 2023-05-05
+### Changed
+- User output in stdout logging now includes display name and email. The accounts for cases where usernames are nonsensical.
+
 ## [4.0.0] - 2023-05-03
 This major version release brings multiple updates to Slack Watchman in usability, functionality and behind the scenes improvements.
 

src/slack_watchman/__init__.py

@@ -268,8 +268,8 @@ def main():
             OUTPUT_LOGGER.log('SUCCESS', 'Successfully authenticated using cookie')
             OUTPUT_LOGGER.log('SUCCESS', f"This user's SESSION_TOKEN: {slack_con.session_token}")
         OUTPUT_LOGGER.log('SUCCESS',
-                          f'You are authenticated to this workspace as: USER: {auth_data.get("user")}'
-                          f' ID: {auth_data.get("user_id")}')
+                          f'You are authenticated to this workspace as: USER: {calling_user.display_name} '
+                          f'- {calling_user.email} ID: {calling_user.id}')
         OUTPUT_LOGGER.log('USER', calling_user, detect_type='User', notify_type='user')
         OUTPUT_LOGGER.log('WORKSPACE', workspace_information, detect_type='Workspace', notify_type='workspace')
 

src/slack_watchman/__version__.py

@@ -25,7 +25,7 @@
 ]
 
 __title__ = 'Slack Watchman'
-__version__ = '4.0.0'
+__version__ = '4.0.1'
 __summary__ = 'Monitoring and enumerating Slack for exposed secrets'
 __author__ = 'PaperMtn'
 __email__ = '[email protected]'

src/slack_watchman/models/user.py

@@ -56,6 +56,7 @@ class UserSuccinct(object):
     id: str
     name: str
     email: str
+    display_name: str
     has_2fa: str
     is_admin: str
 
@@ -101,6 +102,7 @@ def create_from_dict(user_dict: Dict,
         return UserSuccinct(
             id=user_dict.get('id'),
             name=user_dict.get('name'),
+            display_name=user_dict.get('profile').get('display_name'),
             has_2fa=user_dict.get('has_2fa'),
             is_admin=user_dict.get('is_admin'),
             email=user_dict.get('profile').get('email')

src/slack_watchman/sw_logger.py

@@ -42,7 +42,7 @@ def log(self,
         if notify_type == "user":
             message = f'USER: \n' \
                       f'    ID: {message.get("id")}  \n' \
-                      f'    NAME: {message.get("name")}  \n' \
+                      f'    NAME: {message.get("display_name")}  \n' \
                       f'    EMAIL: {message.get("email")}  \n' \
                       f'    JOB_TITLE: {message.get("title")} \n' \
                       f'    ADMIN: {message.get("is_admin")} \n' \
@@ -59,7 +59,8 @@ def log(self,
                     conversation_type = 'Public Channel'
 
                 if isinstance(message.get('message').get('user'), Mapping):
-                    user = message.get('message', {}).get('user', {}).get('email')
+                    user = f"{message.get('message', {}).get('user', {}).get('display_name')} -" \
+                           f" {message.get('message', {}).get('user', {}).get('email')}"
                 else:
                     user = message.get('message').get('user')
 
@@ -74,7 +75,8 @@ def log(self,
 
             elif message.get('file'):
                 message = 'POST_TYPE: File' \
-                          f'    POSTED_BY: {message.get("user").get("email")}' \
+                          f'    POSTED_BY: {message.get("user", {}).get("display_name")} ' \
+                                f'- {message.get("user").get("email")}' \
                           f'    CREATED: {message.get("file").get("created")} \n' \
                           f'    FILE_NAME: {message.get("file").get("name")} \n' \
                           f'    PRIVATE_URL: {message.get("file").get("url_private_download")} \n' \