Merge branch 'streisand_ipv6' of https://github.com/alimakki/streisand …

…into alimakki-streisand_ipv6
StreisandEffect · Sep 7, 2019 · 4619703 · 4619703
2 parents 8e04641 + 2dbfc2c
commit 4619703
Show file tree

Hide file tree

Showing 54 changed files with 289 additions and 56 deletions.
diff --git a/IPv6-status.md b/IPv6-status.md
@@ -0,0 +1,7 @@
+# IPv6 Status
+
+IPv6 support has been tested on the following providers with successful results:
+
+ - DigitalOcean
+ - Linode
+ - Vultr using localhost install
diff --git a/global_vars/default-site.yml b/global_vars/default-site.yml
@@ -11,6 +11,8 @@ streisand_ssh_private_key: "~/.ssh/id_rsa"
 
 vpn_clients: 5
 
+streisand_ipv6_enabled: no
+
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

diff --git a/global_vars/globals.yml b/global_vars/globals.yml
@@ -5,6 +5,10 @@ upstream_dns_servers:
   - 1.1.1.1
   - 1.0.0.1
 
+upstream_dns_servers_v6:
+  - "2606:4700:4700::1111"
+  - "2606:4700:4700::1001"
+
 # If using DNS-over-HTTPS with cloudflared then the upstream servers and queries can be set in:
 # playbooks/roles/cloudflared/defaults/main.yml
 

diff --git a/global_vars/integration/test-site.yml b/global_vars/integration/test-site.yml
@@ -10,6 +10,8 @@ streisand_admin_email_var: ""
 # Take a few extra steps during server provisioning to make the client tests work
 streisand_client_test: true
 
+streisand_ipv6_enabled: no
+
 # Only services with corresponding tests are enabled.
 streisand_shadowsocks_enabled: yes
 streisand_ssh_forward_enabled: yes

diff --git a/global_vars/noninteractive/amazon-site.yml b/global_vars/noninteractive/amazon-site.yml
@@ -14,6 +14,8 @@ streisand_ssh_private_key: "~/.ssh/id_rsa"
 
 vpn_clients: 5
 
+streisand_ipv6_enabled: no
+
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

diff --git a/global_vars/noninteractive/azure-site.yml b/global_vars/noninteractive/azure-site.yml
@@ -14,6 +14,8 @@ streisand_ssh_private_key: "~/.ssh/id_rsa"
 
 vpn_clients: 5
 
+streisand_ipv6_enabled: no
+
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

diff --git a/global_vars/noninteractive/digitalocean-site.yml b/global_vars/noninteractive/digitalocean-site.yml
@@ -18,6 +18,8 @@ streisand_ssh_private_key: "~/.ssh/id_rsa"
 
 vpn_clients: 5
 
+streisand_ipv6_enabled: no
+
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

diff --git a/global_vars/noninteractive/google-site.yml b/global_vars/noninteractive/google-site.yml
@@ -13,6 +13,8 @@ streisand_ssh_private_key: "~/.ssh/id_rsa"
 
 vpn_clients: 5
 
+streisand_ipv6_enabled: no
+
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

diff --git a/global_vars/noninteractive/linode-site.yml b/global_vars/noninteractive/linode-site.yml
@@ -12,6 +12,8 @@ streisand_ssh_private_key: "~/.ssh/id_rsa"
 
 vpn_clients: 5
 
+streisand_ipv6_enabled: no
+
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

diff --git a/global_vars/noninteractive/local-site.yml b/global_vars/noninteractive/local-site.yml
@@ -13,6 +13,8 @@ streisand_ssh_private_key: "~/.ssh/id_rsa"
 
 vpn_clients: 5
 
+streisand_ipv6_enabled: no
+
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

diff --git a/global_vars/noninteractive/rackspace-site.yml b/global_vars/noninteractive/rackspace-site.yml
@@ -12,6 +12,8 @@ streisand_ssh_private_key: "~/.ssh/id_rsa"
 
 vpn_clients: 5
 
