| Message ID | 20171015213525.5843-1-rlanghammer@web.de |
|---|---|
| State | Superseded |
| Headers | show |
diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood index 31b3e4b..d41053a 100755 --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood @@ -106,8 +106,8 @@ if [ -s /tmp/keyxchangev2data ]; then # https://pw.freifunk-franken.de/patch/205/ # but without signature, every hood file we get is valid! - catnew="$(cat /tmp/keyxchangev2data | sed 's/"timestamp":[0-9]*/"timestamp":0/')" - catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed 's/"timestamp":[0-9]*/"timestamp":0/')" + catnew="$(cat /tmp/keyxchangev2data | sed 's/"timestamp":"[0-9]*"/"timestamp":0/')" + catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed 's/"timestamp":"[0-9]*"/"timestamp":0/')" sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ") sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ")
Hi Am Sonntag, den 15.10.2017, 23:35 +0200 schrieb Robert Langhammer: > > Signed-off-by: Robert Langhammer <rlanghammer@web.de> > --- > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > index 31b3e4b..d41053a 100755 > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > @@ -106,8 +106,8 @@ if [ -s /tmp/keyxchangev2data ]; then > > # https://pw.freifunk-franken.de/patch/205/ > > # but without signature, every hood file we get is valid! > > > - catnew="$(cat /tmp/keyxchangev2data | sed 's/"timestamp":[0-9]*/"timestamp":0/')" > > - catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed 's/"timestamp":[0-9]*/"timestamp":0/')" > > + catnew="$(cat /tmp/keyxchangev2data | sed 's/"timestamp":"[0-9]*"/"timestamp":0/')" > + catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed 's/"timestamp":"[0-9]*"/"timestamp":0/')" Oh ja.. Good Catch! Ein Glück wird das nur für den Sha benutzt. Reviewed-by: Tim Niemeyer <tim@tn-x.org> Tim > sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ") > > sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ") > > -- > 2.11.0 >
Hallo, interessant, dass das am Anfang geklappt hat. Habt ihr die Anführungszeichen im KeyXchange irgendwann reingepatcht? Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Grüße Adrian > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Tim Niemeyer > Sent: Montag, 16. Oktober 2017 22:06 > To: Robert Langhammer <rlanghammer@web.de>; franken- > dev@freifunk.net > Subject: Re: [PATCH] fff-hoods: fix sed to substitute timestamp > > Hi > > Am Sonntag, den 15.10.2017, 23:35 +0200 schrieb Robert Langhammer: > > > Signed-off-by: Robert Langhammer <rlanghammer@web.de> > > --- > > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > index 31b3e4b..d41053a 100755 > > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > @@ -106,8 +106,8 @@ if [ -s /tmp/keyxchangev2data ]; then > > > # https://pw.freifunk-franken.de/patch/205/ > > > # but without signature, every hood file we get is valid! > > > > > - catnew="$(cat /tmp/keyxchangev2data | sed > > > 's/"timestamp":[0-9]*/"timestamp":0/')" > > > - catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed > > > 's/"timestamp":[0-9]*/"timestamp":0/')" > > > + catnew="$(cat /tmp/keyxchangev2data | sed > > > 's/"timestamp":"[0-9]*"/"timestamp":0/')" > > + catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed > > 's/"timestamp":"[0-9]*"/"timestamp":0/')" > > Oh ja.. Good Catch! Ein Glück wird das nur für den Sha benutzt. > > Reviewed-by: Tim Niemeyer <tim@tn-x.org> > > Tim > > > > sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ") > > > sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ") > > > > -- > > 2.11.0 > >
Hallo zusammen, Der angegebene Regex geht kaputt, wenn man das JSON durch einen Beautifier jagt, da dann je nach Beautifier zwischen : und “[0-9]*” ein Leerzeichen auftauchen kann. Vielleicht sollte man das noch ergänzen: sed 's/"timestamp”: *"[0-9]*"/"timestamp":0/‘ Reviewed-by: Fabian Bläse <fabian@blaese.de> Tested-by: Fabian Bläse <fabian@blaese.de> Fabian > On 19. Oct 2017, at 13:25, Adrian Schmutzler <mail@adrianschmutzler.de> wrote: > > Hallo, > > interessant, dass das am Anfang geklappt hat. Habt ihr die Anführungszeichen im KeyXchange irgendwann reingepatcht? > > Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > Grüße > > Adrian > >> -----Original Message----- >> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf >> Of Tim Niemeyer >> Sent: Montag, 16. Oktober 2017 22:06 >> To: Robert Langhammer <rlanghammer@web.de>; franken- >> dev@freifunk.net >> Subject: Re: [PATCH] fff-hoods: fix sed to substitute timestamp >> >> Hi >> >> Am Sonntag, den 15.10.2017, 23:35 +0200 schrieb Robert Langhammer: >>>> Signed-off-by: Robert Langhammer <rlanghammer@web.de> >>> --- >>> src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood >>> b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood >>> index 31b3e4b..d41053a 100755 >>> --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood >>> +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood >>> @@ -106,8 +106,8 @@ if [ -s /tmp/keyxchangev2data ]; then >>>> # https://pw.freifunk-franken.de/patch/205/ >>>> # but without signature, every hood file we get is valid! >>> >>>> - catnew="$(cat /tmp/keyxchangev2data | sed >>>> 's/"timestamp":[0-9]*/"timestamp":0/')" >>>> - catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed >>>> 's/"timestamp":[0-9]*/"timestamp":0/')" >>>> + catnew="$(cat /tmp/keyxchangev2data | sed >>>> 's/"timestamp":"[0-9]*"/"timestamp":0/')" >>> + catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed >>> 's/"timestamp":"[0-9]*"/"timestamp":0/')" >> >> Oh ja.. Good Catch! Ein Glück wird das nur für den Sha benutzt. >> >> Reviewed-by: Tim Niemeyer <tim@tn-x.org> >> >> Tim >> >> >>> sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ") >>>> sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ") >>> >>> -- >>> 2.11.0 >>> > > -- > franken-dev mailing list > franken-dev@freifunk.net > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Hallo Robert, Sollte rebased werden, sonst macht das alle anderen Patches kaputt. Soll ich oder willst du selbst? Grüße Adrian > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Adrian Schmutzler > Sent: Donnerstag, 19. Oktober 2017 13:26 > To: franken-dev@freifunk.net > Subject: RE: [PATCH] fff-hoods: fix sed to substitute timestamp > > Hallo, > > interessant, dass das am Anfang geklappt hat. Habt ihr die > Anführungszeichen im KeyXchange irgendwann reingepatcht? > > Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > Grüße > > Adrian > > > -----Original Message----- > > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > > Of Tim Niemeyer > > Sent: Montag, 16. Oktober 2017 22:06 > > To: Robert Langhammer <rlanghammer@web.de>; franken- > dev@freifunk.net > > Subject: Re: [PATCH] fff-hoods: fix sed to substitute timestamp > > > > Hi > > > > Am Sonntag, den 15.10.2017, 23:35 +0200 schrieb Robert Langhammer: > > > > Signed-off-by: Robert Langhammer <rlanghammer@web.de> > > > --- > > > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > > b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > > index 31b3e4b..d41053a 100755 > > > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > > @@ -106,8 +106,8 @@ if [ -s /tmp/keyxchangev2data ]; then > > > > # https://pw.freifunk-franken.de/patch/205/ > > > > # but without signature, every hood file we get is valid! > > > > > > > - catnew="$(cat /tmp/keyxchangev2data | sed > > > > 's/"timestamp":[0-9]*/"timestamp":0/')" > > > > - catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed > > > > 's/"timestamp":[0-9]*/"timestamp":0/')" > > > > + catnew="$(cat /tmp/keyxchangev2data | sed > > > > 's/"timestamp":"[0-9]*"/"timestamp":0/')" > > > + catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed > > > 's/"timestamp":"[0-9]*"/"timestamp":0/')" > > > > Oh ja.. Good Catch! Ein Glück wird das nur für den Sha benutzt. > > > > Reviewed-by: Tim Niemeyer <tim@tn-x.org> > > > > Tim > > > > > > > sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ") > > > > sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ") > > > > > > -- > > > 2.11.0 > > > > > -- > franken-dev mailing list > franken-dev@freifunk.net > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Wenn du grad am Rechner sitzt, mach! Ich bin nur mobil dabei. Am 2. November 2017 12:22:13 MEZ schrieb Adrian Schmutzler <mail@adrianschmutzler.de>: >Hallo Robert, > >Sollte rebased werden, sonst macht das alle anderen Patches kaputt. > >Soll ich oder willst du selbst? > >Grüße > >Adrian > >> -----Original Message----- >> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf >> Of Adrian Schmutzler >> Sent: Donnerstag, 19. Oktober 2017 13:26 >> To: franken-dev@freifunk.net >> Subject: RE: [PATCH] fff-hoods: fix sed to substitute timestamp >> >> Hallo, >> >> interessant, dass das am Anfang geklappt hat. Habt ihr die >> Anführungszeichen im KeyXchange irgendwann reingepatcht? >> >> Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> >> >> Grüße >> >> Adrian >> >> > -----Original Message----- >> > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On >Behalf >> > Of Tim Niemeyer >> > Sent: Montag, 16. Oktober 2017 22:06 >> > To: Robert Langhammer <rlanghammer@web.de>; franken- >> dev@freifunk.net >> > Subject: Re: [PATCH] fff-hoods: fix sed to substitute timestamp >> > >> > Hi >> > >> > Am Sonntag, den 15.10.2017, 23:35 +0200 schrieb Robert Langhammer: >> > > > Signed-off-by: Robert Langhammer <rlanghammer@web.de> >> > > --- >> > > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- >> > > 1 file changed, 2 insertions(+), 2 deletions(-) >> > > >> > > diff --git >a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood >> > > b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood >> > > index 31b3e4b..d41053a 100755 >> > > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood >> > > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood >> > > @@ -106,8 +106,8 @@ if [ -s /tmp/keyxchangev2data ]; then >> > > > # https://pw.freifunk-franken.de/patch/205/ >> > > > # but without signature, every hood file we get is valid! >> > > >> > > > - catnew="$(cat /tmp/keyxchangev2data | sed >> > > > 's/"timestamp":[0-9]*/"timestamp":0/')" >> > > > - catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed >> > > > 's/"timestamp":[0-9]*/"timestamp":0/')" >> > > > + catnew="$(cat /tmp/keyxchangev2data | sed >> > > > 's/"timestamp":"[0-9]*"/"timestamp":0/')" >> > > + catold="$(cat /www/public/keyxchangev2data 2>/dev/null | sed >> > > 's/"timestamp":"[0-9]*"/"timestamp":0/')" >> > >> > Oh ja.. Good Catch! Ein Glück wird das nur für den Sha benutzt. >> > >> > Reviewed-by: Tim Niemeyer <tim@tn-x.org> >> > >> > Tim >> > >> > >> > > sumnew=$(echo "$catnew" | sha256sum | cut -f1 -d " ") >> > > > sumold=$(echo "$catold" | sha256sum | cut -f1 -d " ") >> > > >> > > -- >> > > 2.11.0 >> > > >> >> -- >> franken-dev mailing list >> franken-dev@freifunk.net >> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Signed-off-by: Robert Langhammer <rlanghammer@web.de> --- src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)