Skip to content

Only open VPN ports in cloud security groups when enabled #14898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Only open VPN ports in cloud security groups when enabled #14898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions roles/cloud-azure/files/deployment.json → roles/cloud-azure/files/deployment.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@
"priority": 100,
"direction": "Inbound"
}
},
{
}
{% if ipsec_enabled | default(true) | bool %}
,{
"name": "AllowIPSEC500",
"properties": {
"description": "Allow UDP to port 500",
Expand All @@ -86,11 +87,13 @@
"priority": 120,
"direction": "Inbound"
}
},
{
}
{% endif %}
{% if wireguard_enabled | default(true) | bool %}
,{
"name": "AllowWireGuard",
"properties": {
"description": "Locks inbound down to ssh default port 22.",
"description": "Allow WireGuard VPN",
"protocol": "Udp",
"sourcePortRange": "*",
"destinationPortRange": "[parameters('WireGuardPort')]",
Expand All @@ -101,6 +104,7 @@
"direction": "Inbound"
}
}
{% endif %}
]
}
},
Expand Down
2 changes: 1 addition & 1 deletion roles/cloud-azure/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
azure_rm_deployment:
state: present
deployment_name: "{{ algo_server_name }}"
template: "{{ lookup('file', role_path + '/files/deployment.json') }}"
template: "{{ lookup('template', 'files/deployment.json.j2') }}"
secret: "{{ secret }}"
tenant: "{{ tenant }}"
client_id: "{{ client_id }}"
Expand Down
22 changes: 17 additions & 5 deletions roles/cloud-cloudstack/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,23 @@
start_port: "{{ item.start_port }}"
end_port: "{{ item.end_port }}"
cidr: "{{ item.range }}"
loop:
- { proto: tcp, start_port: "{{ ssh_port }}", end_port: "{{ ssh_port }}", range: 0.0.0.0/0 }
- { proto: udp, start_port: 4500, end_port: 4500, range: 0.0.0.0/0 }
- { proto: udp, start_port: 500, end_port: 500, range: 0.0.0.0/0 }
- { proto: udp, start_port: "{{ wireguard_port }}", end_port: "{{ wireguard_port }}", range: 0.0.0.0/0 }
loop: >-
{{
[
{ 'proto': 'tcp', 'start_port': ssh_port, 'end_port': ssh_port, 'range': '0.0.0.0/0' }
]
+ (
[
{ 'proto': 'udp', 'start_port': 500, 'end_port': 500, 'range': '0.0.0.0/0' },
{ 'proto': 'udp', 'start_port': 4500, 'end_port': 4500, 'range': '0.0.0.0/0' }
] if ipsec_enabled | default(true) | bool else []
)
+ (
[
{ 'proto': 'udp', 'start_port': wireguard_port, 'end_port': wireguard_port, 'range': '0.0.0.0/0' }
] if wireguard_enabled | default(true) | bool else []
)
}}

- name: Set facts
set_fact:
Expand Down
64 changes: 51 additions & 13 deletions roles/cloud-ec2/files/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,26 @@ Parameters:
AllowedValues:
- spot
- on-demand
IpsecEnabled:
Description: Whether to open IPsec ports (500, 4500) in security group
Type: String
Default: 'true'
AllowedValues:
- 'true'
- 'false'
WireguardEnabled:
Description: Whether to open WireGuard port in security group
Type: String
Default: 'true'
AllowedValues:
- 'true'
- 'false'
Conditions:
AllocateNewEIP: !Equals [!Ref UseThisElasticIP, '']
AssociateExistingEIP: !Not [!Equals [!Ref UseThisElasticIP, '']]
InstanceIsSpot: !Equals [spot, !Ref InstanceMarketTypeParameter]
OpenIpsecPorts: !Equals ['true', !Ref IpsecEnabled]
OpenWireguardPorts: !Equals ['true', !Ref WireguardEnabled]
Resources:
VPC:
Type: AWS::EC2::VPC
Expand Down Expand Up @@ -120,28 +136,50 @@ Resources:
- Subnet
Properties:
VpcId: !Ref VPC
GroupDescription: Enable SSH and IPsec
GroupDescription: Algo VPN security group
SecurityGroupIngress:
- IpProtocol: tcp
Description: SSH
FromPort: !Ref SshPort
ToPort: !Ref SshPort
CidrIp: 0.0.0.0/0
- IpProtocol: udp
FromPort: '500'
ToPort: '500'
CidrIp: 0.0.0.0/0
- IpProtocol: udp
FromPort: '4500'
ToPort: '4500'
CidrIp: 0.0.0.0/0
- IpProtocol: udp
FromPort: !Ref WireGuardPort
ToPort: !Ref WireGuardPort
CidrIp: 0.0.0.0/0
Tags:
- Key: Name
Value: !Ref AWS::StackName

