ipsec: T2816: IPSec python rework, includes DMVPN and VTI support

8 files changed, 991 insertions, 15 deletions

diff --git a/src/completion/list_protocols.sh b/src/completion/list_protocols.sh
new file mode 100755
index 000000000..e9d50a70f
--- /dev/null
+++ b/src/completion/list_protocols.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+grep -v '^#' /etc/protocols | awk 'BEGIN {ORS=""} {if ($3) {print TRS $1; TRS=" "}}'
diff --git a/src/conf_mode/vpn_ipsec.py b/src/conf_mode/vpn_ipsec.py
index 969266c30..a1c36ea3b 100755
--- a/src/conf_mode/vpn_ipsec.py
+++ b/src/conf_mode/vpn_ipsec.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2020 VyOS maintainers and contributors
+# Copyright (C) 2021 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -16,52 +16,446 @@
 
 import os
 
+from copy import deepcopy
+from subprocess import DEVNULL
 from sys import exit
+from time import sleep
 
 from vyos.config import Config
+from vyos.configdiff import ConfigDiff
 from vyos.template import render
-from vyos.util import call
-from vyos.util import dict_search
+from vyos.util import call, get_interface_address, process_named_running, run, cidr_fit
 from vyos import ConfigError
 from vyos import airbag
-from pprint import pprint
 airbag.enable()
 
+authby_translate = {
+    'pre-shared-secret': 'secret',
+    'rsa': 'rsasig',
+    'x509': 'rsasig'
+}
+default_pfs = 'dh-group2'
+pfs_translate = {
+    'dh-group1': 'modp768',
+    'dh-group2': 'modp1024',
+    'dh-group5': 'modp1536',
+    'dh-group14': 'modp2048',
+    'dh-group15': 'modp3072',
+    'dh-group16': 'modp4096',
+    'dh-group17': 'modp6144',
+    'dh-group18': 'modp8192',
+    'dh-group19': 'ecp256',
+    'dh-group20': 'ecp384',
+    'dh-group21': 'ecp512',
+    'dh-group22': 'modp1024s160',
+    'dh-group23': 'modp2048s224',
+    'dh-group24': 'modp2048s256',
+    'dh-group25': 'ecp192',
+    'dh-group26': 'ecp224',
+    'dh-group27': 'ecp224bp',
+    'dh-group28': 'ecp256bp',
+    'dh-group29': 'ecp384bp',
+    'dh-group30': 'ecp512bp',
+    'dh-group31': 'curve25519',
+    'dh-group32': 'curve448'
+}
+
+ike_ciphers = {}
+esp_ciphers = {}
+
+marks = {}
+mark_base = 0x900000
+mark_index = 1
+
+CA_PATH = "/etc/ipsec.d/cacerts"
+CRL_PATH = "/etc/ipsec.d/crls"
+
+DHCP_BASE = "/var/lib/dhcp/dhclient"
+
+LOCAL_KEY_PATHS = ['/config/auth/', '/config/ipsec.d/rsa-keys/']
+X509_PATH = '/config/auth/'
+
+conf = None
+
+def resync_l2tp(conf):
+    if not conf.exists('vpn l2tp remote-access ipsec-settings '):
+        return
+
+    tmp = run('/usr/libexec/vyos/conf_mode/ipsec-settings.py')
+    if tmp > 0:
+        print('ERROR: failed to reapply L2TP IPSec settings!')
+
+def resync_nhrp(conf):
+    if not conf.exists('protocols nhrp tunnel'):
+        return
+
+    run('/opt/vyatta/sbin/vyos-update-nhrp.pl --set_ipsec')
+
 def get_config(config=None):
+    global conf
     if config:
         conf = config
     else:
         conf = Config()
-    base = ['vpn', 'nipsec']
+    base = ['vpn', 'ipsec']
     if not conf.exists(base):
         return None
 
     # retrieve common dictionary keys
-    ipsec = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
+    ipsec = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True)
+
+    default_ike_pfs = None
+
+    if 'ike_group' in ipsec:
+        for group, ike_conf in ipsec['ike_group'].items():
+            if 'proposal' in ike_conf:
+                ciphers = []
+                for i in ike_conf['proposal']:
+                    proposal = ike_conf['proposal'][i]
+                    enc = proposal['encryption'] if 'encryption' in proposal else None
+                    hash = proposal['hash'] if 'hash' in proposal else None
+                    pfs = ('dh-group' + proposal['dh_group']) if 'dh_group' in proposal else default_pfs
+
+                    if not default_ike_pfs:
+                        default_ike_pfs = pfs
+
+                    if enc and hash:
+                        ciphers.append(f"{enc}-{hash}-{pfs_translate[pfs]}" if pfs else f"{enc}-{hash}")
+                ike_ciphers[group] = ','.join(ciphers) + '!'
+
+    if 'esp_group' in ipsec:
+        for group, esp_conf in ipsec['esp_group'].items():
+            pfs = esp_conf['pfs'] if 'pfs' in esp_conf else 'enable'
+
+            if pfs == 'disable':
+                pfs = None
+
+            if pfs == 'enable':
+                pfs = default_ike_pfs
+            
+            if 'proposal' in esp_conf:
+                ciphers = []
+                for i in esp_conf['proposal']:
+                    proposal = esp_conf['proposal'][i]
+                    enc = proposal['encryption'] if 'encryption' in proposal else None
+                    hash = proposal['hash'] if 'hash' in proposal else None
+                    if enc and hash:
+                        ciphers.append(f"{enc}-{hash}-{pfs_translate[pfs]}" if pfs else f"{enc}-{hash}")
+                esp_ciphers[group] = ','.join(ciphers) + '!'
+
     return ipsec
 
 def verify(ipsec):
     if not ipsec:
         return None
 
