diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/UsedCredentials.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/UsedCredentials.js
new file mode 100644
index 000000000..7a5becde7
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/security/UsedCredentials.js
@@ -0,0 +1,40 @@
+import {getAllUsernames, getAllSecrets} from '../credentialParsing';
+import React from 'react';
+
+class UsedCredentials extends React.Component {
+ constructor(props) {
+ super(props);
+ }
+
+
+ render() {
+ let allUsernames = getAllUsernames(this.props.stolen, this.props.configured);
+ let allSecrets = getAllSecrets(this.props.stolen, this.props.configured);
+ return (
+ allUsernames.length > 0 ?
+ <>
+
+ Usernames used for brute-forcing:
+
+
+ {allUsernames.map(x => - {x}
)}
+
+
+ Credentials used for brute-forcing:
+
+
+ {allSecrets.map((x, index) => - {x['type']}: {x['content'].substr(0, 3) + '******'}
)}
+
+
+ :
+
+ No credentials were used.
+
+ )
+
+ }
+
+}
+
+export default UsedCredentials;
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/security/issues/WeakPasswordIssue.js b/monkey/monkey_island/cc/ui/src/components/report-components/security/issues/WeakPasswordIssue.js
deleted file mode 100644
index ee3c6c04f..000000000
--- a/monkey/monkey_island/cc/ui/src/components/report-components/security/issues/WeakPasswordIssue.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-
-export function weakPasswordIssueOverview() {
- return (
Machines are accessible using passwords supplied by the user during the Monkey’s
- configuration.)
-}
diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/reporting/test_format_credentials.py b/monkey/tests/unit_tests/monkey_island/cc/services/reporting/test_format_credentials.py
new file mode 100644
index 000000000..bb51b89dd
--- /dev/null
+++ b/monkey/tests/unit_tests/monkey_island/cc/services/reporting/test_format_credentials.py
@@ -0,0 +1,69 @@
+from common.credentials import (
+ CredentialComponentType,
+ Credentials,
+ LMHash,
+ NTHash,
+ Password,
+ SSHKeypair,
+ Username,
+)
+from monkey_island.cc.services.reporting import format_creds_for_reporting
+
+monkey_hostname = "fake_hostname"
+fake_monkey_guid = "abc"
+
+fake_username = Username("m0nk3y_user")
+fake_nt_hash = NTHash("AEBD4DE384C7EC43AAD3B435B51404EE")
+fake_lm_hash = LMHash("7A21990FCD3D759941E45C490F143D5F")
+fake_password = Password("trytostealthis")
+fake_ssh_public_key = "RSA_public_key"
+fake_ssh_private_key = "RSA_private_key"
+fake_ssh_key = SSHKeypair(fake_ssh_private_key, fake_ssh_public_key)
+
+identities = (fake_username,)
+secrets = (fake_nt_hash, fake_lm_hash, fake_password, fake_ssh_key)
+
+fake_credentials = [
+ Credentials(fake_username, fake_nt_hash),
+ Credentials(fake_username, fake_lm_hash),
+ Credentials(fake_username, fake_password),
+ Credentials(fake_username, fake_ssh_key),
+ Credentials(None, fake_ssh_key),
+ Credentials(fake_username, None),
+]
+
+
+def test_formatting_credentials_for_report():
+
+ credentials = format_creds_for_reporting(fake_credentials)
+
+ result1 = {
+ "_type": CredentialComponentType.NT_HASH.name,
+ "type": "NTLM hash",
+ "username": fake_username.username,
+ }
+ result2 = {
+ "_type": CredentialComponentType.LM_HASH.name,
+ "type": "LM hash",
+ "username": fake_username.username,
+ }
+ result3 = {
+ "_type": CredentialComponentType.PASSWORD.name,
+ "type": "Clear Password",
+ "username": fake_username.username,
+ }
+ result4 = {
+ "_type": CredentialComponentType.SSH_KEYPAIR.name,
+ "type": "Clear SSH private key",
+ "username": fake_username.username,
+ }
+ result5 = {
+ "_type": CredentialComponentType.SSH_KEYPAIR.name,
+ "type": "Clear SSH private key",
+ "username": "",
+ }
+ assert result1 in credentials
+ assert result2 in credentials
+ assert result3 in credentials
+ assert result4 in credentials
+ assert result5 in credentials
diff --git a/monkey/tests/unit_tests/monkey_island/cc/services/reporting/test_stolen_credentials.py b/monkey/tests/unit_tests/monkey_island/cc/services/reporting/test_stolen_credentials.py
deleted file mode 100644
index d7c2386c9..000000000
--- a/monkey/tests/unit_tests/monkey_island/cc/services/reporting/test_stolen_credentials.py
+++ /dev/null
@@ -1,97 +0,0 @@
-import pytest
-
-from common.credentials import CredentialComponentType
-from monkey_island.cc.models import Monkey, StolenCredentials
-from monkey_island.cc.services.reporting.stolen_credentials import (
- extract_ssh_keys,
- get_stolen_creds,
-)
-
-monkey_hostname = "fake_hostname"
-fake_monkey_guid = "abc"
-
-fake_username = "m0nk3y_user"
-fake_nt_hash = "c1c58f96cdf212b50837bc11a00be47c"
-fake_lm_hash = "299BD128C1101FD6"
-fake_password = "trytostealthis"
-fake_ssh_key = "RSA_fake_key"
-fake_credentials = {
- "identities": [{"username": fake_username, "credential_type": "USERNAME"}],
- "secrets": [
- CredentialComponentType.NT_HASH.name,
- CredentialComponentType.LM_HASH.name,
- CredentialComponentType.PASSWORD.name,
- CredentialComponentType.SSH_KEYPAIR.name,
- ],
-}
-
-
-@pytest.fixture
-def fake_monkey():
- monkey = Monkey()
- monkey.guid = fake_monkey_guid
- monkey.hostname = monkey_hostname
- monkey.save()
- return monkey.id
-
-
-@pytest.mark.usefixtures("uses_database")
-def test_get_credentials(fake_monkey):
- StolenCredentials(
- identities=fake_credentials["identities"],
- secrets=fake_credentials["secrets"],
- monkey=fake_monkey,
- ).save()
-
- credentials = get_stolen_creds()
-
- result1 = {
- "origin": monkey_hostname,
- "_type": CredentialComponentType.NT_HASH.name,
- "type": "NTLM hash",
- "username": fake_username,
- }
- result2 = {
- "origin": monkey_hostname,
- "_type": CredentialComponentType.LM_HASH.name,
- "type": "LM hash",
- "username": fake_username,
- }
- result3 = {
- "origin": monkey_hostname,
- "_type": CredentialComponentType.PASSWORD.name,
- "type": "Clear Password",
- "username": fake_username,
- }
- result4 = {
- "origin": monkey_hostname,
- "_type": CredentialComponentType.SSH_KEYPAIR.name,
- "type": "Clear SSH private key",
- "username": fake_username,
- }
- assert result1 in credentials
- assert result2 in credentials
- assert result3 in credentials
- assert result4 in credentials
-
-
-@pytest.mark.usefixtures("uses_database")
-def test_extract_ssh_keys(fake_monkey):
- StolenCredentials(
- identities=fake_credentials["identities"],
- secrets=fake_credentials["secrets"],
- monkey=fake_monkey,
- ).save()
-
- credentials = get_stolen_creds()
- keys = extract_ssh_keys(credentials)
-
- assert len(keys) == 1
-
- result = {
- "origin": monkey_hostname,
- "_type": CredentialComponentType.SSH_KEYPAIR.name,
- "type": "Clear SSH private key",
- "username": fake_username,
- }
- assert result in keys