+streisand_ipv6_enabled: no
+
 streisand_openconnect_enabled: yes
 streisand_openvpn_enabled: yes
 streisand_shadowsocks_enabled: yes

diff --git a/playbooks/customize.yml b/playbooks/customize.yml
@@ -12,6 +12,10 @@
       prompt: "How many VPN client profiles should be generated per-service (min: 1 max: 20)? Press enter for default "
       default: 5
       private: no
+    - name: streisand_ipv6_enabled
+      prompt: "Enable IPv6, if available? Press enter for default (no)"
+      default: "no"
+      private: no
     - name: streisand_openconnect_enabled
       prompt: "Enable OpenConnect? Press enter for default "
       default: "yes"
@@ -66,6 +70,10 @@
         path: "{{ streisand_site_vars }}"
         regexp: "^vpn_clients: [\\d]+$"
         line: "vpn_clients: {{ vpn_clients }}"
+    - lineinfile:
+        path: "{{ streisand_site_vars }}"
+        regexp: "^streisand_ipv6_enabled: (?:yes|no)$"
+        line: "streisand_ipv6_enabled: {{ streisand_ipv6_enabled }}"
     - lineinfile:
         path: "{{ streisand_site_vars }}"
         regexp: "^streisand_openconnect_enabled: (?:yes|no)$"

diff --git a/playbooks/roles/certificates/templates/openssl.cnf.j2 b/playbooks/roles/certificates/templates/openssl.cnf.j2
@@ -52,6 +52,10 @@ subjectAltName = @alt_names
 {% for item in tls_sans %}
 IP.{{ loop.index }} = {{ item }}
 {% endfor %}
+{% if streisand_ipv6_address is defined %}
+IP.1 = {{ streisand_ipv6_address }}
+{% endif %}
+
 
 [ req_distinguished_name ]
 countryName = Country Name (2 letter code)

diff --git a/playbooks/roles/common/tasks/set-default-variables.yml b/playbooks/roles/common/tasks/set-default-variables.yml
@@ -39,3 +39,16 @@
 
 - import_tasks: detect-public-ip.yml
   when: (hostvars['127.0.0.1']['streisand_genesis_role'] is defined and ((hostvars['127.0.0.1']['streisand_genesis_role'] == "localhost") or (hostvars['127.0.0.1']['streisand_genesis_role'] == "existing-server")))
+
+- name: If streisand_ipv6_address is undefined and IPv6 is enabled, change it to Ansible's default IPv6 address
+  set_fact:
+    streisand_ipv6_address: "{{ ansible_default_ipv6.address }}"
+  when:
+    - streisand_ipv6_address is not defined
+    - streisand_ipv6_enabled
+    - ansible_default_ipv6.address is defined
+
+- name: If there's an IPv6 address, generate a gateway URL using it
+  set_fact:
+    streisand_gateway_url_ipv6: "https://[{{ streisand_ipv6_address }}]"
+  when: streisand_ipv6_address is defined
diff --git a/playbooks/roles/dnsmasq/templates/dnsmasq.conf.j2 b/playbooks/roles/dnsmasq/templates/dnsmasq.conf.j2
@@ -5,7 +5,7 @@
 #   dnsmasq will not automatically listen on the loopback interface. To achieve
 #   this, its IP address, 127.0.0.1, must be explicitly given as
 #   a --listen-address option.
-listen-address=127.0.0.1
+listen-address=::1,127.0.0.1
 
 # Never forward plain names (without a dot or domain part)
 domain-needed
@@ -21,3 +21,8 @@ no-resolv
 {% for item in upstream_dns_servers %}
 server={{ item }}
 {% endfor %}