SecurityGroupIngressIpsec500:
Type: AWS::EC2::SecurityGroupIngress
Condition: OpenIpsecPorts
Properties:
GroupId: !Ref InstanceSecurityGroup
Description: IPsec IKE
IpProtocol: udp
FromPort: 500
ToPort: 500
CidrIp: 0.0.0.0/0

SecurityGroupIngressIpsec4500:
Type: AWS::EC2::SecurityGroupIngress
Condition: OpenIpsecPorts
Properties:
GroupId: !Ref InstanceSecurityGroup
Description: IPsec NAT-T
IpProtocol: udp
FromPort: 4500
ToPort: 4500
CidrIp: 0.0.0.0/0

SecurityGroupIngressWireguard:
Type: AWS::EC2::SecurityGroupIngress
Condition: OpenWireguardPorts
Properties:
GroupId: !Ref InstanceSecurityGroup
Description: WireGuard
IpProtocol: udp
FromPort: !Ref WireGuardPort
ToPort: !Ref WireGuardPort
CidrIp: 0.0.0.0/0

EC2LaunchTemplate:
Type: AWS::EC2::LaunchTemplate
Condition: InstanceIsSpot # Only create this template if requested
Expand Down
2 changes: 2 additions & 0 deletions roles/cloud-ec2/tasks/cloudformation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
UserData: "{{ lookup('template', 'files/cloud-init/base.yml') | b64encode }}"
SshPort: "{{ ssh_port }}"
InstanceMarketTypeParameter: "{{ cloud_providers.ec2.instance_market_type }}"
IpsecEnabled: "{{ ipsec_enabled | default(true) | string | lower }}"
WireguardEnabled: "{{ wireguard_enabled | default(true) | string | lower }}"
tags:
Environment: Algo
register: stack
Expand Down
16 changes: 6 additions & 10 deletions roles/cloud-gce/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,12 @@
name: algovpn
network: "{{ gcp_compute_network }}"
direction: INGRESS
allowed:
- ip_protocol: udp
ports:
- "500"
- "4500"
- "{{ wireguard_port | string }}"
- ip_protocol: tcp
ports:
- "{{ ssh_port }}"
- ip_protocol: icmp
allowed: >-
{{
[{ 'ip_protocol': 'tcp', 'ports': [ssh_port | string] }, { 'ip_protocol': 'icmp' }]
+ ([{ 'ip_protocol': 'udp', 'ports': ['500', '4500'] }] if ipsec_enabled | default(true) | bool else [])
+ ([{ 'ip_protocol': 'udp', 'ports': [wireguard_port | string] }] if wireguard_enabled | default(true) | bool else [])
}}