+    if 'profile' in ipsec:
+        for profile, profile_conf in ipsec['profile'].items():
+            if 'esp_group' in profile_conf:
+                if 'esp_group' not in ipsec or profile_conf['esp_group'] not in ipsec['esp_group']:
+                    raise ConfigError(f"Invalid esp-group on {profile} profile")
+            else:
+                raise ConfigError(f"Missing esp-group on {profile} profile")
+
+            if 'ike_group' in profile_conf:
+                if 'ike_group' not in ipsec or profile_conf['ike_group'] not in ipsec['ike_group']:
+                    raise ConfigError(f"Invalid ike-group on {profile} profile")
+            else:
+                raise ConfigError(f"Missing ike-group on {profile} profile")
+
+            if 'authentication' not in profile_conf:
+                raise ConfigError(f"Missing authentication on {profile} profile")
+
+    if 'site_to_site' in ipsec and 'peer' in ipsec['site_to_site']:
+        for peer, peer_conf in ipsec['site_to_site']['peer'].items():
+            has_default_esp = False
+            if 'default_esp_group' in peer_conf:
+                has_default_esp = True
+                if 'esp_group' not in ipsec or peer_conf['default_esp_group'] not in ipsec['esp_group']:
+                    raise ConfigError(f"Invalid esp-group on site-to-site peer {peer}")
+
+            if 'ike_group' in peer_conf:
+                if 'ike_group' not in ipsec or peer_conf['ike_group'] not in ipsec['ike_group']:
+                    raise ConfigError(f"Invalid ike-group on site-to-site peer {peer}")
+            else:
+                raise ConfigError(f"Missing ike-group on site-to-site peer {peer}")
+
+            if 'authentication' not in peer_conf or 'mode' not in peer_conf['authentication']:
+                raise ConfigError(f"Missing authentication on site-to-site peer {peer}")
+
+            if peer_conf['authentication']['mode'] == 'x509':
+                if 'x509' not in peer_conf['authentication']:
+                    raise ConfigError(f"Missing x509 settings on site-to-site peer {peer}")
+
+                if 'key' not in peer_conf['authentication']['x509'] or 'ca_cert_file' not in peer_conf['authentication']['x509'] or 'cert_file' not in peer_conf['authentication']['x509']:
+                    raise ConfigError(f"Missing x509 settings on site-to-site peer {peer}")
+
+                if 'file' not in peer_conf['authentication']['x509']['key']:
+                    raise ConfigError(f"Missing x509 settings on site-to-site peer {peer}")
+
+                for key in ['ca_cert_file', 'cert_file', 'crl_file']:
+                    if key in peer_conf['authentication']['x509']:
+                        path = peer_conf['authentication']['x509'][key]
+                        if not os.path.exists(path if path.startswith(X509_PATH) else (X509_PATH + path)):
+                            raise ConfigError(f"File not found for {key} on site-to-site peer {peer}")
+
+                key_path = peer_conf['authentication']['x509']['key']['file']
+                if not os.path.exists(key_path if key_path.startswith(X509_PATH) else (X509_PATH + key_path)):
+                    raise ConfigError(f"Private key not found on site-to-site peer {peer}")
+
+            if peer_conf['authentication']['mode'] == 'rsa':
+                if not verify_rsa_local_key():
+                    raise ConfigError(f"Invalid key on rsa-keys local-key")
+
+                if 'rsa_key_name' not in peer_conf['authentication']:
+                    raise ConfigError(f"Missing rsa-key-name on site-to-site peer {peer}")
+
+                if not verify_rsa_key(peer_conf['authentication']['rsa_key_name']):
+                    raise ConfigError(f"Invalid rsa-key-name on site-to-site peer {peer}")
+
+            if 'local_address' not in peer_conf and 'dhcp_interface' not in peer_conf:
+                raise ConfigError(f"Missing local-address or dhcp-interface on site-to-site peer {peer}")
+
+            if 'dhcp_interface' in peer_conf:
+                dhcp_interface = peer_conf['dhcp_interface']
+                if not os.path.exists(f'{DHCP_BASE}_{dhcp_interface}.conf'):
+                    raise ConfigError(f"Invalid dhcp-interface on site-to-site peer {peer}")
+
+            if 'vti' in peer_conf:
+                if 'local_address' in peer_conf and 'dhcp_interface' in peer_conf:
+                    raise ConfigError(f"A single local-address or dhcp-interface is required when using VTI on site-to-site peer {peer}")
+
+                if 'bind' in peer_conf['vti']:
+                    vti_interface = peer_conf['vti']['bind']
+                    if not get_vti_interface(vti_interface):
+                        raise ConfigError(f'Invalid VTI interface on site-to-site peer {peer}')
+
+            if 'vti' not in peer_conf and 'tunnel' not in peer_conf:
+                raise ConfigError(f"No vti or tunnels specified on site-to-site peer {peer}")
+
+            if 'tunnel' in peer_conf:
+                for tunnel, tunnel_conf in peer_conf['tunnel'].items():
+                    if 'esp_group' not in tunnel_conf and not has_default_esp:
+                        raise ConfigError(f"Missing esp-group on tunnel {tunnel} for site-to-site peer {peer}")
+
+                    esp_group_name = tunnel_conf['esp_group'] if 'esp_group' in tunnel_conf else peer_conf['default_esp_group']
+
+                    if esp_group_name not in ipsec['esp_group']:
+                        raise ConfigError(f"Invalid esp-group on tunnel {tunnel} for site-to-site peer {peer}")
+
+                    esp_group = ipsec['esp_group'][esp_group_name]
+
+                    if 'mode' in esp_group and esp_group['mode'] == 'transport':
+                        if 'protocol' in tunnel_conf and ((peer in ['any', '0.0.0.0']) or ('local_address' not in peer_conf or peer_conf['local_address'] in ['any', '0.0.0.0'])):
+                            raise ConfigError(f"Fixed local-address or peer required when a protocol is defined with ESP transport mode on tunnel {tunnel} for site-to-site peer {peer}")
+
+                        if ('local' in tunnel_conf and 'prefix' in tunnel_conf['local']) or ('remote' in tunnel_conf and 'prefix' in tunnel_conf['remote']):
+                            raise ConfigError(f"Local/remote prefix cannot be used with ESP transport mode on tunnel {tunnel} for site-to-site peer {peer}")
+
+def get_rsa_local_key():
+    global conf
+    base = ['vpn', 'rsa-keys']
+    if not conf.exists(base + ['local-key', 'file']):
+        return False
+
+    return conf.return_value(base + ['local-key', 'file'])
+
+def verify_rsa_local_key():
+    file = get_rsa_local_key()
+
+    if not file:
+        return False
+
+    for path in LOCAL_KEY_PATHS:
+        if os.path.exists(path + file):
+            return path + file
+
+    return False
+
+def verify_rsa_key(key_name):
+    global conf
+    base = ['vpn', 'rsa-keys']
+    if not conf.exists(base):
+        return False
+    return conf.exists(base + ['rsa-key-name', key_name, 'rsa-key'])
+
 def generate(ipsec):
