Fix hook settings writing and checking

Formerly the check functions were not correctly called in
some cases. Hence passing the check function is now explicitely
required. The {port,zone}_settings_{read,write} functions do
this transparent to the zone/port hooks.

diff --git a/src/functions/functions.list b/src/functions/functions.list
index 062df27eb99d30fd20be1c4d5602cd2a4c987e40..0f11c32c3b8f38b423d1670d90eeb1553942135d 100644 (file)
--- a/src/functions/functions.list
+++ b/src/functions/functions.list
@@ -24,6 +24,19 @@
 
 function list_append() {
        local list=${1}
+       assert isset list
+       shift
+
+       local arg
+       for arg in $@; do
+               list_append_one "${list}" "${arg}"
+       done
+}
+
+function list_append_one() {
+       assert [ $# -eq 2 ]
+
+       local list="${1}"
        shift
 
        assert isset list

diff --git a/src/functions/functions.ports b/src/functions/functions.ports
index 5bed4d8bf8739a5c1353a88150daa4a9f535b615..58f60cd180c5fd2248591b0fbffaed801c152fbc 100644 (file)
--- a/src/functions/functions.ports
+++ b/src/functions/functions.ports
@@ -40,12 +40,11 @@ function port_config_dir() {
 function port_settings_read() {
        local port="${1}"
        assert isset port
-       shift
 
        # Save the HOOK variable.
        local hook="${HOOK}"
 
-       settings_read "$(port_file "${port}")" "$@"
+       settings_read "$(port_file "${port}")" ${HOOK_SETTINGS}
 
        # Restore hook.
        HOOK="${hook}"
@@ -56,7 +55,13 @@ function port_settings_write() {
        assert isset port
        shift
 
-       settings_write "$(port_file "${port}")" "$@"
+       local args
+       if function_exists "hook_check_settings"; then
+               list_append args "--check=\"hook_check_settings\""
+       fi
+       list_append args ${HOOK_SETTINGS}
+
+       settings_write "$(port_file "${port}")" ${args}
 }
 
 function ports_get_all() {

diff --git a/src/functions/functions.settings b/src/functions/functions.settings
index 8b5ac98ec74efa636aadd1a1d5f1bdbd211af40d..2f2821ff0e1a7f168b721b4a38f65010c185c64c 100644 (file)
--- a/src/functions/functions.settings
+++ b/src/functions/functions.settings
@@ -132,13 +132,30 @@ function settings_strip() {
 }
 
 function settings_write() {
-       local settings_file=${1}
+       local settings_file="${1}"
        assert isset settings_file
        shift
 
+       local check_func
+
+       local arg
+       while read arg; do
+               case "${arg}" in
+                       --check=*)
+                               check_func="$(cli_get_val "${arg}")"
+                               ;;
+
+                       # Stop argument processing when reaching the first
+                       # configuration parameter
+                       *)
+                               break
+                               ;;
+               esac
+               shift
+       done <<< "$(args $@)"
+
        # Check if all values to be written are sane
-       if ! settings_check; then
-               log CRITICAL "Configuration check failed. No settings have been written."
+       if isset check_func && ! settings_check "${check_func}"; then
                return ${EXIT_ERROR}
        fi
 
@@ -174,13 +191,34 @@ function settings_print() {
 }
 
 function settings_check() {
-       # If there is a function defined that is called __check
-       # we call that function
-       if [ -n "$(type -t hook_check)" ]; then
-               hook_check || return $?
-       fi
-
-       return ${EXIT_OK}
+       local check_func="${1}"
+
+       # Execute the check function
+       "${check_func}"
+       local ret="${?}"
+
+       case "${ret}" in
+               # OK
+               ${EXIT_OK}|${EXIT_TRUE})
+                       log DEBUG "Configuration check succeeded."
+                       return ${EXIT_TRUE}
+                       ;;
+
+               # Error
+               ${EXIT_ERROR}|${EXIT_FALSE})
+                       log CRITICAL "Configuration check failed. No settings have been written."
+                       return ${EXIT_FALSE}
+                       ;;
+
+               # Command not found
+               ${EXIT_COMMAND_NOT_FOUND})
+                       log CRITICAL "Configuration check function '${check_func}' was not found."
+                       return ${EXIT_FALSE}
+                       ;;
+       esac
+
+       log CRITICAL "Unhandled exit code for '${check_func}': ${ret}"
+       return ${EXIT_ERROR}
 }
 
 function settings_set() {

diff --git a/src/functions/functions.util b/src/functions/functions.util
index f627d99dd0c779cca3efc1180ec45ba752cd983a..18a8f18482cf401c9461c813a37ff4dbe5e53fef 100644 (file)
--- a/src/functions/functions.util
+++ b/src/functions/functions.util
@@ -436,6 +436,16 @@ function binary_exists() {
        return ${EXIT_ERROR}
 }
 
+function function_exists() {
+       local function="${1}"
+
+       if [ "$(type -t "${function}")" = "function" ]; then
+               return ${EXIT_TRUE}
+       fi
+
+       return ${EXIT_FALSE}
+}
+
 function process_kill() {
        local process=${1}
 

diff --git a/src/functions/functions.zone b/src/functions/functions.zone
index 26fed661ad980e3fe99d259fd4cb41ab6fe5fba4..22688a26490bff235fcc021df5738286c611e8b9 100644 (file)
--- a/src/functions/functions.zone
+++ b/src/functions/functions.zone
@@ -855,24 +855,28 @@ function zone_file() {
 
 function zone_settings_read() {
        local zone=${1}
-
        assert isset zone
 
        # Save the HOOK variable.
        local hook="${HOOK}"
 
-       settings_read $(zone_file ${zone})
+       settings_read "${zone}" ${HOOK_SETTINGS}
 
        # Restore hook.
        HOOK="${hook}"
 }
 
 function zone_settings_write() {
-       local zone=${1}
-
+       local zone="${1}"
        assert isset zone
 
-       settings_write $(zone_file ${zone}) ${HOOK_SETTINGS}
+       local args
+       if function_exists "hook_check_settings"; then
+               list_append args "--check=\"hook_check_settings\""
+       fi
+       list_append args ${HOOK_SETTINGS}
+
+       settings_write "$(zone_file ${zone})" ${args}
 }
 
 function zone_settings_set() {
@@ -901,7 +905,8 @@ function zone_settings_get() {
        assert isset key
 
        (
-               zone_settings_read ${zone}
+               zone_settings_read "${zone}" "${key}" \
+                       --ignore-superfluous-settings
 
                echo "${!key}"
        )
@@ -947,8 +952,14 @@ function zone_port_settings_write() {
        local port="${2}"
        shift 2
 
+       local args
+       if function_exists "hook_check_port_settings"; then
+               list_append args "--check=\"hook_check_port_settings\""
+       fi
+       list_append args $@
+
        local path="$(zone_dir "${zone}")/ports/${port}"
-       settings_write "${path}" "$@"
+       settings_write "${path}" ${args}
 }
 
 function zone_port_settings_remove() {

diff --git a/src/header-zone b/src/header-zone
index a9e1ebef226a41761b706963be1795bf6366d02b..1f3a6612a8393e67a643f9161d30531c20ae3cdc 100644 (file)
--- a/src/header-zone
+++ b/src/header-zone
@@ -34,17 +34,17 @@ function hook_new() {
        assert isset zone
        shift
 
-       settings_read $(zone_dir ${zone})/settings
+       zone_settings_read "${zone}"
 
        hook_parse_cmdline $@
 
-       settings_write $(zone_dir ${zone})/settings ${HOOK_SETTINGS}
+       zone_settings_write "${zone}"
 
        exit ${EXIT_OK}
 }
 
 function hook_edit() {
-       hook_create $@
+       hook_new $@
 }
 
 function hook_remove() {

diff --git a/src/hooks/ports/batman-adv b/src/hooks/ports/batman-adv
index 99080cf53434aa8eb39b37436549be5b4fb2de3c..40b9735f69c2922ae4ac164e64cfb143079eac5d 100644 (file)
--- a/src/hooks/ports/batman-adv
+++ b/src/hooks/ports/batman-adv
@@ -28,7 +28,7 @@ PORT_CHILDREN_VAR="SLAVES"
 ADDRESS=$(mac_generate)
 SLAVES=
 
-function hook_check() {
+function hook_check_settings() {
        assert isset ADDRESS
        assert ismac ADDRESS
 }

diff --git a/src/hooks/ports/bonding b/src/hooks/ports/bonding
index 33a3167ca15e585f365fc65ac2af7aa9642c9b1c..b554c44b4477ff73985954eb4d7801ca02737fc2 100644 (file)
--- a/src/hooks/ports/bonding
+++ b/src/hooks/ports/bonding
@@ -28,7 +28,7 @@ SLAVES=""
 MIIMON=100
 MODE="balance-rr"
 
-function hook_check() {
+function hook_check_settings() {
        assert isset ADDRESS
        assert ismac ADDRESS
 

diff --git a/src/hooks/ports/dummy b/src/hooks/ports/dummy
index df41ac9fde422a4968dffb825c3f3a3fdffea07c..617084e44b28db03a1fe29ef24ce27a054986d2f 100644 (file)
--- a/src/hooks/ports/dummy
+++ b/src/hooks/ports/dummy
@@ -23,7 +23,7 @@
 
 HOOK_SETTINGS="HOOK ADDRESS"
 
-function hook_check() {
+function hook_check_settings() {
        assert ismac ADDRESS
 }
 

diff --git a/src/hooks/ports/ethernet b/src/hooks/ports/ethernet
index fca74ae71ed272bccf201d437e79b988e04ba722..783e0fc7eb70251dd34090b8c63d917f8c8a1335 100644 (file)
--- a/src/hooks/ports/ethernet
+++ b/src/hooks/ports/ethernet
@@ -26,7 +26,7 @@
 
 HOOK_SETTINGS="HOOK ADDRESS DEVICE"
 
-function hook_check() {
+function hook_check_settings() {
        assert ismac DEVICE
 
        if isset ADDRESS; then

diff --git a/src/hooks/ports/vlan b/src/hooks/ports/vlan
index 6ab0aecf956d33019585d73c762bdd6103883d6f..b95f6a980fa7f4b081e78d4d033096ba2fda9c3e 100644 (file)
--- a/src/hooks/ports/vlan
+++ b/src/hooks/ports/vlan
@@ -25,7 +25,7 @@ HOOK_SETTINGS="HOOK ADDRESS PARENT_DEVICE TAG"
 
 PORT_PARENTS_VAR="PARENT"
 
-function hook_check() {
+function hook_check_settings() {
        assert isset PARENT_DEVICE
        assert isinteger TAG
 

diff --git a/src/hooks/ports/wireless-adhoc b/src/hooks/ports/wireless-adhoc
index 1544473cb3d1dcadf0f55f6e7d7894bedfe04e05..7c9ea3654c945de31ba92bf7806e888812ecb9f1 100644 (file)
--- a/src/hooks/ports/wireless-adhoc
+++ b/src/hooks/ports/wireless-adhoc
@@ -30,7 +30,7 @@ MTU=1500
 PHY=
 SSID=
 
-function hook_check() {
+function hook_check_settings() {
        assert isset ADDRESS
        assert ismac ADDRESS
        assert isset CHANNEL

diff --git a/src/hooks/ports/wireless-ap b/src/hooks/ports/wireless-ap
index 8de0aba398e818d74e9c673e0c0a4943271faf05..3ff80d06136050d15cd71de1dc50c61d4f5cb470 100644 (file)
--- a/src/hooks/ports/wireless-ap
+++ b/src/hooks/ports/wireless-ap
@@ -32,7 +32,7 @@ KEY=""
 MODE="g"
 SSID=
 
-function hook_check() {
+function hook_check_settings() {
        assert isset ADDRESS
        assert ismac ADDRESS
        assert isset BROADCAST_SSID

diff --git a/src/hooks/zones/6rd b/src/hooks/zones/6rd
index 2777c9076e1dc73995159ae0e7150d7653a3641b..a0a9bf951be9de855d9e10da8e7be03545a117ea 100644 (file)
--- a/src/hooks/zones/6rd
+++ b/src/hooks/zones/6rd
@@ -36,7 +36,7 @@ SERVER_ADDRESS=""
 # The public IPv4 address of the tunnel client.
 PUBLIC_ADDRESS=""
 
-function hook_check() {
+function hook_check_settings() {
        assert isset SIX_RD_PREFIX
        assert isset PUBLIC_ADDRESS
        assert isset SERVER_ADDRESS
@@ -101,7 +101,7 @@ function hook_up() {
        assert isset zone
 
        # Read configuration options.
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # Configure the tunnel.
        if ! device_exists "${zone}"; then
@@ -150,7 +150,7 @@ function hook_status() {
 
        cli_device_headline ${zone}
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        local server_line="${SERVER_ADDRESS}"
        local server_hostname=$(dns_get_hostname ${SERVER_ADDRESS})

diff --git a/src/hooks/zones/6to4-tunnel b/src/hooks/zones/6to4-tunnel
index 898d89853c452511feb2727d78bca975cba36f67..2fc91ad2a6ad5fc14357be0eea4af912bd472f99 100644 (file)
--- a/src/hooks/zones/6to4-tunnel
+++ b/src/hooks/zones/6to4-tunnel
@@ -44,7 +44,7 @@ TUNNEL_ID=
 USERNAME=
 PASSWORD=
 
-function hook_check() {
+function hook_check_settings() {
        assert isset SERVER_ADDRESS
        assert isset LOCAL_ADDRESS
        assert isset LOCAL_ADDRESS6
@@ -102,7 +102,7 @@ function hook_up() {
        assert isset zone
 
        # Read configuration options.
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        if enabled AUTO_UPDATE_ENDPOINT; then
                log DEBUG "Updating tunnel endpoint"
@@ -156,7 +156,7 @@ function hook_status() {
 
        cli_device_headline ${zone}
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        local server_line="${SERVER_ADDRESS}"
        local server_hostname=$(dns_get_hostname ${SERVER_ADDRESS})

diff --git a/src/hooks/zones/aiccu b/src/hooks/zones/aiccu
index 86030a4be77564c78e1c05d1d0472a3939899a98..d8852ebf247e7b631e20414ab63744bb7fab0860 100644 (file)
--- a/src/hooks/zones/aiccu
+++ b/src/hooks/zones/aiccu
@@ -30,7 +30,7 @@ PROTOCOL="tic"
 TUNNEL_ID=
 REQUIRE_TLS="true"
 
-function hook_check() {
+function hook_check_settings() {
        assert isset USERNAME
        assert isset PASSWORD
        assert isset SERVER
@@ -109,7 +109,7 @@ function hook_status() {
 
        cli_device_headline ${zone}
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        cli_headline 2 "Configuration"
        cli_print_fmt1 2 "User" "${USERNAME}"

diff --git a/src/hooks/zones/bridge b/src/hooks/zones/bridge
index 021e4402cda18dd70e425640b729f427fd0d8091..b29c968090d6eb09119e072ea5bd1d6cebd6fbae 100644 (file)
--- a/src/hooks/zones/bridge
+++ b/src/hooks/zones/bridge
@@ -38,7 +38,7 @@ STP_HELLO=2
 STP_MAXAGE=20
 STP_PRIORITY=512
 
-function hook_check() {
+function hook_check_settings() {
        assert ismac MAC
        assert isbool STP
        assert isoneof STP_MODE stp rstp
@@ -84,7 +84,7 @@ function hook_up() {
        local zone=${1}
        assert isset zone
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # Create the bridge if it does not already exist.
        if ! device_exists "${zone}"; then

diff --git a/src/hooks/zones/modem b/src/hooks/zones/modem
index 7e2e688211bc62462240d17c9877878b9538748e..441e95e2cc65f452beb5c90c0d859011e192df8c 100644 (file)
--- a/src/hooks/zones/modem
+++ b/src/hooks/zones/modem
@@ -70,7 +70,7 @@ HOOK_SETTINGS="${HOOK_SETTINGS} PHONE_NUMBER"
 IMSI=
 HOOK_SETTINGS="${HOOK_SETTINGS} IMSI"
 
-function hook_check() {
+function hook_check_settings() {
        assert isset DEVICE
        assert isset PHONE_NUMBER
 
@@ -140,14 +140,14 @@ function hook_up() {
        assert isset zone
 
        # Load configuration file.
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # If we have got a PIN, we try to unlock the device first.
        if isset PIN; then
                if ! modem_sim_auto_unlock "${DEVICE}" "${PIN}"; then
                        # Reset the PIN setting.
                        PIN=""
-                       zone_settings_write "${zone}" ${HOOK_SETTINGS}
+                       zone_settings_write "${zone}"
                        error "Could not unlock the SIM card. Removing PIN from settings."
                fi
 
@@ -179,7 +179,7 @@ function hook_status() {
 
        cli_device_headline ${zone}
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        cli_headline 2 "Configuration"
        cli_print_fmt1 2 "Username" "${USERNAME}"
@@ -272,7 +272,7 @@ function hook_ppp_write_config() {
        assert isset file
 
        # Read in the configuration files.
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        pppd_write_config ${file} \
                --interface="${zone}" \

diff --git a/src/hooks/zones/pppoe b/src/hooks/zones/pppoe
index b201ebe7dd19d582044bed11f8ee79e7714a53e7..461d7a995752db3dc145698a118ca1a63999a020 100644 (file)
--- a/src/hooks/zones/pppoe
+++ b/src/hooks/zones/pppoe
@@ -51,7 +51,7 @@ IPV6="true"
 # Use IPv6 prefix delegation.
 PREFIX_DELEGATION="false"
 
-function hook_check() {
+function hook_check_settings() {
        assert isset USERNAME
        assert isset PASSWORD
 
@@ -105,7 +105,7 @@ function hook_up() {
        local zone=${1}
        assert isset zone
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # Bring up the port.
        local port=$(__hook_get_port "${zone}")
@@ -121,7 +121,7 @@ function hook_down() {
        local zone=${1}
        assert isset zone
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # Stop the ppp daemon.
        pppd_stop ${zone}
@@ -170,7 +170,7 @@ function hook_status() {
 
        cli_device_headline ${zone}
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        cli_headline 2 "Configuration"
        cli_print_fmt1 2 "Username" "${USERNAME}"
@@ -228,7 +228,7 @@ function hook_ppp_write_config() {
        assert isset file
 
        # Read in the configuration files.
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # A port has to be assigned for this action
        local port=$(__hook_get_port "${zone}")

diff --git a/src/hooks/zones/pptp b/src/hooks/zones/pptp
index 5902a5b5a0466a04a0966152f4c5615bf1cedd30..2ce9e9322641acb791374f5cd1c7fd4f08f82fcf 100644 (file)
--- a/src/hooks/zones/pptp
+++ b/src/hooks/zones/pptp
@@ -57,7 +57,7 @@ PREFIX_DELEGATION="false"
 # A list of refused authentification methods.
 REFUSED_AUTH_METHODS=""
 
-function hook_check() {
+function hook_check_settings() {
        assert isset USERNAME
        assert isset PASSWORD
        assert isset PEER_ADDRESS
@@ -167,7 +167,7 @@ function hook_up() {
        local zone="${1}"
        assert isset zone
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # Check if a port will be used.
        if isset PORT; then
@@ -195,7 +195,7 @@ function hook_down() {
        local zone="${1}"
        assert isset zone
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # Stop the ppp daemon.
        pppd_stop "${zone}"
@@ -225,7 +225,7 @@ function hook_status() {
 
        cli_device_headline "${zone}"
 
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # Display port configuration if a port is used.
        if isset PORT; then
@@ -283,7 +283,7 @@ function hook_ppp_write_config() {
        assert isset file
 
        # Read in the configuration files.
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        # Prepare the command line options for the pptp plugin.
        local pptp_commandline="pptp ${PEER_ADDRESS} --nolaunchpppd"

diff --git a/src/hooks/zones/wireless b/src/hooks/zones/wireless
index e376ab0c19e48020c3b2a4e2cb11afb52a7da071..52a3da3080cf7c5c52b2867a3f51d81dcc50164e 100644 (file)
--- a/src/hooks/zones/wireless
+++ b/src/hooks/zones/wireless
@@ -31,7 +31,7 @@ SSID=
 KEY=
 ENCRYPTION_MODE=
 
-function hook_check() {
+function hook_check_settings() {
        assert isset SSID
 
        if isset ADDRESS; then
@@ -81,7 +81,7 @@ function hook_up() {
        assert isset zone
 
        # Read zone configuration.
-       zone_settings_read "${zone}" ${HOOK_SETTINGS}
+       zone_settings_read "${zone}"
 
        if ! device_exists ${zone}; then
                #  Create the wireless interface.