From 75dddb08619aab8da99939546d0c8e5403d65d64 Mon Sep 17 00:00:00 2001 From: Shreya Malviya Date: Thu, 15 Sep 2022 14:07:18 +0530 Subject: [PATCH] BB: Remove usage of CredentialComponentType in Zerologon analyzer --- envs/monkey_zoo/blackbox/analyzers/zerologon_analyzer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/envs/monkey_zoo/blackbox/analyzers/zerologon_analyzer.py b/envs/monkey_zoo/blackbox/analyzers/zerologon_analyzer.py index d7ea0744d..40905a28c 100644 --- a/envs/monkey_zoo/blackbox/analyzers/zerologon_analyzer.py +++ b/envs/monkey_zoo/blackbox/analyzers/zerologon_analyzer.py @@ -1,7 +1,7 @@ from pprint import pformat from typing import List -from common.credentials import CredentialComponentType, Credentials +from common.credentials import Credentials, LMHash, NTHash, Username from envs.monkey_zoo.blackbox.analyzers.analyzer import Analyzer from envs.monkey_zoo.blackbox.analyzers.analyzer_log import AnalyzerLog from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient @@ -36,11 +36,11 @@ class ZerologonAnalyzer(Analyzer): credentials_on_island = set() for credentials in propagation_credentials: - if credentials.identity.credential_type is CredentialComponentType.USERNAME: + if isinstance(credentials.identity, Username): credentials_on_island.update([credentials.identity.username]) - if credentials.secret.credential_type is CredentialComponentType.NT_HASH: + if isinstance(credentials.secret, NTHash): credentials_on_island.update([credentials.secret.nt_hash]) - if credentials.secret.credential_type is CredentialComponentType.LM_HASH: + if isinstance(credentials.secret, LMHash): credentials_on_island.update([credentials.secret.lm_hash]) return list(credentials_on_island)