-    if not ipsec:
-        return None
+    data = {}
 
-    return ipsec
+    if ipsec:
+        data = deepcopy(ipsec)
+
+        if 'site_to_site' in data and 'peer' in data['site_to_site']:
+            for peer, peer_conf in ipsec['site_to_site']['peer'].items():
+                if peer_conf['authentication']['mode'] == 'x509':
+                    ca_cert_file = peer_conf['authentication']['x509']['ca_cert_file']
+                    crl_file = peer_conf['authentication']['x509']['crl_file'] if 'crl_file' in peer_conf['authentication']['x509'] else None
+
+                    if not ca_cert_file.startswith(X509_PATH):
+                        ca_cert_file = (X509_PATH + ca_cert_file)
+
+                    if crl_file and not crl_file.startswith(X509_PATH):
+                        crl_file = (X509_PATH + crl_file)
+
+                    call(f'cp -f {ca_cert_file} {CA_PATH}/')
+                    if crl_file:
+                        call(f'cp -f {crl_file} {CRL_PATH}/')
+
+                local_ip = ''
+                if 'local_address' in peer_conf:
+                    local_ip = peer_conf['local_address']
+                elif 'dhcp_interface' in peer_conf:
+                    local_ip = get_dhcp_address(peer_conf['dhcp_interface'])
+
+                data['site_to_site']['peer'][peer]['local_address'] = local_ip
+
+                if 'vti' in peer_conf and 'bind' in peer_conf['vti']:
+                    vti_interface = peer_conf['vti']['bind']
+                    get_mark(vti_interface)
+                else:
+                    for tunnel, tunnel_conf in peer_conf['tunnel'].items():
+                        if ('local' not in tunnel_conf or 'prefix' not in tunnel_conf['local']) or ('remote' not in tunnel_conf or 'prefix' not in tunnel_conf['remote']):
+                            continue
+                        local_prefix = tunnel_conf['local']['prefix']
+                        remote_prefix = tunnel_conf['remote']['prefix']
+                        passthrough = cidr_fit(local_prefix, remote_prefix)
+                        data['site_to_site']['peer'][peer]['tunnel'][tunnel]['passthrough'] = passthrough
+
+        data['authby'] = authby_translate
+        data['ciphers'] = {'ike': ike_ciphers, 'esp': esp_ciphers}
+        data['marks'] = marks
+        data['rsa_local_key'] = verify_rsa_local_key()
+        data['x509_path'] = X509_PATH
+
+        if 'logging' in ipsec and 'log_modes' in ipsec['logging']:
+            modes = ipsec['logging']['log_modes']
+            level = ipsec['logging']['log_level'] if 'log_level' in ipsec['logging'] else '1'
+            if isinstance(modes, str): modes = [modes]
+            if 'any' in modes:
+                modes = ['dmn', 'mgr', 'ike', 'chd', 'job', 'cfg', 'knl', 'net', 'asn', 'enc', 'lib', 'esp', 'tls', 'tnc', 'imc', 'imv', 'pts']
+            data['charondebug'] = f' {level}, '.join(modes) + ' ' + level
+
+    render("/etc/ipsec.conf", "ipsec/ipsec.conf.tmpl", data)
+    render("/etc/ipsec.secrets", "ipsec/ipsec.secrets.tmpl", data)
+    render("/etc/swanctl/swanctl.conf", "ipsec/swanctl.conf.tmpl", data)
 
 def apply(ipsec):
     if not ipsec:
