diff --git a/MDE2TEAMS/MDEAPI/list.py b/MDE2TEAMS/MDEAPI/list.py index 352bc43..49908fd 100644 --- a/MDE2TEAMS/MDEAPI/list.py +++ b/MDE2TEAMS/MDEAPI/list.py @@ -14,9 +14,6 @@ class List: 'Accept' : 'application/json', 'Authorization' : "Bearer " + self.token } - - - req = urllib.request.Request(url, headers=headers) response = urllib.request.urlopen(req) self.jsonResponse = json.loads(response.read()) diff --git a/MDE2TEAMS/app.py b/MDE2TEAMS/app.py index 8504f8f..5e75915 100644 --- a/MDE2TEAMS/app.py +++ b/MDE2TEAMS/app.py @@ -6,7 +6,7 @@ from MDEAPI import list from TEAMS import send2teams #menu argparser -parser = argparse.ArgumentParser(description='MDE4Teams = A tool to track MDE events in Teams', epilog='Original project created by Bruno Rodrigues - rodrigues.bruno@microsoft.com') +parser = argparse.ArgumentParser(prog='app.py', description='MDE4Teams = A tool to track MDE events in Teams', epilog='Original project created by Bruno Rodrigues - rodrigues.bruno@microsoft.com') parser.add_argument('list', choices=['alerts', 'investigations', 'indicators', 'machines', 'machineactions', 'recommendations', 'Software', 'vulnerabilities'], help='Select which notifications to List in Teams') args = parser.parse_args() @@ -33,7 +33,7 @@ try: except Exception as e: print(e) -#Loop - keep running +#infinite loop while True: try: new_events = list.List(token, f'{args.list}') @@ -42,17 +42,16 @@ while True: if events_list == baseline_list: print(f'No new {args.list}') else: - diff = [i for i in events_list if i not in baseline_list] - message = f'{args.list} - {str(diff)}' - new_message_teams = send2teams.Send2teams(webhook, message) - new_message_teams.send2teams() - print(f'{args.list} sent to Teams') - update_baseline = list.List(token, f'{args.list}') - update_baseline.list() - baseline_list = update_baseline.jsonResponse['value'] + for dict in events_list: + if dict not in baseline_list: + new_teams_message = send2teams.Send2teams(webhook, dict) + new_teams_message.send2teams() + print('Message sent to Teams Channel') + update_baseline = list.List(token, f'{args.list}') + update_baseline.list() + baseline_list = update_baseline.jsonResponse['value'] local_time = time.ctime() print(local_time) time.sleep(120) except Exception as e: - print(e) - \ No newline at end of file + print(e) \ No newline at end of file