From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: network@lists.ipfire.org Subject: Re: [PATCH] config hook: prevent two hooks with the same settings Date: Wed, 12 Jul 2017 18:09:53 -0400 Message-ID: <1499897393.2292.6.camel@ipfire.org> In-Reply-To: <1499780508-14972-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2133674978811282393==" List-Id: --===============2133674978811282393== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Hi, I think I might have an other idea, but I am not sure if it does not have many flaws. So here it is as RFC: If we would implement a function called hook_hash() that returns something that is unique to that hook. If a second instance of a hook gets the same hash, we have a conflict. That would allow us to check for conflicts across multiple variables, since this approach is hook-agnostic. That would make this very fast. As a default we could just check for all SETTINGS variables. For ipv4- static for example, we would return a string like "ipv4-static- ${ADDRESS}". A downside is, that we kind of don't know where the conflict was which could lead to some senseless error messages. But we might be able to catch that in the hook that has just been called. What do you think of that approach? Best, -Michael On Tue, 2017-07-11 at 15:41 +0200, Jonatan Schlag wrote: > A ipv4-static config with the same IPv4 address twice is senseless. > A new function zone_config_check_same_setting is introduced. > The function provides an easy way to check if a config > of the given hook has the same value for a given key. > We can now check inside hook_new if an ipv4-static or ipv6-static > config > with the same value exist and break with an error. > > Fixes: #11418 > > Signed-off-by: Jonatan Schlag > --- >  src/functions/functions.zone  | 33 +++++++++++++++++++++++++++++++++ >  src/hooks/configs/ipv4-static |  5 +++++ >  src/hooks/configs/ipv6-static |  5 +++++ >  3 files changed, 43 insertions(+) > > diff --git a/src/functions/functions.zone > b/src/functions/functions.zone > index d121225..768bb9f 100644 > --- a/src/functions/functions.zone > +++ b/src/functions/functions.zone > @@ -1024,6 +1024,39 @@ zone_config_get_new_id() { >   done >  } >   > +zone_config_check_same_setting() { > + # This functions checks if a config hook > + # with the same setting is already configured for this zone. > + # Returns True when yes and False when no. > + > + assert [ $# -eq 4 ] > + > + local zone=${1} > + local hook=${2} > + local key=${3} > + local value=${4} > + > + # The key should be local for this function > + local ${key} > + local config > + > + for config in $(zone_configs_list ${zone}); do > + # Check if the config is from the given hook, when > not continue > + if  [[ $(zone_config_get_hook "${zone}" "${config}") > != ${hook} ]]; then > + continue > + fi > + # Get the value of the key for a given function > + zone_config_settings_read "${zone}" "${config}" \ > +                --ignore-superfluous-settings "${key}" > + # Check if the value of the config and the passed > value are eqal > + if [[ "${value}" == "${!key}" ]]; then > + return ${EXIT_TRUE} > + fi > + done > + > + return ${EXIT_FALSE} > +} > + >  zone_config_get_hook() { >   assert [ $# -eq 2 ] >   > diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4- > static > index c395200..9454282 100644 > --- a/src/hooks/configs/ipv4-static > +++ b/src/hooks/configs/ipv4-static > @@ -102,6 +102,11 @@ hook_new() { >   exit ${EXIT_CONF_ERROR} >   fi >   > + if zone_config_check_same_setting "${zone}" "ipv4-static" > "ADDRESS" "${ADDRESS}"; then > + error "An ipv4-static config with the same IPv4 > address is already configured" > + exit ${EXIT_CONF_ERROR} > + fi > + >   if ! isset GATEWAY && zone_is_nonlocal "${zone}"; then >   warning "You did not configure a gateway for a non- > local zone" >   fi > diff --git a/src/hooks/configs/ipv6-static b/src/hooks/configs/ipv6- > static > index f43ef7e..b0f6537 100644 > --- a/src/hooks/configs/ipv6-static > +++ b/src/hooks/configs/ipv6-static > @@ -59,6 +59,11 @@ hook_new() { >   GATEWAY=$(ipv6_format "${GATEWAY}") >   fi >   > + if zone_config_check_same_setting "${zone}" "ipv6-static" > "ADDRESS" "${ADDRESS}"; then > + error "An ipv6-static config with the same IPv6 > address is already configured" > + exit ${EXIT_CONF_ERROR} > + fi > + >   zone_config_settings_write "${zone}" "${HOOK}" >   >   exit ${EXIT_OK} --===============2133674978811282393== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlpacDR4QUFvSkVJQjU4UDl2a0FrSFlWY1AvMTUwSGRZaGlEWVZKb1ExRFBlL0NJZFAK WW5KUi9YcmxnRkVSdTZET0h3Wk00ekJmdzdXSjgzS2dtQzl1OHRVTEJrRDBjbWdxMklHQzExcFhp d3lTQzJvVAo4cFVuSlQ3eVp1dGZNTU1lMTZWbkc0MlViY2swRXhnUGVCZFFnWWErZ1FMT2twWTZl ZDhFeDVVVlI3bWJrTmJKCk93T1JyMUw3bWZHYUtpazQybzdoWnJKNDIvZUxyWW9PV1R5RFNXUVd1 YnpUamZGall0emYwbVMzQ0JoV3E1cWIKVmpWeXRTeUJHbmRsNzR6S2hDVXdLNGNHMlpWWGVxUjJo TUtGcUVKTkpWQXRZNzk3T0Npb2wyWjE1Z0s3TWJwagpWL2MzREpnSkJ0TEU5Ykx3bUNTYWVBc0hM d2tLWUQxSUhvT1ZiTTkyZ01HdFZqNnFhL0FWbTlvQm9Pbkw5QWhpCnNZVi93YVYvQnRQdG0yNmpQ VHlTNDlHdGxwUDJ5VEkxdVNYMEIrWmwzU3ZoS01JTmxGWmVmeVkvMHhDTWE0QjQKL3ZiRHZVSDJx QnNmdUhhc2F4ODJFQmhMWEJreG8xM1JrMnVFZXk4SUZUa3hCQW5Pc0VYZUp5d0JlS01KYUZLcQpy ejRYb3JYVGhtV1NkblVDNlZPWEVJc3pGV2pBM0hVYkNXbUNzUkd2cHFLSFV6MEdlRlRrb2IyVjZH TzcrMDNECm1BUktCeWVhem5EOTNEUkgxd1pNWU1FdGFwVEFjbm5KZnJDemhGN0VxakhQRWN4ejVJ emJ4NWJ2R3FZQ3V1VEEKWDBOcUlsd3ZaMVQxMEgvNmFBYUJjOTBrNngvV20zcDFiZ25xcDhVTzIv N3M4bGFhd0M1RHdRTzQ3MXkzTHhZTwpXNFJoUHhQUlV3UDUvRTVPTi9Oawo9allKVwotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============2133674978811282393==--