From b17a5f352d6e774561d079356bde9e6d17a10de8 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 1 Jul 2023 15:23:21 -0400
Subject: [PATCH] Sanitize network interface names in jail_netgraph_bridge.bash
 script.

---
 ansible/environments/colo/host_vars/mrmanager      |  9 ---------
 ansible/roles/jail/files/jail_netgraph_bridge.bash |  8 ++++++--
 .../roles/jail/files/jails/persistent_volume.conf  | 14 --------------
 3 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 ansible/roles/jail/files/jails/persistent_volume.conf

diff --git a/ansible/environments/colo/host_vars/mrmanager b/ansible/environments/colo/host_vars/mrmanager
index a8fa5c1..5c02e57 100644
--- a/ansible/environments/colo/host_vars/mrmanager
+++ b/ansible/environments/colo/host_vars/mrmanager
@@ -31,15 +31,6 @@ jail_list:
     enabled: true
     conf:
       src: public_dns
-  - name: persistent_volume
-    enabled: true
-    conf:
-      src: persistent_volume
-    persist:
-      - name: volumes
-        mount: /volumes
-        # properties:
-        #   recordsize: "8192"
 bhyve_dataset: zdata/vm
 bhyve_canmount: "on"
 # efi_dev: /dev/gpt/EFI
diff --git a/ansible/roles/jail/files/jail_netgraph_bridge.bash b/ansible/roles/jail/files/jail_netgraph_bridge.bash
index a17dbd0..70b9992 100644
--- a/ansible/roles/jail/files/jail_netgraph_bridge.bash
+++ b/ansible/roles/jail/files/jail_netgraph_bridge.bash
@@ -20,7 +20,7 @@ function main {
 function start_jail {
     host_interface_name="$1"
     bridge_name="bridge_${host_interface_name}"
-    jail_interface_name="$2"
+    jail_interface_name=$(sanitize_interface_name "$2")
     ip_range="$3"
 
     assert_bridge "$host_interface_name" "$bridge_name" "$ip_range"
@@ -36,7 +36,7 @@ EOF
 function stop_jail {
     host_interface_name="$1"
     bridge_name="bridge_${host_interface_name}"
-    jail_interface_name="$2"
+    jail_interface_name=$(sanitize_interface_name "$2")
 
     if ng_exists "${jail_interface_name}:"; then
         wait_for_interface_to_exist "${jail_interface_name}" 120
@@ -117,4 +117,8 @@ function wait_for_interface_to_exist {
     done
 }
 
+function sanitize_interface_name {
+    echo "${1:0:15}"
+}
+
 main "${@}"
diff --git a/ansible/roles/jail/files/jails/persistent_volume.conf b/ansible/roles/jail/files/jails/persistent_volume.conf
deleted file mode 100644
index 47fc86e..0000000
--- a/ansible/roles/jail/files/jails/persistent_volume.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-persistent_volume {
-    path = "/jail/main/jails/${name}";
-    vnet;
-    exec.prestart += "/usr/local/bin/jail_netgraph_bridge start jail_nat jail${name} 10.215.1.1/24";
-    exec.poststop += "/usr/local/bin/jail_netgraph_bridge stop jail_nat jail${name}";
-    vnet.interface += "jail${name}";
-
-    devfs_ruleset = 14;
-    mount.devfs;
-
-    exec.start += "/bin/sh /etc/rc";
-    exec.stop = "/bin/sh /etc/rc.shutdown jail";
-    exec.consolelog = "/var/log/jail_${name}_console.log";
-}