-        return None
+        if conf.exists('vpn l2tp '):
+            call('sudo /usr/sbin/ipsec rereadall')
+            call('sudo /usr/sbin/ipsec reload')
+            call('sudo /usr/sbin/swanctl -q')
+        else:
+            call('sudo /usr/sbin/ipsec stop')
+        cleanup_vti_interfaces()
+        resync_l2tp(conf)
+        resync_nhrp(conf)
+        return
+
+    diff = ConfigDiff(conf, key_mangling=('-', '_'))
+    diff.set_level(['vpn', 'ipsec'])
+
+    old_if, new_if = diff.get_value_diff(['ipsec-interfaces', 'interface'])
+    interface_change = (old_if != new_if)
+
+    should_start = ('profile' in ipsec or ('site_to_site' in ipsec and 'peer' in ipsec['site_to_site']))
+
+    if should_start:
+        apply_vti_interfaces(ipsec)
+    else:
+        cleanup_vti_interfaces()
+
+    if not process_named_running('charon'):
+        args = ''
+        if 'auto_update' in ipsec:
+            args = f'--auto-update {ipsec["auto_update"]}'
+
+        if should_start:
+            call(f'sudo /usr/sbin/ipsec start {args}')
+    else:
+        if not should_start:
+            call('sudo /usr/sbin/ipsec stop')
+        elif interface_change:
+            call('sudo /usr/sbin/ipsec restart')
+        else:
+            call('sudo /usr/sbin/ipsec rereadall')
+            call('sudo /usr/sbin/ipsec reload')
+
+    if should_start:
+        sleep(2) # Give charon enough time to start
+        call('sudo /usr/sbin/swanctl -q')
 
-    pprint(ipsec)
+    resync_l2tp(conf)
+    resync_nhrp(conf)
+
+def apply_vti_interfaces(ipsec):
+    # While vyatta-vti-config.pl is still active, this interface will get deleted by cleanupVtiNotConfigured()
+    if 'site_to_site' in ipsec and 'peer' in ipsec['site_to_site']:
+        for peer, peer_conf in ipsec['site_to_site']['peer'].items():
+            if 'vti' in peer_conf and 'bind' in peer_conf['vti']:
+                vti_interface = peer_conf['vti']['bind']
+                vti_conf = get_vti_interface(vti_interface)
+                if not vti_conf:
+                    continue
+                vti_mtu = vti_conf['mtu'] if 'mtu' in vti_conf else 1500
+                mark = get_mark(vti_interface)
+
+                local_ip = ''
+                if 'local_address' in peer_conf:
+                    local_ip = peer_conf['local_address']
+                elif 'dhcp_interface' in peer_conf:
+                    local_ip = get_dhcp_address(peer_conf['dhcp_interface'])
+
+                call(f'sudo /usr/sbin/ip link delete {vti_interface} type vti', stderr=DEVNULL)
+                call(f'sudo /usr/sbin/ip link add {vti_interface} type vti local {local_ip} remote {peer} okey {mark} ikey {mark}')
+                call(f'sudo /usr/sbin/ip link set {vti_interface} mtu {vti_mtu}')
+                if 'address' in vti_conf:
+                    address = vti_conf['address']
+                    if isinstance(address, list):
+                        for addr in address:
+                            call(f'sudo /usr/sbin/ip addr add {addr} dev {vti_interface}')
+                    else:
+                        call(f'sudo /usr/sbin/ip addr add {address} dev {vti_interface}')
+
+                if 'description' in vti_conf:
+                    description = vti_conf['description']
+                    call(f'sudo echo "{description}" > /sys/class/net/{vti_interface}/ifalias')
+
+def get_vti_interface(vti_interface):
+    global conf
+    section = conf.get_config_dict(['interfaces', 'vti'], get_first_key=True)
+    for interface, interface_conf in section.items():
+        if interface == vti_interface:
+            return interface_conf
+    return None
+
+def cleanup_vti_interfaces():
+    global conf
+    section = conf.get_config_dict(['interfaces', 'vti'], get_first_key=True)
+    for interface, interface_conf in section.items():
+        call(f'sudo /usr/sbin/ip link delete {interface} type vti', stderr=DEVNULL)
+
+def get_mark(vti_interface):
+    global mark_base, mark_index
+    if vti_interface not in marks:
+        marks[vti_interface] = mark_base + mark_index
+        mark_index += 1
+    return marks[vti_interface]
+
+def get_dhcp_address(interface):
+    addr = get_interface_address(interface)
+    if not addr:
+        return None
+    if len(addr['addr_info']) == 0:
+        return None
+    return addr['addr_info'][0]['local']
 
 if __name__ == '__main__':
     try:
-        c = get_config()
-        verify(c)
-        generate(c)
-        apply(c)
+        ipsec = get_config()
+        verify(ipsec)
+        generate(ipsec)
+        apply(ipsec)
     except ConfigError as e:
         print(e)
         exit(1)
