[PATCH v3 5/5] configurehood: Don't remove timestamp for checksum comparison

[Fabian Bläse]

Tested-by: Fabian Bläse <fabian at blaese.de>

Fabian

> On 8. Jul 2018, at 21:44, Fabian Bläse <fabian at blaese.de> wrote:
> 
> Bitte die Patches/Patchsets nicht vermischen, das macht das Verfolgen der Änderungen und reviewen schwer.
> 
> Ich hab mich schon immer gefragt, wozu das gut war, wahrscheinlich ist das noch vom dezentralen Keyxchange übrig.
> 
> Reviewed-by: Fabian Bläse <fabian at blaese.de>
> 
> Fabian
> 
>> On 8. Jul 2018, at 19:57, Adrian Schmutzler <freifunk at adrianschmutzler.de> wrote:
>> 
>> Timestamps in hood file currently only change if changes are
>> made. Thus, there is no reason to remove them for comparison.
>> 
>> This also fixes the wrong quote characters in the script, which
>> changed the script in a way the timestamps aren't removed right
>> now anyway.
>> 
>> After this change, a hood reconfiguration may be triggered by
>> just changing the timestamp at the keyxchange.
>> 
>> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
>> Reviewed-by: Tim Niemeyer <tim at tn-x.org>
>> 
>> ---
>> 
>> Changes in v2:
>> Rebase onto hood file rename
>> ---
>> src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 6 ++----
>> 1 file changed, 2 insertions(+), 4 deletions(-)
>> 
>> diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
>> index de722f0..00e3641 100755
>> --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
>> +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood
>> @@ -106,10 +106,8 @@ if [ -s "$hoodfiletmp" ]; then
>> 	# https://pw.freifunk-franken.de/patch/205/
>> 	# but without signature, every hood file we get is valid!
>> 
>> -	catnew="$(cat "$hoodfiletmp" | sed 's/"timestamp”: *"[0-9]*"/"timestamp":0/')"
>> -	catold="$(cat "$hoodfileref" 2>/dev/null | sed 's/"timestamp”: *"[0-9]*"/"timestamp":0/')"
>> -	sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ")
>> -	sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ")
>> +	sumnew=$(cat "$hoodfiletmp" 2>/dev/null | sha256sum | cut -f1 -d " ")
>> +	sumold=$(cat "$hoodfileref" 2>/dev/null | sha256sum | cut -f1 -d " ")
>> 
>> 	json_load "$(cat "$hoodfiletmp")"
>> 
>> --
>> 2.7.4
>> 
> 

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 833 bytes
Beschreibung: Message signed with OpenPGP
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20180711/f70bda48/attachment.sig>