- block:
- name: External IP allocated
Expand Down
4 changes: 4 additions & 0 deletions roles/cloud-lightsail/files/stack.yaml → roles/cloud-lightsail/files/stack.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,16 @@ Resources:
FromPort: !Ref SshPort
ToPort: !Ref SshPort
Protocol: tcp
{% if wireguard_enabled | default(true) | bool %}
- AccessDirection: inbound
Cidrs: ['0.0.0.0/0']
Ipv6Cidrs: ['::/0']
CommonName: WireGuard
FromPort: !Ref WireGuardPort
ToPort: !Ref WireGuardPort
Protocol: udp
{% endif %}
{% if ipsec_enabled | default(true) | bool %}
- AccessDirection: inbound
Cidrs: ['0.0.0.0/0']
Ipv6Cidrs: ['::/0']
Expand All @@ -56,6 +59,7 @@ Resources:
FromPort: 500
ToPort: 500
Protocol: udp
{% endif %}
Tags:
- Key: Name
Value: !Ref AWS::StackName
Expand Down
2 changes: 1 addition & 1 deletion roles/cloud-lightsail/tasks/cloudformation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
stack_name: "{{ stack_name }}"
state: present
region: "{{ algo_region }}"
template_body: "{{ lookup('file', 'roles/cloud-lightsail/files/stack.yaml') }}"
template_body: "{{ lookup('template', 'files/stack.yaml.j2') }}"
template_parameters:
InstanceTypeParameter: "{{ cloud_providers.lightsail.size }}"
ImageIdParameter: "{{ cloud_providers.lightsail.image }}"
Expand Down
24 changes: 18 additions & 6 deletions roles/cloud-openstack/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,24 @@
port_range_min: "{{ item.port_min }}"
port_range_max: "{{ item.port_max }}"
remote_ip_prefix: "{{ item.range }}"
loop:
- { proto: tcp, port_min: "{{ ssh_port }}", port_max: "{{ ssh_port }}", range: 0.0.0.0/0 }
- { proto: icmp, port_min: -1, port_max: -1, range: 0.0.0.0/0 }
- { proto: udp, port_min: 4500, port_max: 4500, range: 0.0.0.0/0 }
- { proto: udp, port_min: 500, port_max: 500, range: 0.0.0.0/0 }
- { proto: udp, port_min: "{{ wireguard_port }}", port_max: "{{ wireguard_port }}", range: 0.0.0.0/0 }
loop: >-
{{
[
{ 'proto': 'tcp', 'port_min': ssh_port, 'port_max': ssh_port, 'range': '0.0.0.0/0' },
{ 'proto': 'icmp', 'port_min': -1, 'port_max': -1, 'range': '0.0.0.0/0' }
]
+ (
[
{ 'proto': 'udp', 'port_min': 500, 'port_max': 500, 'range': '0.0.0.0/0' },
{ 'proto': 'udp', 'port_min': 4500, 'port_max': 4500, 'range': '0.0.0.0/0' }
] if ipsec_enabled | default(true) | bool else []
)
+ (
[
{ 'proto': 'udp', 'port_min': wireguard_port, 'port_max': wireguard_port, 'range': '0.0.0.0/0' }
] if wireguard_enabled | default(true) | bool else []
)
}}

- name: Gather facts about flavors
openstack.cloud.compute_flavor_info:
Expand Down
30 changes: 21 additions & 9 deletions roles/cloud-vultr/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,27 @@
ip_type: "{{ item.ip }}"
subnet: "{{ item.cidr.split('/')[0] }}"
subnet_size: "{{ item.cidr.split('/')[1] }}"
loop:
- { protocol: tcp, port: "{{ ssh_port }}", ip: v4, cidr: 0.0.0.0/0 }
- { protocol: tcp, port: "{{ ssh_port }}", ip: v6, cidr: "::/0" }
- { protocol: udp, port: 500, ip: v4, cidr: 0.0.0.0/0 }
- { protocol: udp, port: 500, ip: v6, cidr: "::/0" }
- { protocol: udp, port: 4500, ip: v4, cidr: 0.0.0.0/0 }
- { protocol: udp, port: 4500, ip: v6, cidr: "::/0" }
- { protocol: udp, port: "{{ wireguard_port }}", ip: v4, cidr: 0.0.0.0/0 }
- { protocol: udp, port: "{{ wireguard_port }}", ip: v6, cidr: "::/0" }
loop: >-
{{
[
{ 'protocol': 'tcp', 'port': ssh_port, 'ip': 'v4', 'cidr': '0.0.0.0/0' },
{ 'protocol': 'tcp', 'port': ssh_port, 'ip': 'v6', 'cidr': '::/0' }
]
+ (
[
{ 'protocol': 'udp', 'port': 500, 'ip': 'v4', 'cidr': '0.0.0.0/0' },
{ 'protocol': 'udp', 'port': 500, 'ip': 'v6', 'cidr': '::/0' },
{ 'protocol': 'udp', 'port': 4500, 'ip': 'v4', 'cidr': '0.0.0.0/0' },
{ 'protocol': 'udp', 'port': 4500, 'ip': 'v6', 'cidr': '::/0' }
] if ipsec_enabled | default(true) | bool else []
)
+ (
[
{ 'protocol': 'udp', 'port': wireguard_port, 'ip': 'v4', 'cidr': '0.0.0.0/0' },
{ 'protocol': 'udp', 'port': wireguard_port, 'ip': 'v6', 'cidr': '::/0' }
] if wireguard_enabled | default(true) | bool else []
)
}}

- name: Upload the startup script
vultr.cloud.startup_script:
Expand Down
Loading