+{% if streisand_ipv6_address is defined %}
+{% for item in upstream_dns_servers_v6 %}
+server={{ item }}
+{% endfor %}
+{% endif %}
diff --git a/playbooks/roles/genesis-digitalocean/tasks/main.yml b/playbooks/roles/genesis-digitalocean/tasks/main.yml
@@ -35,6 +35,7 @@
         wait: yes
         oauth_token: "{{ do_access_token }}"
         state: present
+        ipv6: "{{ streisand_ipv6_enabled }}"
       register: streisand_server
   rescue:
     - fail:

diff --git a/playbooks/roles/ip-forwarding/tasks/main.yml b/playbooks/roles/ip-forwarding/tasks/main.yml
@@ -5,9 +5,15 @@
     value: 1
   when: ansible_virtualization_type != 'lxc'
 
-- name: "Add IPv4 traffic forwarding persistence service to init"
-  copy:
-    src: streisand-ipforward.sh
+- name: "Enable IPv6 traffic forwarding"
+  sysctl:
+    name: net.ipv6.conf.all.forwarding
+    value: 1
+  when: (ansible_virtualization_type != 'lxc') and (streisand_ipv6_enabled)
+
+- name: "Add IPv4/IPv6 traffic forwarding persistence service to init"
+  template:
+    src: streisand-ipforward.sh.j2
     dest: /etc/init.d/streisand-ipforward
     mode: 0755
 

diff --git a/...p-forwarding/files/streisand-ipforward.sh → ...rding/templates/streisand-ipforward.sh.j2 b/...p-forwarding/files/streisand-ipforward.sh → ...rding/templates/streisand-ipforward.sh.j2
@@ -9,7 +9,10 @@
 ### END INIT INFO
 
 echo 1 > /proc/sys/net/ipv4/ip_forward
