From 960dd97d68999a3e573d32e06be5362efa037b55 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 22 Mar 2022 15:33:00 +0100
Subject: [PATCH] Tell sed to follow symlinks

---
 Vagrantfile            | 4 ++--
 lib/bkctld-firewall    | 2 +-
 lib/bkctld-ip          | 2 +-
 lib/bkctld-port        | 2 +-
 test/connectivity.bats | 2 +-
 test/test_helper.bash  | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 9791669..796fc2b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -28,8 +28,8 @@ DEBIAN_FRONTEND=noninteractive apt-get -yq install openssh-server btrfs-progs rs
 SCRIPT
 
   $pre_part = <<SCRIPT
-sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
-    sed -i -e 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/' /etc/locale.gen && \
+sed --follow-symlinks --in-place -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    sed --follow-symlinks --in-place -e 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/' /etc/locale.gen && \
     echo 'LANG="fr_FR.UTF-8"'>/etc/default/locale && \
     dpkg-reconfigure --frontend=noninteractive locales && \
     update-locale LANG=fr_FR.UTF-8
diff --git a/lib/bkctld-firewall b/lib/bkctld-firewall
index 7cb434c..a7eeecf 100755
--- a/lib/bkctld-firewall
+++ b/lib/bkctld-firewall
@@ -25,7 +25,7 @@ iptables_input_accept() {
 
 if [ -n "${FIREWALL_RULES}" ]; then
     # remove existing rules for this jail
-    [ -f "${FIREWALL_RULES}" ] && sed -i "/#${jail_name}$/d" "${FIREWALL_RULES}"
+    [ -f "${FIREWALL_RULES}" ] && sed --follow-symlinks --in-place "/#${jail_name}$/d" "${FIREWALL_RULES}"
     if [ -d "${jail_path}" ]; then
         port=$("${LIBDIR}/bkctld-port" "${jail_name}")
         # Add a rule for each IP
diff --git a/lib/bkctld-ip b/lib/bkctld-ip
index 83e8e33..7887cf7 100755
--- a/lib/bkctld-ip
+++ b/lib/bkctld-ip
@@ -38,7 +38,7 @@ else
         allow_users="${allow_users} root@${new_ip}"
     done
     if grep -q -E "^AllowUsers" "${jail_sshd_config}"; then
-        sed -i "s~^AllowUsers .*~${allow_users}~" "${jail_sshd_config}"
+        sed --follow-symlinks --in-place "s~^AllowUsers .*~${allow_users}~" "${jail_sshd_config}"
     else
         error "No \`AllowUsers' directive found in \`${jail_sshd_config}'"
     fi
diff --git a/lib/bkctld-port b/lib/bkctld-port
index 2b1f17d..77cf4cd 100755
--- a/lib/bkctld-port
+++ b/lib/bkctld-port
@@ -27,7 +27,7 @@ else
         port=$((port+1))
         [ "${port}" -le 1 ] && port=2222
     fi
-    sed -i "s/^Port .*/Port ${port}/" "${jail_sshd_config}"
+    sed --follow-symlinks --in-place "s/^Port .*/Port ${port}/" "${jail_sshd_config}"
 
     notice "Update SSH port \`${port}' for jail \`${jail_name}' : OK"
 
diff --git a/test/connectivity.bats b/test/connectivity.bats
index 03d0cee..7e64530 100644
--- a/test/connectivity.bats
+++ b/test/connectivity.bats
@@ -61,7 +61,7 @@ load test_helper
 
 @test "Missing AllowUsers" {
     # Remove AllowUsers directive in SSH config
-    sed -i '/^AllowUsers/d' "${JAILPATH}/etc/ssh/sshd_config"
+    sed --follow-symlinks --in-place '/^AllowUsers/d' "${JAILPATH}/etc/ssh/sshd_config"
     # An error should be raised when trying to add an IP restriction
     run /usr/lib/bkctld/bkctld-ip "${JAILNAME}" "10.0.0.1"
     assert_failure
diff --git a/test/test_helper.bash b/test/test_helper.bash
index b0cf5d3..8de9fb5 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -40,7 +40,7 @@ set_variable() {
     var_value=${3:-}
 
     if grep -qE "^\s*${var_name}=" "${file}"; then
-        sed -i "s|^\s*${var_name}=.*|${var_name}=${var_value}|" "${file}"
+        sed --follow-symlinks --in-place "s|^\s*${var_name}=.*|${var_name}=${var_value}|" "${file}"
     else
         echo "${var_name}=${var_value}" >> "${file}"
     fi
@@ -49,7 +49,7 @@ remove_variable() {
     file=${1:?}
     var_name=${2:?}
 
-    sed -i "s|^\s*${var_name}=.*|d" "${file}"
+    sed --follow-symlinks --in-place "s|^\s*${var_name}=.*|d" "${file}"
 }
 
 is_btrfs() {