Skip to content

Commit

Permalink
Apply our Terraform alphabetization standards to files touched in PR #…
Browse files Browse the repository at this point in the history 
…247
  • Loading branch information
@dav3r
dav3r committed Aug 20, 2024
1 parent d2d62fc commit a3314c3
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion gophish_sg.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ resource "aws_security_group_rule" "ingress_from_teamserver_to_gophish_via_ssh_a

# Allow ingress from anywhere via the allowed ports
resource "aws_security_group_rule" "ingress_from_anywhere_to_gophish_via_allowed_ports" {
provider = aws.provisionassessment
# for_each will only accept a map or a list of strings, so we have
# to do a little finagling to get the list of port objects into an
# acceptable form.
for_each = { for d in var.inbound_ports_allowed["gophish"] : format("%s_%d_%d", d.protocol, d.from_port, d.to_port) => d }
provider = aws.provisionassessment

cidr_blocks = ["0.0.0.0/0"]
from_port = each.value["from_port"]
Expand Down
36 changes: 18 additions & 18 deletions kali_sg.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,20 @@ resource "aws_security_group_rule" "kali_egress_to_nessus_via_web_ui" {
provider = aws.provisionassessment

from_port = 8834
protocol = "tcp"
security_group_id = aws_security_group.kali.id
source_security_group_id = aws_security_group.nessus.id
protocol = "tcp"
to_port = 8834
type = "egress"
}

# Allow ingress from anywhere via the allowed ports
resource "aws_security_group_rule" "ingress_from_anywhere_to_kali_via_allowed_ports" {
provider = aws.provisionassessment
# for_each will only accept a map or a list of strings, so we have
# to do a little finagling to get the list of port objects into an
# acceptable form.
for_each = { for d in var.inbound_ports_allowed["kali"] : format("%s_%d_%d", d.protocol, d.from_port, d.to_port) => d }
provider = aws.provisionassessment

security_group_id = aws_security_group.kali.id
type = "ingress"
Expand All @@ -81,50 +81,50 @@ resource "aws_security_group_rule" "ingress_from_anywhere_to_kali_via_allowed_po
# 5000-5999 (TCP and UDP). This port range was requested for use by
# assessment operators in cisagov/cool-system-internal#79.
resource "aws_security_group_rule" "kali_egress_to_teamserver_instances_via_5000_to_5999" {
provider = aws.provisionassessment
for_each = toset(["tcp", "udp"])
provider = aws.provisionassessment

security_group_id = aws_security_group.kali.id
type = "egress"
from_port = 5000
protocol = each.key
security_group_id = aws_security_group.kali.id
source_security_group_id = aws_security_group.teamserver.id
from_port = 5000
to_port = 5999
type = "egress"
}
resource "aws_security_group_rule" "kali_ingress_from_teamserver_instances_via_5000_to_5999" {
provider = aws.provisionassessment
for_each = toset(["tcp", "udp"])
provider = aws.provisionassessment

security_group_id = aws_security_group.kali.id
type = "ingress"
from_port = 5000
protocol = each.key
security_group_id = aws_security_group.kali.id
source_security_group_id = aws_security_group.teamserver.id
from_port = 5000
to_port = 5999
type = "ingress"
}

# Allow unfettered access between Kali and Windows instances
resource "aws_security_group_rule" "kali_egress_to_windows_instances" {
provider = aws.provisionassessment
for_each = toset(["tcp", "udp"])
provider = aws.provisionassessment

security_group_id = aws_security_group.kali.id
type = "egress"
from_port = 0
protocol = each.key
security_group_id = aws_security_group.kali.id
source_security_group_id = aws_security_group.windows.id
from_port = 0
to_port = 65535
type = "egress"
}
resource "aws_security_group_rule" "kali_ingress_from_windows_instances" {
provider = aws.provisionassessment
for_each = toset(["tcp", "udp"])
provider = aws.provisionassessment

security_group_id = aws_security_group.kali.id
type = "ingress"
from_port = 0
protocol = each.key
security_group_id = aws_security_group.kali.id
source_security_group_id = aws_security_group.windows.id
from_port = 0
to_port = 65535
type = "ingress"
}

# Allow egress to Gophish instances via port 22 (SSH)
Expand Down
2 changes: 1 addition & 1 deletion pentestportal_sg.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ resource "aws_security_group_rule" "pentestportal_egress_to_anywhere_via_http_an

# Allow ingress from anywhere via the allowed ports
resource "aws_security_group_rule" "ingress_from_anywhere_to_pentestportal_via_allowed_ports" {
provider = aws.provisionassessment
# for_each will only accept a map or a list of strings, so we have
# to do a little finagling to get the list of port objects into an
# acceptable form.
for_each = { for d in var.inbound_ports_allowed["pentestportal"] : format("%s_%d_%d", d.protocol, d.from_port, d.to_port) => d }
provider = aws.provisionassessment

cidr_blocks = ["0.0.0.0/0"]
from_port = each.value["from_port"]
Expand Down
6 changes: 3 additions & 3 deletions teamserver_sg.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ resource "aws_security_group_rule" "teamserver_ingress_from_kali_via_ssh_imaps_a

# Allow ingress from anywhere via the allowed ports
resource "aws_security_group_rule" "ingress_from_anywhere_to_teamserver_via_allowed_ports" {
provider = aws.provisionassessment
# for_each will only accept a map or a list of strings, so we have
# to do a little finagling to get the list of port objects into an
# acceptable form.
for_each = { for d in var.inbound_ports_allowed["teamserver"] : format("%s_%d_%d", d.protocol, d.from_port, d.to_port) => d }
provider = aws.provisionassessment

cidr_blocks = ["0.0.0.0/0"]
from_port = each.value["from_port"]
Expand All @@ -57,8 +57,8 @@ resource "aws_security_group_rule" "ingress_from_anywhere_to_teamserver_via_allo
# 5000-5999 (TCP and UDP). This port range was requested for use by
# assessment operators in cisagov/cool-system-internal#79.
resource "aws_security_group_rule" "teamserver_egress_to_kali_instances_via_5000_to_5999" {
provider = aws.provisionassessment
for_each = toset(["tcp", "udp"])
provider = aws.provisionassessment

from_port = 5000
protocol = each.key
Expand All @@ -68,8 +68,8 @@ resource "aws_security_group_rule" "teamserver_egress_to_kali_instances_via_5000
type = "egress"
}
resource "aws_security_group_rule" "teamserver_ingress_from_kali_instances_via_5000_to_5999" {
provider = aws.provisionassessment
for_each = toset(["tcp", "udp"])
provider = aws.provisionassessment

from_port = 5000
protocol = each.key
Expand Down

0 comments on commit a3314c3

Please sign in to comment.