diff --git a/src/conf_mode/vpn_rsa-keys.py b/src/conf_mode/vpn_rsa-keys.py
new file mode 100755
index 000000000..a0e2e2690
--- /dev/null
+++ b/src/conf_mode/vpn_rsa-keys.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import base64
+import os
+import struct
+
+from sys import exit
+
+from vyos.config import Config
+from vyos.util import call
+from vyos import ConfigError
+from vyos import airbag
+from Crypto.PublicKey.RSA import construct
+
+airbag.enable()
+
+LOCAL_KEY_PATHS = ['/config/auth/', '/config/ipsec.d/rsa-keys/']
+LOCAL_OUTPUT = '/etc/ipsec.d/certs/localhost.pub'
+
+def get_config(config=None):
+    if config:
+        conf = config
+    else:
+        conf = Config()
+    base = ['vpn', 'rsa-keys']
+    if not conf.exists(base):
+        return None
+
+    return conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True)
+
+def verify(conf):
+    if not conf:
+        return
+
+    if 'local_key' in conf and 'file' in conf['local_key']:
+        local_key = conf['local_key']['file']
+        if not local_key:
+            raise ConfigError(f'Invalid local-key')
+
+        if not get_local_key(local_key):
+            raise ConfigError(f'File not found for local-key: {local_key}')
+
+def get_local_key(local_key):
+    for path in LOCAL_KEY_PATHS:
+        if os.path.exists(path + local_key):
+            return path + local_key
+    return False
+
+def generate(conf):
+    if not conf:
+        return
+
+    if 'local_key' in conf and 'file' in conf['local_key']:
+        local_key = conf['local_key']['file']
+        local_key_path = get_local_key(local_key)
+        call(f'sudo /usr/bin/openssl rsa -in {local_key_path} -pubout -out {LOCAL_OUTPUT}')
+
+    if 'rsa_key_name' in conf:
+        for key_name, key_conf in conf['rsa_key_name'].items():
+            if 'rsa_key' not in key_conf:
+                continue
+
+            remote_key = key_conf['rsa_key']
+
+            if remote_key[:2] == "0s": # Vyatta format
+                remote_key = migrate_from_vyatta_key(remote_key)
+            else:
+                remote_key = bytes('-----BEGIN PUBLIC KEY-----\n' + remote_key + '\n-----END PUBLIC KEY-----\n', 'utf-8')
+
+            with open(f'/etc/ipsec.d/certs/{key_name}.pub', 'wb') as f:
+                f.write(remote_key)
+
+def migrate_from_vyatta_key(data):
+    data = base64.b64decode(data[2:])
+    length = struct.unpack('B', data[:1])[0]
+    e = int.from_bytes(data[1:1+length], 'big')
+    n = int.from_bytes(data[1+length:], 'big')
+    pubkey = construct((n, e))
+    return pubkey.exportKey(format='PEM')
+
+def apply(conf):
+    if not conf:
+        return
+
+    call('sudo /usr/sbin/ipsec rereadall')
+    call('sudo /usr/sbin/ipsec reload')
+
+if __name__ == '__main__':
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        exit(1)
diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook b/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook
new file mode 100644
index 000000000..36edf04f3
--- /dev/null
+++ b/src/etc/dhcp/dhclient-exit-hooks.d/ipsec-dhclient-hook
@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+
+from vyos.util import call
+
+IPSEC_CONF="/etc/ipsec.conf"
+IPSEC_SECRETS="/etc/ipsec.secrets"
+
+def getlines(file):
+    with open(file, 'r') as f:
+        return f.readlines()
+
+def writelines(file, lines):
+    with open(file, 'w') as f:
+        f.writelines(lines)
+
+if __name__ == '__main__':
+    interface = os.getenv('interface')
+    new_ip = os.getenv('new_ip_address')
+    old_ip = os.getenv('old_ip_address')
+    reason = os.getenv('reason')
+
+    if (old_ip == new_ip and reason != 'BOUND') or reason in ['REBOOT', 'EXPIRE']:
+        sys.exit(0)
+
+    conf_lines = getlines(IPSEC_CONF)
+    secrets_lines = getlines(IPSEC_SECRETS)
+    found = False
+    to_match = f'# dhcp:{interface}'
+
+    for i, line in enumerate(conf_lines):
+        if line.find(to_match) > 0:
+            conf_lines[i] = line.replace(old_ip, new_ip)
+            found = True
+
+    for i, line in enumerate(secrets_lines):
+        if line.find(to_match) > 0:
+            secrets_lines[i] = line.replace(old_ip, new_ip)
+
+    if found:
+        writelines(IPSEC_CONF, conf_lines)
+        writelines(IPSEC_SECRETS, secrets_lines)
+        call('sudo /usr/sbin/ipsec rereadall')
+        call('sudo /usr/sbin/ipsec reload')
diff --git a/src/etc/ipsec.d/key-pair.template b/src/etc/ipsec.d/key-pair.template
new file mode 100644
index 000000000..56be97516
--- /dev/null
+++ b/src/etc/ipsec.d/key-pair.template
@@ -0,0 +1,67 @@
+[ req ]
+ default_bits           = 2048
+ default_keyfile        = privkey.pem
+ distinguished_name     = req_distinguished_name
+ string_mask            = utf8only
+ attributes             = req_attributes
+ dirstring_type         = nobmp
+# SHA-1 is deprecated, so use SHA-2 instead.
+ default_md             = sha256
+# Extension to add when the -x509 option is used.
+ x509_extensions        = v3_ca
+
+[ req_distinguished_name ]
+ countryName                    = Country Name (2 letter code)
+ countryName_min                = 2
+ countryName_max                = 2
+ ST             = State Name 
+ localityName                   = Locality Name (eg, city)
+ organizationName               = Organization Name (eg, company)
+ organizationalUnitName         = Organizational Unit Name (eg, department)
+ commonName                     = Common Name (eg, Device hostname)
+ commonName_max                 = 64
+ emailAddress                   = Email Address
+ emailAddress_max               = 40
+[ req_attributes ]
+ challengePassword              = A challenge password (optional)
+ challengePassword_min          = 4
+ challengePassword_max          = 20
+[ v3_ca ]
+ subjectKeyIdentifier=hash
+ authorityKeyIdentifier=keyid:always,issuer:always
+ basicConstraints = critical, CA:true
+ keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+[ v3_intermediate_ca ]
+# Extensions for a typical intermediate CA (`man x509v3_config`).
+ subjectKeyIdentifier = hash
+ authorityKeyIdentifier = keyid:always,issuer
+ basicConstraints = critical, CA:true, pathlen:0
+ keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+[ usr_cert ]
+# Extensions for client certificates (`man x509v3_config`).
+ basicConstraints = CA:FALSE
+ nsCertType = client, email
+ nsComment = "OpenSSL Generated Client Certificate"
+ subjectKeyIdentifier = hash
+ authorityKeyIdentifier = keyid,issuer
+ keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
+ extendedKeyUsage = clientAuth, emailProtection
+[ server_cert ]
+# Extensions for server certificates (`man x509v3_config`).
+ basicConstraints = CA:FALSE
+ nsCertType = server
+ nsComment = "OpenSSL Generated Server Certificate"
+ subjectKeyIdentifier = hash
+ authorityKeyIdentifier = keyid,issuer:always
+ keyUsage = critical, digitalSignature, keyEncipherment
+ extendedKeyUsage = serverAuth
+[ crl_ext ]
+# Extension for CRLs (`man x509v3_config`).
+ authorityKeyIdentifier=keyid:always
+[ ocsp ]
+# Extension for OCSP signing certificates (`man ocsp`).
+ basicConstraints = CA:FALSE
+ subjectKeyIdentifier = hash
+ authorityKeyIdentifier = keyid,issuer
+ keyUsage = critical, digitalSignature
+ extendedKeyUsage = critical, OCSPSigning
diff --git a/src/etc/ipsec.d/vti-up-down b/src/etc/ipsec.d/vti-up-down
new file mode 100644
index 000000000..416966056
--- /dev/null
+++ b/src/etc/ipsec.d/vti-up-down
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+## Script called up strongswan to bring the vti interface up/down based on the state of the IPSec tunnel.
+## Called as vti_up_down vti_intf_name
+
+import os
+import sys
+
+from vyos.config import Config
+from vyos.util import call, get_interface_config, get_interface_address
+
+def get_config(config, base):
+    if not config.exists(base):
+        return None
+
+    return conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True)
+
+def get_dhcp_address(interface):
+    addr = get_interface_address(interface)
+    if not addr:
+        return None
+    if len(addr['addr_info']) == 0:
+        return None
+    return addr['addr_info'][0]['local']
+
+if __name__ == '__main__':
+    verb = os.getenv('PLUTO_VERB')
+    connection = os.getenv('PLUTO_CONNECTION')
+    parent_conn = connection[:-3]
+    interface = sys.argv[1]
+
+    print(f'vti-up-down: start: {verb} {connection} {interface}')
+
+    if verb in ['up-client', 'up-host']:
+        call('sudo /usr/sbin/ip route delete default table 220')
+
+    vti_base = ['interfaces', 'vti', interface]
+    ipsec_base = ['vpn', 'ipsec', 'site-to-site']
+
+    conf = Config()
+    vti_conf = get_config(conf, vti_base)
+    ipsec_conf = get_config(conf, ipsec_base)
+
+    if not vti_conf or 'disable' in vti_conf or not ipsec_conf or 'peer' not in ipsec_conf:
+        print('vti-up-down: exit: vti not found, disabled or no peers found')
+        sys.exit(0)
+
+    peer_conf = None
+
+    for peer, peer_tmp_conf in ipsec_conf['peer'].items():
+        if 'vti' in peer_tmp_conf and 'bind' in peer_tmp_conf['vti']:
+            bind = peer_tmp_conf['vti']['bind']
+            if isinstance(bind, str):
+                bind = [bind]
+            if interface in bind:
+                peer_conf = peer_tmp_conf
+                break
+
+    if not peer_conf:
+        print(f'vti-up-down: exit: No peer found for {interface}')
+        sys.exit(0)
+
+    vti_link = get_interface_config(interface)
+    vti_link_up = vti_link['operstate'] == 'UP' if vti_link else False
+
+    child_sa_installed = False
+    try:
+        child_sa_installed = (call(f'sudo /usr/sbin/swanctl -l -r -i {connection} {parent_conn} | grep -s -q state=INSTALLED', timeout = 5) == 0)
+    except:
+        print('vti-up-down: child-sa check failed')
+
+    if verb in ['up-client', 'up-host']:
+        if not vti_link_up:
+            if 'dhcp_interface' in peer_conf:
+                local_ip = get_dhcp_address(peer_conf['dhcp_interface'])
+                call(f'sudo /usr/sbin/ip tunnel change {interface} local {local_ip}')
+            if child_sa_installed:
+                call(f'sudo /usr/sbin/ip link set {interface} up')
+    elif verb in ['down-client', 'down-host']:
+        if vti_link_up and not child_sa_installed:
+            call(f'sudo /usr/sbin/ip link set {interface} down')
+
+    print('vti-up-down: finish')
diff --git a/src/op_mode/vpn_ike_sa.py b/src/op_mode/vpn_ike_sa.py
new file mode 100755
index 000000000..28da9f8dc
--- /dev/null
+++ b/src/op_mode/vpn_ike_sa.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import argparse
+import re
+import vici
+
+ike_sa_peer_prefix = """\
+Peer ID / IP                            Local ID / IP               
+------------                            -------------"""
+
+ike_sa_tunnel_prefix = """
+
+    State  IKEVer  Encrypt      Hash          D-H Group      NAT-T  A-Time  L-Time
+    -----  ------  -------      ----          ---------      -----  ------  ------"""
+
+def s(byte_string):
+    return str(byte_string, 'utf-8')
+
+def ike_sa(peer, nat):
+    session = vici.Session()
+    sas = session.list_sas()
+    peers = []
+    for conn in sas:
+        for name, sa in conn.items():
+            if peer and not name.startswith('peer-' + peer):
+                continue
+            if name.startswith('peer-') and name in peers:
+                continue
+            if nat and 'nat-local' not in sa:
+                continue
+            peers.append(name)
+            remote_str = f'{s(sa["remote-host"])} {s(sa["remote-id"])}' if s(sa['remote-id']) != '%any' else s(sa["remote-host"])
+            local_str = f'{s(sa["local-host"])} {s(sa["local-id"])}' if s(sa['local-id']) != '%any' else s(sa["local-host"])
+            print(ike_sa_peer_prefix)
+            print('%-39s %-39s' % (remote_str, local_str))
+            state = 'up' if 'state' in sa and s(sa['state']) == 'ESTABLISHED' else 'down'
+            version = 'IKEv' + s(sa['version'])
+            encryption = f'{s(sa["encr-alg"])}_{s(sa["encr-keysize"])}' if 'encr-alg' in sa else 'n/a'
+            integrity = s(sa['integ-alg']) if 'integ-alg' in sa else 'n/a'
+            dh_group = s(sa['dh-group']) if 'dh-group' in sa else 'n/a'
+            natt = 'yes' if 'nat-local' in sa and s(sa['nat-local']) == 'yes' else 'no'
+            atime = s(sa['established']) if 'established' in sa else '0'
+            ltime = s(sa['rekey-time']) if 'rekey_time' in sa else '0'
+            print(ike_sa_tunnel_prefix)
+            print('    %-6s %-6s  %-12s %-13s %-14s %-6s %-7s %-7s\n' % (state, version, encryption, integrity, dh_group, natt, atime, ltime))
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--peer', help='Peer name', required=False)
+    parser.add_argument('--nat', help='NAT Traversal', required=False)
+
+    args = parser.parse_args()
+
+    ike_sa(args.peer, args.nat)
\ No newline at end of file
diff --git a/src/op_mode/vpn_ipsec.py b/src/op_mode/vpn_ipsec.py
new file mode 100755
index 000000000..434186abb
--- /dev/null
+++ b/src/op_mode/vpn_ipsec.py
@@ -0,0 +1,206 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import base64
+import os
+import re
+import struct
+import sys
+import argparse
+from subprocess import TimeoutExpired
+
+from vyos.util import ask_yes_no, call, cmd, process_named_running
+from Crypto.PublicKey.RSA import importKey
+
+RSA_LOCAL_KEY_PATH = '/config/ipsec.d/rsa-keys/localhost.key'
+RSA_LOCAL_PUB_PATH = '/etc/ipsec.d/certs/localhost.pub'
+RSA_KEY_PATHS = ['/config/auth', '/config/ipsec.d/rsa-keys']
+
+X509_CONFIG_PATH = '/etc/ipsec.d/key-pair.template'
+X509_PATH = '/config/auth/'
+
+IPSEC_CONF = '/etc/ipsec.conf'
+SWANCTL_CONF = '/etc/swanctl.conf'
+
+def migrate_to_vyatta_key(path):
+    with open(path, 'r') as f:
+        key = importKey(f.read())
+        e = key.e.to_bytes((key.e.bit_length() + 7) // 8, 'big')
+        n = key.n.to_bytes((key.n.bit_length() + 7) // 8, 'big')
+        return '0s' + str(base64.b64encode(struct.pack('B', len(e)) + e + n), 'ascii')
+    return None
+
+def find_rsa_keys():
+    keys = []
+    for path in RSA_KEY_PATHS:
+        if not os.path.exists(path):
+            continue
+        for filename in os.listdir(path):
+            full_path = os.path.join(path, filename)
+            if os.path.isfile(full_path) and full_path.endswith(".key"):
+                keys.append(full_path)
+    return keys
+
+def show_rsa_keys():
+    for key_path in find_rsa_keys():
+        print('Private key: ' + os.path.basename(key_path))
+        print('Public key: ' + migrate_to_vyatta_key(key_path) + '\n')
+
+def generate_rsa_key(bits = 2192):
+    if (bits < 16 or bits > 4096) or bits % 16 != 0:
+        print('Invalid bit length')
+        return
+
+    if os.path.exists(RSA_LOCAL_KEY_PATH):
+        if not ask_yes_no("A local RSA key file already exists and will be overwritten. Continue?"):
+            return
+
+    print(f'Generating rsa-key to {RSA_LOCAL_KEY_PATH}')
+
+    directory = os.path.dirname(RSA_LOCAL_KEY_PATH)
+    call(f'sudo mkdir -p {directory}')
+    result = call(f'sudo /usr/bin/openssl genrsa -out {RSA_LOCAL_KEY_PATH} {bits}')
+
+    if result != 0:
+        print(f'Could not generate RSA key: {result}')
+        return
+
+    call(f'sudo /usr/bin/openssl rsa -inform PEM -in {RSA_LOCAL_KEY_PATH} -pubout -out {RSA_LOCAL_PUB_PATH}')
+
+    print('Your new local RSA key has been generated')
+    print('The public portion of the key is:\n')
+    print(migrate_to_vyatta_key(RSA_LOCAL_KEY_PATH))
+
+def generate_x509_pair(name):
+    if os.path.exists(X509_PATH + name):
+        if not ask_yes_no("A certificate request with this name already exists and will be overwritten. Continue?"):
+            return
+
+    result = os.system(f'openssl req -new -nodes -keyout {X509_PATH}{name}.key -out {X509_PATH}{name}.csr -config {X509_CONFIG_PATH}')
+    
+    if result != 0:
+        print(f'Could not generate x509 key-pair: {result}')
+        return
+
+    print('Private key and certificate request has been generated')
+    print(f'CSR: {X509_PATH}{name}.csr')
+    print(f'Private key: {X509_PATH}{name}.key')
+
+def get_peer_connections(peer, tunnel, return_all = False):
+    search = rf'^conn (peer-{peer}-(tunnel-[\d]+|vti))$'
+    matches = []
+    with open(IPSEC_CONF, 'r') as f:
+        for line in f.readlines():
+            result = re.match(search, line)
+            if result:
+                suffix = f'tunnel-{tunnel}' if tunnel.isnumeric() else tunnel
+                if return_all or (result[2] == suffix):
+                    matches.append(result[1])
+    return matches
+
+def reset_peer(peer, tunnel):
+    if not peer:
+        print('Invalid peer, aborting')
+        return
+
+    conns = get_peer_connections(peer, tunnel, return_all = (not tunnel or tunnel == 'all'))
+
+    if not conns:
+        print('Tunnel(s) not found, aborting')
+        return
+
+    result = True
+    for conn in conns:
+        try:
+            call(f'sudo /usr/sbin/ipsec down {conn}', timeout = 10)
+            call(f'sudo /usr/sbin/ipsec up {conn}', timeout = 10)
+        except TimeoutExpired as e:
+            print(f'Timed out while resetting {conn}')
+            result = False
+
+
+    print('Peer reset result: ' + ('success' if result else 'failed'))
+
+def get_profile_connection(profile, tunnel = None):
+    search = rf'(dmvpn-{profile}-[\w]+)' if tunnel == 'all' else rf'(dmvpn-{profile}-{tunnel})'
+    with open(SWANCTL_CONF, 'r') as f:
+        for line in f.readlines():
+            result = re.search(search, line)
+            if result:
+                return result[1]
+    return None
+
+def reset_profile(profile, tunnel):
+    if not profile:
+        print('Invalid profile, aborting')
+        return
+
+    if not tunnel:
+        print('Invalid tunnel, aborting')
+        return
+
+    conn = get_profile_connection(profile)
+
+    if not conn:
+        print('Profile not found, aborting')
+        return
+
+    call(f'sudo /usr/sbin/ipsec down {conn}')
+    result = call(f'sudo /usr/sbin/ipsec up {conn}')
+
+    print('Profile reset result: ' + ('success' if result == 0 else 'failed'))
+
+def debug_peer(peer, tunnel):
+    if not peer or peer == "all":
+        call('sudo /usr/sbin/ipsec statusall')
+        return
+
+    if not tunnel or tunnel == 'all':
+        tunnel = ''
+
+    conn = get_peer_connection(peer, tunnel)
+
+    if not conn:
+        print('Peer not found, aborting')
+        return
+
+    call(f'sudo /usr/sbin/ipsec statusall | grep {conn}')
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--action', help='Control action', required=True)
+    parser.add_argument('--bits', help='Bits for rsa-key', required=False)
+    parser.add_argument('--name', help='Name for x509 key-pair, peer for reset', required=False)
+    parser.add_argument('--tunnel', help='Specific tunnel of peer', required=False)
+
+    args = parser.parse_args()
+
+    if args.action == 'rsa-key':
+        bits = int(args.bits) if args.bits else 2192
+        generate_rsa_key(bits)
+    elif args.action == 'rsa-key-show':
+        show_rsa_keys()
+    elif args.action == 'x509':
+        if not args.name:
+            print('Invalid name for key-pair, aborting.')
+            sys.exit(0)
+        generate_x509_pair(args.name)
+    elif args.action == 'reset-peer':
+        reset_peer(args.name, args.tunnel)
+    elif args.action == "reset-profile":
+        reset_profile(args.name, args.tunnel)
+    elif args.action == "vpn-debug":
+        debug_peer(args.name, args.tunnel)