tools: Use `install` instead of `touch/chown` combination

touch + chown can have a gap between the commands (or the second failed).

This could lead to unexpected permissions (root, instead of frr) for some
.conf files or directories.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/tools/frr.in b/tools/frr.in
index 27b2c0ab84d8a83b47fe97969ec17226024ba802..f0c665fdee7252fe70a3901073f49682ae6e5277 100755 (executable)
--- a/tools/frr.in
+++ b/tools/frr.in
@@ -53,13 +53,6 @@ vtyfile()
        echo "$V_PATH/$1.vty"
 }
 
-chownfrr()
-{
-       test -n "$FRR_USER" && chown "$FRR_USER" "$1"
-       test -n "$FRR_GROUP" && chgrp "$FRR_GROUP" "$1"
-       test -n "$FRR_CONFIG_MODE" && chmod "$FRR_CONFIG_MODE" "$1"
-}
-
 # Check if daemon is started by using the pidfile.
 started()
 {
@@ -103,12 +96,10 @@ check_daemon()
                # check for config file
                if [ -n "$2" ]; then
                        if [ ! -r "$C_PATH/$1-$2.conf" ]; then
-                               touch "$C_PATH/$1-$2.conf"
-                               chownfrr "$C_PATH/$1-$2.conf"
+                               install -g "$FRR_GROUP" -o "$FRR_USER" -m "$FRR_CONFIG_MODE" /dev/null "$C_PATH/$1-$2.conf"
                        fi
                elif [ ! -r "$C_PATH/$1.conf" ]; then
-                       touch "$C_PATH/$1.conf"
-                       chownfrr "$C_PATH/$1.conf"
+                       install -g "$FRR_GROUP" -o "$FRR_USER" -m "$FRR_CONFIG_MODE" /dev/null "$C_PATH/$1.conf"
                fi
        fi
        return 0
@@ -533,9 +524,8 @@ convert_daemon_prios
 
 if [ ! -d $V_PATH ]; then
        echo "Creating $V_PATH"
-       mkdir -p $V_PATH
-       chownfrr $V_PATH
-       chmod 755 /$V_PATH
+       install -g "$FRR_GROUP" -o "$FRR_USER" -m "$FRR_CONFIG_MODE" -d /proc "$V_PATH"
+       chmod gu+x "${V_PATH}"
 fi
 
 if [ -n "$3" ] && [ "$3" != "all" ]; then

diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
index b589ced965aec46e89728b46adaa98ee335cb6af..469b9c5d8c1ecce075ab09301b9458641589e849 100755 (executable)
--- a/tools/frrcommon.sh.in
+++ b/tools/frrcommon.sh.in
@@ -62,15 +62,6 @@ debug() {
        printf '\n' >&2
 }
 
-chownfrr() {
-       [ -n "$FRR_USER" ] && chown "$FRR_USER" "$1"
-       [ -n "$FRR_GROUP" ] && chgrp "$FRR_GROUP" "$1"
-       [ -n "$FRR_CONFIG_MODE" ] && chmod "$FRR_CONFIG_MODE" "$1"
-       if [ -d "$1" ]; then
-               chmod gu+x "$1"
-       fi
-}
-
 vtysh_b () {
        [ "$1" = "watchfrr" ] && return 0
        if [ ! -r "$C_PATH/frr.conf" ]; then
@@ -152,8 +143,7 @@ daemon_prep() {
 
        cfg="$C_PATH/$daemon${inst:+-$inst}.conf"
        if [ ! -r "$cfg" ]; then
-               touch "$cfg"
-               chownfrr "$cfg"
+               install -g "$FRR_GROUP" -o "$FRR_USER" -m "$FRR_CONFIG_MODE" /dev/null "$cfg"
        fi
        return 0
 }
@@ -171,8 +161,8 @@ daemon_start() {
        [ "$MAX_FDS" != "" ] && ulimit -n "$MAX_FDS" > /dev/null 2> /dev/null
        daemon_prep "$daemon" "$inst" || return 1
        if test ! -d "$V_PATH"; then
-               mkdir -p "$V_PATH"
-               chownfrr "$V_PATH"
+               install -g "$FRR_GROUP" -o "$FRR_USER" -m "$FRR_CONFIG_MODE" -d /proc "$V_PATH"
+               chmod gu+x "${V_PATH}"
        fi
 
        eval wrap="\$${daemon}_wrap"