mirror of
https://github.com/ghndrx/prowler.git
synced 2026-02-10 14:55:00 +00:00
fix(findingID): remove duplicate finding IDs (#2890)
This commit is contained in:
@@ -275,7 +275,7 @@ class Test_iam_disable_30_days_credentials_test:
|
||||
result[1].status_extended
|
||||
== f"User {user} has not used access key 1 in the last 30 days (100 days)."
|
||||
)
|
||||
assert result[1].resource_id == user
|
||||
assert result[1].resource_id == user + "/AccessKey1"
|
||||
assert result[1].resource_arn == arn
|
||||
assert result[1].region == AWS_REGION
|
||||
|
||||
@@ -325,7 +325,7 @@ class Test_iam_disable_30_days_credentials_test:
|
||||
result[1].status_extended
|
||||
== f"User {user} has not used access key 2 in the last 30 days (100 days)."
|
||||
)
|
||||
assert result[1].resource_id == user
|
||||
assert result[1].resource_id == user + "/AccessKey2"
|
||||
assert result[1].resource_arn == arn
|
||||
assert result[1].region == AWS_REGION
|
||||
|
||||
@@ -380,7 +380,7 @@ class Test_iam_disable_30_days_credentials_test:
|
||||
result[1].status_extended
|
||||
== f"User {user} has not used access key 1 in the last 30 days (100 days)."
|
||||
)
|
||||
assert result[1].resource_id == user
|
||||
assert result[1].resource_id == user + "/AccessKey1"
|
||||
assert result[1].resource_arn == arn
|
||||
assert result[1].region == AWS_REGION
|
||||
|
||||
@@ -389,7 +389,7 @@ class Test_iam_disable_30_days_credentials_test:
|
||||
result[2].status_extended
|
||||
== f"User {user} has not used access key 2 in the last 30 days (100 days)."
|
||||
)
|
||||
assert result[2].resource_id == user
|
||||
assert result[2].resource_id == user + "/AccessKey2"
|
||||
assert result[2].resource_arn == arn
|
||||
assert result[2].region == AWS_REGION
|
||||
|
||||
|
||||
@@ -275,7 +275,7 @@ class Test_iam_disable_45_days_credentials_test:
|
||||
result[1].status_extended
|
||||
== f"User {user} has not used access key 1 in the last 45 days (100 days)."
|
||||
)
|
||||
assert result[1].resource_id == user
|
||||
assert result[1].resource_id == user + "/AccessKey1"
|
||||
assert result[1].resource_arn == arn
|
||||
assert result[1].region == AWS_REGION
|
||||
|
||||
@@ -325,7 +325,7 @@ class Test_iam_disable_45_days_credentials_test:
|
||||
result[1].status_extended
|
||||
== f"User {user} has not used access key 2 in the last 45 days (100 days)."
|
||||
)
|
||||
assert result[1].resource_id == user
|
||||
assert result[1].resource_id == user + "/AccessKey2"
|
||||
assert result[1].resource_arn == arn
|
||||
assert result[1].region == AWS_REGION
|
||||
|
||||
@@ -380,7 +380,7 @@ class Test_iam_disable_45_days_credentials_test:
|
||||
result[1].status_extended
|
||||
== f"User {user} has not used access key 1 in the last 45 days (100 days)."
|
||||
)
|
||||
assert result[1].resource_id == user
|
||||
assert result[1].resource_id == user + "/AccessKey1"
|
||||
assert result[1].resource_arn == arn
|
||||
assert result[1].region == AWS_REGION
|
||||
assert result[2].status == "FAIL"
|
||||
@@ -388,7 +388,7 @@ class Test_iam_disable_45_days_credentials_test:
|
||||
result[2].status_extended
|
||||
== f"User {user} has not used access key 2 in the last 45 days (100 days)."
|
||||
)
|
||||
assert result[2].resource_id == user
|
||||
assert result[2].resource_id == user + "/AccessKey2"
|
||||
assert result[2].resource_arn == arn
|
||||
assert result[2].region == AWS_REGION
|
||||
|
||||
|
||||
@@ -273,7 +273,7 @@ class Test_iam_disable_90_days_credentials_test:
|
||||
result[1].status_extended
|
||||
== f"User {user} has not used access key 1 in the last 90 days (100 days)."
|
||||
)
|
||||
assert result[1].resource_id == user
|
||||
assert result[1].resource_id == user + "/AccessKey1"
|
||||
assert result[1].resource_arn == arn
|
||||
assert result[1].region == AWS_REGION
|
||||
|
||||
@@ -323,7 +323,7 @@ class Test_iam_disable_90_days_credentials_test:
|
||||
result[1].status_extended
|
||||
== f"User {user} has not used access key 2 in the last 90 days (100 days)."
|
||||
)
|
||||
assert result[1].resource_id == user
|
||||
assert result[1].resource_id == user + "/AccessKey2"
|
||||
assert result[1].resource_arn == arn
|
||||
assert result[1].region == AWS_REGION
|
||||
|
||||
@@ -378,7 +378,7 @@ class Test_iam_disable_90_days_credentials_test:
|
||||
result[1].status_extended
|
||||
== f"User {user} has not used access key 1 in the last 90 days (100 days)."
|
||||
)
|
||||
assert result[1].resource_id == user
|
||||
assert result[1].resource_id == user + "/AccessKey1"
|
||||
assert result[1].resource_arn == arn
|
||||
assert result[1].region == AWS_REGION
|
||||
assert result[2].status == "FAIL"
|
||||
@@ -386,7 +386,7 @@ class Test_iam_disable_90_days_credentials_test:
|
||||
result[2].status_extended
|
||||
== f"User {user} has not used access key 2 in the last 90 days (100 days)."
|
||||
)
|
||||
assert result[2].resource_id == user
|
||||
assert result[2].resource_id == user + "/AccessKey2"
|
||||
assert result[2].resource_arn == arn
|
||||
assert result[2].region == AWS_REGION
|
||||
|
||||
|
||||
@@ -128,7 +128,7 @@ class Test_iam_inline_policy_no_administrative_privileges:
|
||||
assert len(results) == 1
|
||||
assert results[0].region == AWS_REGION
|
||||
assert results[0].resource_arn == group_arn
|
||||
assert results[0].resource_id == group_name
|
||||
assert results[0].resource_id == f"{group_name}/{policy_name}"
|
||||
assert results[0].resource_tags == []
|
||||
assert results[0].status == "FAIL"
|
||||
assert (
|
||||
@@ -172,7 +172,7 @@ class Test_iam_inline_policy_no_administrative_privileges:
|
||||
assert len(results) == 1
|
||||
assert results[0].region == AWS_REGION
|
||||
assert results[0].resource_arn == group_arn
|
||||
assert results[0].resource_id == group_name
|
||||
assert results[0].resource_id == f"{group_name}/{policy_name}"
|
||||
assert results[0].resource_tags == []
|
||||
assert results[0].status == "PASS"
|
||||
assert (
|
||||
@@ -316,7 +316,7 @@ class Test_iam_inline_policy_no_administrative_privileges:
|
||||
assert len(results) == 1
|
||||
assert results[0].region == AWS_REGION
|
||||
assert results[0].resource_arn == role_arn
|
||||
assert results[0].resource_id == role_name
|
||||
assert results[0].resource_id == f"{role_name}/{policy_name}"
|
||||
assert results[0].resource_tags == []
|
||||
assert results[0].status == "FAIL"
|
||||
assert (
|
||||
@@ -363,7 +363,7 @@ class Test_iam_inline_policy_no_administrative_privileges:
|
||||
assert len(results) == 1
|
||||
assert results[0].region == AWS_REGION
|
||||
assert results[0].resource_arn == role_arn
|
||||
assert results[0].resource_id == role_name
|
||||
assert results[0].resource_id == f"{role_name}/{policy_name}"
|
||||
assert results[0].resource_tags == []
|
||||
assert results[0].status == "PASS"
|
||||
assert (
|
||||
@@ -507,7 +507,7 @@ class Test_iam_inline_policy_no_administrative_privileges:
|
||||
assert len(results) == 1
|
||||
assert results[0].region == AWS_REGION
|
||||
assert results[0].resource_arn == user_arn
|
||||
assert results[0].resource_id == user_name
|
||||
assert results[0].resource_id == f"{user_name}/{policy_name}"
|
||||
assert results[0].resource_tags == []
|
||||
assert results[0].status == "FAIL"
|
||||
assert (
|
||||
@@ -553,7 +553,7 @@ class Test_iam_inline_policy_no_administrative_privileges:
|
||||
assert len(results) == 1
|
||||
assert results[0].region == AWS_REGION
|
||||
assert results[0].resource_arn == user_arn
|
||||
assert results[0].resource_id == user_name
|
||||
assert results[0].resource_id == f"{user_name}/{policy_name}"
|
||||
assert results[0].resource_tags == []
|
||||
assert results[0].status == "PASS"
|
||||
assert (
|
||||
|
||||
@@ -83,7 +83,7 @@ class Test_iam_policy_attached_only_to_group_or_roles:
|
||||
== f"User {user} has the policy {policy_name} attached."
|
||||
)
|
||||
assert result[0].region == AWS_REGION
|
||||
assert result[0].resource_id == user
|
||||
assert result[0].resource_id == f"{user}/{policy_name}"
|
||||
assert (
|
||||
result[0].resource_arn
|
||||
== f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:user/{user}"
|
||||
@@ -133,7 +133,7 @@ class Test_iam_policy_attached_only_to_group_or_roles:
|
||||
== f"User {user} has the policy {policyName} attached."
|
||||
)
|
||||
assert result[0].region == AWS_REGION
|
||||
assert result[0].resource_id == user
|
||||
assert result[0].resource_id == f"{user}/{policyName}"
|
||||
|
||||
assert result[0].status == "FAIL"
|
||||
assert (
|
||||
@@ -141,7 +141,7 @@ class Test_iam_policy_attached_only_to_group_or_roles:
|
||||
== f"User {user} has the policy {policyName} attached."
|
||||
)
|
||||
assert result[0].region == AWS_REGION
|
||||
assert result[0].resource_id == user
|
||||
assert result[0].resource_id == f"{user}/{policyName}"
|
||||
assert (
|
||||
result[0].resource_arn
|
||||
== f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:user/{user}"
|
||||
@@ -186,7 +186,7 @@ class Test_iam_policy_attached_only_to_group_or_roles:
|
||||
== f"User {user} has the inline policy {policyName} attached."
|
||||
)
|
||||
assert result[0].region == AWS_REGION
|
||||
assert result[0].resource_id == user
|
||||
assert result[0].resource_id == f"{user}/{policyName}"
|
||||
assert (
|
||||
result[0].resource_arn
|
||||
== f"arn:aws:iam::{AWS_ACCOUNT_NUMBER}:user/{user}"
|
||||
|
||||
@@ -165,7 +165,10 @@ class Test_route53_dangling_ip_subdomain_takeover:
|
||||
"is not a dangling IP",
|
||||
result[0].status_extended,
|
||||
)
|
||||
assert result[0].resource_id == zone_id.replace("/hostedzone/", "")
|
||||
assert (
|
||||
result[0].resource_id
|
||||
== zone_id.replace("/hostedzone/", "") + "/192.168.1.1"
|
||||
)
|
||||
assert (
|
||||
result[0].resource_arn
|
||||
== f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/','')}"
|
||||
@@ -226,7 +229,10 @@ class Test_route53_dangling_ip_subdomain_takeover:
|
||||
"does not belong to AWS and it is not a dangling IP",
|
||||
result[0].status_extended,
|
||||
)
|
||||
assert result[0].resource_id == zone_id.replace("/hostedzone/", "")
|
||||
assert (
|
||||
result[0].resource_id
|
||||
== zone_id.replace("/hostedzone/", "") + "/17.5.7.3"
|
||||
)
|
||||
assert (
|
||||
result[0].resource_arn
|
||||
== f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/','')}"
|
||||
@@ -287,7 +293,10 @@ class Test_route53_dangling_ip_subdomain_takeover:
|
||||
"is a dangling IP",
|
||||
result[0].status_extended,
|
||||
)
|
||||
assert result[0].resource_id == zone_id.replace("/hostedzone/", "")
|
||||
assert (
|
||||
result[0].resource_id
|
||||
== zone_id.replace("/hostedzone/", "") + "/54.152.12.70"
|
||||
)
|
||||
assert (
|
||||
result[0].resource_arn
|
||||
== f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/','')}"
|
||||
@@ -351,7 +360,10 @@ class Test_route53_dangling_ip_subdomain_takeover:
|
||||
"is not a dangling IP",
|
||||
result[0].status_extended,
|
||||
)
|
||||
assert result[0].resource_id == zone_id.replace("/hostedzone/", "")
|
||||
assert (
|
||||
result[0].resource_id
|
||||
== zone_id.replace("/hostedzone/", "") + "/17.5.7.3"
|
||||
)
|
||||
assert (
|
||||
result[0].resource_arn
|
||||
== f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/','')}"
|
||||
@@ -421,7 +433,10 @@ class Test_route53_dangling_ip_subdomain_takeover:
|
||||
"is not a dangling IP",
|
||||
result[0].status_extended,
|
||||
)
|
||||
assert result[0].resource_id == zone_id.replace("/hostedzone/", "")
|
||||
assert (
|
||||
result[0].resource_id
|
||||
== zone_id.replace("/hostedzone/", "") + "/17.5.7.3"
|
||||
)
|
||||
assert (
|
||||
result[0].resource_arn
|
||||
== f"arn:{audit_info.audited_partition}:route53:::hostedzone/{zone_id.replace('/hostedzone/','')}"
|
||||
|
||||
Reference in New Issue
Block a user