-
 echo 0 | tee /proc/sys/net/ipv4/conf/*/*_redirects
 
+{% if streisand_ipv6_address is defined %}
+echo 1 >  /proc/sys/net/ipv6/conf/all/forwarding
+{% endif %}
+
 exit 0
diff --git a/playbooks/roles/openconnect/tasks/firewall.yml b/playbooks/roles/openconnect/tasks/firewall.yml
@@ -4,7 +4,11 @@
     to_port: "53"
     proto: "udp"
     rule: "allow"
-    from_ip: "192.168.1.0/24"
+    from_ip: "{{ item.addr }}"
+  with_items:
+    - { addr: "{{ ocserv_ipv4_network }}" }
+    - { addr: "{{ ocserv_ipv6_network }}", create: "{{ streisand_ipv6_enabled }}" }
+  when: item.create | default(True) | bool
 
 - name: Ensure UFW allows OpenConnect (ocserv)
   ufw:

diff --git a/playbooks/roles/openconnect/templates/config.j2 b/playbooks/roles/openconnect/templates/config.j2
@@ -45,8 +45,18 @@ use-occtl = true
 pid-file = {{ ocserv_pid_file }}
 device = vpns
 default-domain = example.com
-ipv4-network = 192.168.1.0
-ipv4-netmask = 255.255.255.0
+ipv4-network = {{ ocserv_ipv4_network }}
+
+{% if streisand_ipv6_address is defined %}
+ipv6-network = {{ ocserv_ipv6_network }}
+{% for item in upstream_dns_servers_v6 %}
+dns = {{ item }}
+{% endfor %}
+ipv6-subnet-prefix = 64
+{% endif %}
+
+route = default
+
 ping-leases = false
 cisco-client-compat = true
 max-clients = {{ vpn_clients + 1 }}

diff --git a/playbooks/roles/openconnect/templates/ocserv-iptables.service.j2 b/playbooks/roles/openconnect/templates/ocserv-iptables.service.j2
@@ -8,5 +8,9 @@ Type=oneshot
 RemainAfterExit=true
 ExecStart=/sbin/{{ ocserv_firewall_rule }}
 
+{% if streisand_ipv6_enabled %}
+ExecStart=/sbin/{{ ocserv_firewall_rule_v6 }}
+{% endif %}
+
 [Install]
 WantedBy=multi-user.target
diff --git a/playbooks/roles/openconnect/templates/ocserv-ipv6tables.service.j2 b/playbooks/roles/openconnect/templates/ocserv-ipv6tables.service.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=Set the firewall rules required for ocserv
+After=network.target
+Before=ocserv.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/sbin/{{ ocserv_firewall_rule_v6 }}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/playbooks/roles/openconnect/vars/main.yml b/playbooks/roles/openconnect/vars/main.yml
@@ -3,6 +3,10 @@ ocserv_path: "/etc/ocserv"
 ocserv_ca: "{{ ocserv_path }}/ca"
 ocserv_config_file: "{{ ocserv_path }}/ocserv.conf"
 ocserv_firewall_rule: "iptables --wait {{ streisand_iptables_wait }} -t nat -A POSTROUTING -j MASQUERADE"
+ocserv_firewall_rule_v6: "ip6tables --wait {{ streisand_iptables_wait }} -t nat -A POSTROUTING -j MASQUERADE"
+
+ocserv_ipv4_network: "192.168.1.0/24"
+ocserv_ipv6_network: "fda9:4efe:7e3b:03ea::/48"
 
 ocserv_days_valid: "1825"
 ocserv_pid_file:    "/var/run/ocserv.pid"

diff --git a/playbooks/roles/openvpn/tasks/firewall.yml b/playbooks/roles/openvpn/tasks/firewall.yml
@@ -3,19 +3,32 @@
   command: "{{ item }}"
   with_items: "{{ openvpn_firewall_rules }}"
 
-- name: Ensure UFW allows DNS requests from OpenVPN clients
+- name: Allow OpenVPN over IPv6 through the firewall
+  command: "{{ item }}"
+  with_items: "{{ openvpn_ipv6_firewall_rules }}"
+  when: streisand_ipv6_address is defined
+
+- name: Ensure UFW allows DNS requests from OpenVPN TCP clients
   ufw:
     to_port: "53"
     proto: "udp"
     rule: "allow"
-    from_ip: "10.8.0.0/24"
+    from_ip: "{{ item.addr }}"
+  with_items:
+    - { addr: "{{ openvpn_server_tcp_ipv4_address }}" }
+    - { addr: "{{ openvpn_server_tcp_ipv6_address }}", create: "{{ streisand_ipv6_enabled }}" }
+  when: item.create | default(True) | bool
 
 - name: Ensure UFW allows DNS requests from OpenVPN UDP clients
   ufw:
     to_port: "53"
     proto: "udp"
     rule: "allow"
-    from_ip: "10.9.0.0/24"
+    from_ip: "{{ item.addr }}"
+  with_items:
+    - { addr: "{{ openvpn_server_udp_ipv4_address }}" }
+    - { addr: "{{ openvpn_server_udp_ipv6_address }}", create: "{{ streisand_ipv6_enabled }}" }
+  when: item.create | default(True) | bool
 
 - name: Ensure UFW allows OpenVPN
   ufw:

diff --git a/playbooks/roles/openvpn/tasks/main.yml b/playbooks/roles/openvpn/tasks/main.yml
@@ -2,10 +2,14 @@
 # Add the apt key and install OpenVPN
 - import_tasks: install.yml
 
-- name: "Configure DNSMasq to listen on {{ dnsmasq_openvpn_tcp_ip }}:53 and {{ dnsmasq_openvpn_udp_ip }}:53"
+- name: "Configure DNSMasq to listen on TCP and UDP ports 53"
   template:
     src: openvpn_dnsmasq.conf.j2
     dest: /etc/dnsmasq.d/openvpn.conf
+  with_items:
+    - { src: "openvpn_dnsmasq.conf.j2",   dst: "/etc/dnsmasq.d/openvpn.conf" }
+    - { src: "openvpn_dnsmasqv6.conf.j2", dst: "/etc/dnsmasq.d/openvpnv6.conf", create: "{{ streisand_ipv6_enabled }}" }
+  when: item.create | default(True) | bool
   notify: Restart dnsmasq
 
 - include_role:

diff --git a/playbooks/roles/openvpn/templates/client-common.j2 b/playbooks/roles/openvpn/templates/client-common.j2
@@ -1,4 +1,4 @@
-dev tun
+dev tun-ipv6
 cipher {{ openvpn_cipher }}
 auth {{ openvpn_auth_digest }}
 resolv-retry infinite
@@ -10,7 +10,8 @@ verify-x509-name {{ openvpn_server_common_name.stdout }} name
 tls-version-min 1.2
 compress
 verb 3
-route {{ streisand_ipv4_address }} 255.255.255.255 net_gateway
+
+#route {{ streisand_ipv4_address }} 255.255.255.255 net_gateway
 
 <ca>
 {{ openvpn_ca_contents.stdout }}

diff --git a/playbooks/roles/openvpn/templates/client-direct-udp.ovpn.j2 b/playbooks/roles/openvpn/templates/client-direct-udp.ovpn.j2
@@ -1,4 +1,6 @@
 client
-remote {{ openvpn_server }} {{ openvpn_port_udp }}
-proto udp
+{% if streisand_ipv6_address is defined %}
+remote {{ streisand_ipv6_address }} {{ openvpn_port_udp }} udp6
+{% endif %}
+remote {{ openvpn_server }} {{ openvpn_port_udp }} udp
 {% include "client-common.j2" %}
diff --git a/playbooks/roles/openvpn/templates/client-direct.ovpn.j2 b/playbooks/roles/openvpn/templates/client-direct.ovpn.j2
@@ -1,4 +1,6 @@
 client
-remote {{ openvpn_server }} {{ openvpn_port }}
-proto tcp
+{% if streisand_ipv6_address is defined %}
+remote {{ streisand_ipv6_address }} {{ openvpn_port}} tcp6
+{% endif %}
+remote {{ openvpn_server }} {{ openvpn_port }} tcp
 {% include "client-common.j2" %}
diff --git a/playbooks/roles/openvpn/templates/client-sslh.ovpn.j2 b/playbooks/roles/openvpn/templates/client-sslh.ovpn.j2
@@ -1,4 +1,6 @@
 client
-remote {{ openvpn_server }} {{ openvpn_port_sslh }}
-proto tcp
+{% if streisand_ipv6_address is defined %}
+remote {{ streisand_ipv6_address }} {{ openvpn_port_sslh }} tcp6
+{% endif %}
+remote {{ openvpn_server }} {{ openvpn_port_sslh }} tcp
 {% include "client-common.j2" %}
diff --git a/playbooks/roles/openvpn/templates/etc_openvpn_server.conf.j2 b/playbooks/roles/openvpn/templates/etc_openvpn_server.conf.j2
@@ -1,5 +1,11 @@
 server 10.8.0.0 255.255.255.0
 push "dhcp-option DNS {{ dnsmasq_openvpn_tcp_ip }}"
-proto tcp
+proto tcp6
+
+{% if streisand_ipv6_address is defined %}
+server-ipv6 2001:db8:0:124::/64
+push "dhcp-option DNS6 {{ dnsmasq_openvpn_tcp_ipv6 }}"
+{% endif %}
+
 port {{ openvpn_port }}
 {% include "etc_openvpn_server_common.j2" %}
diff --git a/playbooks/roles/openvpn/templates/etc_openvpn_server_common.j2 b/playbooks/roles/openvpn/templates/etc_openvpn_server_common.j2
@@ -6,6 +6,10 @@ dh none
 ifconfig-pool-persist ipp.txt
 push "redirect-gateway def1"
 
+{% if streisand_ipv6_address is defined %}
+push "route-ipv6 ::/0"
+{% endif %}
+
 # Fix for the Windows 10 DNS leak described here:
 # https://community.openvpn.net/openvpn/ticket/605
 push block-outside-dns