Skip to content

Commit 1884874

Browse files
sapasapasapadanibarranqueroo
sapasapasapa
and
danibarranqueroo
authored
fix: typo ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_* CheckID (#8294)
Co-authored-by: Daniel Barranquero <danielbo2001@gmail.com>
1 parent cd6d29e commit 1884874

File tree

9 files changed

+75
-66
lines changed

9 files changed

+75
-66
lines changed

‎prowler/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ All notable changes to the **Prowler SDK** are documented in this file.
1515
- Send finding in Jira integration with the needed values [(#8648)](https://github.com/prowler-cloud/prowler/pull/8648)
1616

1717
### Changed
18+
- Rename ftp and mongo checks to follow pattern `ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_*` [(#8293)](https://github.com/prowler-cloud/prowler/pull/8293)
1819

1920
### Fixed
2021
- Renamed `AdditionalUrls` to `AdditionalURLs` field in CheckMetadata [(#8639)](https://github.com/prowler-cloud/prowler/pull/8639)

prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018/__init__.py renamed to prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21/__init__.py

File renamed without changes.

prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.metadata.json renamed to prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.metadata.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"Provider": "aws",
3-
"CheckID": "ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21",
3+
"CheckID": "ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21",
44
"CheckTitle": "Ensure no security groups allow ingress from 0.0.0.0/0 or ::/0 to FTP ports 20 or 21.",
5+
"CheckAliases": [
6+
"ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21"
7+
],
58
"CheckType": [
69
"Infrastructure Security"
710
],

prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.py renamed to prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from prowler.providers.aws.services.vpc.vpc_client import vpc_client
88

99

10-
class ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21(Check):
10+
class ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21(Check):
1111
def execute(self):
1212
findings = []
1313
check_ports = [20, 21]

prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21/__init__.py renamed to prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mongodb_27017_27018/__init__.py

File renamed without changes.

prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.metadata.json renamed to prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mongodb_27017_27018/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mongodb_27017_27018.metadata.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"Provider": "aws",
3-
"CheckID": "ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018",
3+
"CheckID": "ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mongodb_27017_27018",
44
"CheckTitle": "Ensure no security groups allow ingress from 0.0.0.0/0 or ::/0 to MongoDB ports 27017 and 27018.",
5+
"CheckAliases": [
6+
"ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018"
7+
],
58
"CheckType": [
69
"Infrastructure Security"
710
],

prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018/ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018.py renamed to prowler/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mongodb_27017_27018/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mongodb_27017_27018.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
from prowler.providers.aws.services.vpc.vpc_client import vpc_client
88

99

10-
class ec2_securitygroup_allow_ingress_from_internet_to_port_mongodb_27017_27018(Check):
10+
class ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_mongodb_27017_27018(
11+
Check
12+
):
1113
def execute(self):
1214
findings = []
1315
check_ports = [27017, 27018]

tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21_test.py renamed to tests/providers/aws/services/ec2/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21/ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21_test.py

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
)
1111

1212

13-
class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21:
13+
class Test_ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21:
1414
@mock_aws
1515
def test_ec2_default_sgs(self):
1616
# Create EC2 Mocked Resources
@@ -30,21 +30,21 @@ def test_ec2_default_sgs(self):
3030
return_value=aws_provider,
3131
),
3232
mock.patch(
33-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client",
33+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_client",
3434
new=EC2(aws_provider),
3535
),
3636
mock.patch(
37-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client",
37+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.vpc_client",
3838
new=VPC(aws_provider),
3939
),
4040
):
4141
# Test Check
42-
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import (
43-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21,
42+
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21 import (
43+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21,
4444
)
4545

4646
check = (
47-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21()
47+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21()
4848
)
4949
result = check.execute()
5050

@@ -90,21 +90,21 @@ def test_ec2_non_compliant_default_sg(self):
9090
return_value=aws_provider,
9191
),
9292
mock.patch(
93-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client",
93+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_client",
9494
new=EC2(aws_provider),
9595
),
9696
mock.patch(
97-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client",
97+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.vpc_client",
9898
new=VPC(aws_provider),
9999
),
100100
):
101101
# Test Check
102-
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import (
103-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21,
102+
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21 import (
103+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21,
104104
)
105105

106106
check = (
107-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21()
107+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21()
108108
)
109109
result = check.execute()
110110

@@ -161,21 +161,21 @@ def test_ec2_compliant_default_sg(self):
161161
return_value=aws_provider,
162162
),
163163
mock.patch(
164-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client",
164+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_client",
165165
new=EC2(aws_provider),
166166
),
167167
mock.patch(
168-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client",
168+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.vpc_client",
169169
new=VPC(aws_provider),
170170
),
171171
):
172172
# Test Check
173-
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import (
174-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21,
173+
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21 import (
174+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21,
175175
)
176176

177177
check = (
178-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21()
178+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21()
179179
)
180180
result = check.execute()
181181

@@ -217,21 +217,21 @@ def test_ec2_default_sgs_ignoring(self):
217217
return_value=aws_provider,
218218
),
219219
mock.patch(
220-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client",
220+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_client",
221221
new=EC2(aws_provider),
222222
),
223223
mock.patch(
224-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client",
224+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.vpc_client",
225225
new=VPC(aws_provider),
226226
),
227227
):
228228
# Test Check
229-
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import (
230-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21,
229+
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21 import (
230+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21,
231231
)
232232

233233
check = (
234-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21()
234+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21()
235235
)
236236
result = check.execute()
237237

@@ -264,21 +264,21 @@ def test_ec2_default_sgs_ignoring_vpc_in_use(self):
264264
return_value=aws_provider,
265265
),
266266
mock.patch(
267-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client",
267+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_client",
268268
new=EC2(aws_provider),
269269
),
270270
mock.patch(
271-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client",
271+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.vpc_client",
272272
new=VPC(aws_provider),
273273
),
274274
):
275275
# Test Check
276-
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import (
277-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21,
276+
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21 import (
277+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21,
278278
)
279279

280280
check = (
281-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21()
281+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21()
282282
)
283283
result = check.execute()
284284

@@ -354,21 +354,21 @@ def test_ec2_non_compliant_default_sg_pass_to_avoid_fail_twice(self):
354354
# use the same mock objects for the specific port check
355355
with (
356356
mock.patch(
357-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_client",
357+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_client",
358358
new=ec2_client_instance,
359359
),
360360
mock.patch(
361-
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.vpc_client",
361+
"prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.vpc_client",
362362
new=vpc_client_instance,
363363
),
364364
):
365365
# Now run the specific port check
366-
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21 import (
367-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21,
366+
from prowler.providers.aws.services.ec2.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21.ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21 import (
367+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21,
368368
)
369369

370370
check_specific_port = (
371-
ec2_securitygroup_allow_ingress_from_internet_to_tcp_ftp_port_20_21()
371+
ec2_securitygroup_allow_ingress_from_internet_to_tcp_port_ftp_20_21()
372372
)
373373
result_specific_port = check_specific_port.execute()
374374

0 commit comments

Comments
 (0)