Added slack msg limits

hawk_scanner/commands/slack.py

@@ -1,4 +1,5 @@
-import re
+import time
+from datetime import datetime
 from slack_sdk import WebClient
 from slack_sdk.errors import SlackApiError
 from hawk_scanner.internals import system
@@ -21,32 +22,54 @@ def connect_slack(args, token):
         system.print_error(args, f"Failed to connect to Slack with error: {e.response['error']}")
         return None
 
-def check_slack_messages(args, client, patterns, profile_name, channel_types, channel_names=None):
+def check_slack_messages(args, client, patterns, profile_name, channel_types, channel_ids=None, limit_mins=60):
     results = []
     try:
         team_info = client.team_info()
         workspace_url = team_info["team"]["url"].rstrip('/')
+
+        # Get the Unix timestamp for 'limit_mins' minutes ago
+        current_time = time.time()
+        oldest_time = current_time - (limit_mins * 60)
+
+        # Convert to human-readable time for debugging
+        current_time_readable = datetime.fromtimestamp(current_time).strftime('%Y-%m-%d %H:%M:%S')
+        oldest_time_readable = datetime.fromtimestamp(oldest_time).strftime('%Y-%m-%d %H:%M:%S')
+
+        system.print_info(args, f"Current Time: {current_time_readable}")
+        system.print_info(args, f"Fetching messages from the last {limit_mins} minutes (Oldest Time: {oldest_time_readable}, Unix: {int(oldest_time)})")
+
         # Get all channels of specified types
-        channels = client.conversations_list(types=channel_types)["channels"]
+        channels = []
+        if not channel_ids:
+            system.print_info("Getting all channels because no channel_ids provided")
+            channels = client.conversations_list(types=channel_types)["channels"]
+        else:
+            system.print_info(args, "Getting channels by channel_ids")
+            for channel_id in channel_ids:
+                try:
+                    channel = client.conversations_info(channel=channel_id)["channel"]
+                    channels.append(channel)
+                except SlackApiError as e:
+                    system.print_error(args, f"Failed to fetch channel with id {channel_id} with error: {e.response['error']}")
 
-        # Filter channels by names if provided
-        if channel_names:
-            channels = [channel for channel in channels if channel['name'] in channel_names]
-
         system.print_info(args, f"Found {len(channels)} channels of type {channel_types}")
         system.print_info(args, f"Checking messages in channels: {', '.join([channel['name'] for channel in channels])}")
-        
+
         for channel in channels:
             channel_name = channel["name"]
             channel_id = channel["id"]
 
-            # Get messages from the channel
+            # Get messages from the channel within the time range
             system.print_info(args, f"Checking messages in channel {channel_name} ({channel_id})")
-            messages = client.conversations_history(channel=channel_id)["messages"]
+            messages = client.conversations_history(channel=channel_id, oldest=oldest_time)["messages"]
 
             for message in messages:
                 user = message.get("user", "")
                 text = message.get("text")
+                message_ts = message.get("ts")
+
+                # Check main message for matches
                 if text:
                     matches = system.match_strings(args, text)
                     if matches:
@@ -59,10 +82,42 @@ def check_slack_messages(args, client, patterns, profile_name, channel_types, ch
                                 'matches': list(set(match['matches'])),
                                 'sample_text': match['sample_text'],
                                 'profile': profile_name,
-                                'message_link': workspace_url + f"/archives/{channel_id}/p{message['ts'].replace('.', '')}",
+                                'message_link': workspace_url + f"/archives/{channel_id}/p{message_ts.replace('.', '')}",
                                 'data_source': 'slack'
                             })
+
+                # Check for replies (threads)
+                if "thread_ts" in message:
+                    thread_ts = message["thread_ts"]
+
+                    # Fetch replies for the thread
+                    replies = client.conversations_replies(channel=channel_id, ts=thread_ts, oldest=oldest_time)["messages"]
+
+                    # Exclude parent message and check replies
+                    for reply in replies:
+                        if reply["ts"] != thread_ts:  # Skip the parent message
+                            reply_user = reply.get("user", "")
+                            reply_text = reply.get("text")
+                            reply_ts = reply.get("ts")
+
+                            if reply_text:
+                                reply_matches = system.match_strings(args, reply_text)
+                                if reply_matches:
+                                    for match in reply_matches:
+                                        results.append({
+                                            'channel_id': channel_id,
+                                            'channel_name': channel_name,
+                                            'user': reply_user,
+                                            'pattern_name': match['pattern_name'],
+                                            'matches': list(set(match['matches'])),
+                                            'sample_text': match['sample_text'],
+                                            'profile': profile_name,
+                                            'message_link': workspace_url + f"/archives/{channel_id}/p{reply_ts.replace('.', '')}",
+                                            'data_source': 'slack'
+                                        })
+
         return results
+
     except SlackApiError as e:
         system.print_error(args, f"Failed to fetch messages from Slack with error: {e.response['error']}")
         return results
@@ -82,7 +137,8 @@ def execute(args):
             for key, config in slack_config.items():
                 token = config.get('token')
                 channel_types = config.get('channel_types', "public_channel,private_channel")
-                channel_names = config.get('channel_names', None)
+                channel_ids = config.get('channel_ids', [])
+                limit_mins = config.get('limit_mins', 60)
 
                 if token:
                     system.print_info(args, f"Checking Slack Profile {key}")
@@ -92,7 +148,7 @@ def execute(args):
 
                 client = connect_slack(args, token)
                 if client:
-                    results += check_slack_messages(args, client, patterns, key, channel_types, channel_names)
+                    results += check_slack_messages(args, client, patterns, key, channel_types, channel_ids, limit_mins)
         else:
             system.print_error(args, "No Slack connection details found in connection.yml")
     else:

hawk_scanner/main.py

@@ -11,6 +11,10 @@
 from collections import defaultdict
 from hawk_scanner.internals import system
 from rich import print
+import ssl
+
+# Disable SSL verification globally
+ssl._create_default_https_context = ssl._create_unverified_context
 
 def clear_screen():
     os.system('cls' if os.name == 'nt' else 'clear')

setup.py

@@ -1,4 +1,4 @@
-VERSION = "0.3.22"
+VERSION = "0.3.23"
 
 from setuptools import setup, find_packages