From thozza at redhat.com  Tue Jul  4 12:50:00 2017
From: thozza at redhat.com (Tomas Hozza)
Date: Tue, 4 Jul 2017 14:50:00 +0200
Subject: [Dnssec-trigger] [PATCH] Allow strings longer than 2 characters
 for the HTTP probe
In-Reply-To: <1488798715-2401-1-git-send-email-thozza@redhat.com>
References: <1488798715-2401-1-git-send-email-thozza@redhat.com>
Message-ID: <2369b53a-ff53-485e-d9d3-6fef31155619@redhat.com>

Hello.

Is there any chance that some will review this change and ideally merge it?

Thank you.

Regards,
Tomas

On 06.03.2017 12:11, Tomas Hozza wrote:
> Previously only content of lenght 2 or less characters was allowed for
> the HTTP probe. The length was hardcoded and even if the strings from
> the configuration and from the probe matched, the result was failure.
>
> This could be reproduced e.g. with using the following line in the
> configuration:
>
> url: "http://httpstat.us/200 200 OK"
>
> Signed-off-by: Tomas Hozza <thozza at redhat.com>
> ---
>  riggerd/http.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/riggerd/http.c b/riggerd/http.c
> index a08d629..b68e898 100644
> --- a/riggerd/http.c
> +++ b/riggerd/http.c
> @@ -767,11 +767,17 @@ static int
>  hg_check_data(ldns_buffer* data, char* result)
>  {
>      char* s = (char*)ldns_buffer_begin(data);
> +    size_t result_len = strlen(result);
> +
>      while(isspace(*s))
>          s++;
> -    if(strncmp(s, result, strlen(result)) != 0)
> +    if(strncmp(s, result, result_len) != 0)
>          return 0;
> -    s += 2;
> +    /*
> +     * check that there is nothing else
> +     * than whitespaces after the expected string
> +     */
> +    s += result_len;
>      while(isspace(*s))
>          s++;
>      if(*s != 0)
>



-- 
Tomas Hozza
Associate Manager, Software Engineering - EMEA ENG Mainstream RHEL

PGP: 1D9F3C2D
UTC+2 (CEST)
Red Hat Inc.                 http://cz.redhat.com


From wouter at nlnetlabs.nl  Tue Jul  4 13:02:16 2017
From: wouter at nlnetlabs.nl (W.C.A. Wijngaards)
Date: Tue, 4 Jul 2017 15:02:16 +0200
Subject: [Dnssec-trigger] [PATCH] Allow strings longer than 2 characters
 for the HTTP probe
In-Reply-To: <2369b53a-ff53-485e-d9d3-6fef31155619@redhat.com>
References: <1488798715-2401-1-git-send-email-thozza@redhat.com>
 <2369b53a-ff53-485e-d9d3-6fef31155619@redhat.com>
Message-ID: <78408f42-4ce3-b186-8174-833f9d890a9a@nlnetlabs.nl>

Hi Tomas,

Sure, merged.

Best regards, Wouter

On 04/07/17 14:50, Tomas Hozza wrote:
> Hello.
> 
> Is there any chance that some will review this change and ideally merge it?
> 
> Thank you.
> 
> Regards,
> Tomas
> 
> On 06.03.2017 12:11, Tomas Hozza wrote:
>> Previously only content of lenght 2 or less characters was allowed for
>> the HTTP probe. The length was hardcoded and even if the strings from
>> the configuration and from the probe matched, the result was failure.
>>
>> This could be reproduced e.g. with using the following line in the
>> configuration:
>>
>> url: "http://httpstat.us/200 200 OK"
>>
>> Signed-off-by: Tomas Hozza <thozza at redhat.com>
>> ---
>>  riggerd/http.c | 10 ++++++++--
>>  1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/riggerd/http.c b/riggerd/http.c
>> index a08d629..b68e898 100644
>> --- a/riggerd/http.c
>> +++ b/riggerd/http.c
>> @@ -767,11 +767,17 @@ static int
>>  hg_check_data(ldns_buffer* data, char* result)
>>  {
>>      char* s = (char*)ldns_buffer_begin(data);
>> +    size_t result_len = strlen(result);
>> +
>>      while(isspace(*s))
>>          s++;
>> -    if(strncmp(s, result, strlen(result)) != 0)
>> +    if(strncmp(s, result, result_len) != 0)
>>          return 0;
>> -    s += 2;
>> +    /*
>> +     * check that there is nothing else
>> +     * than whitespaces after the expected string
>> +     */
>> +    s += result_len;
>>      while(isspace(*s))
>>          s++;
>>      if(*s != 0)
>>
> 
> 
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.nlnetlabs.nl/pipermail/dnssec-trigger/attachments/20170704/6e298b13/attachment.bin>

From thozza at redhat.com  Tue Jul  4 13:05:08 2017
From: thozza at redhat.com (Tomas Hozza)
Date: Tue, 4 Jul 2017 15:05:08 +0200
Subject: [Dnssec-trigger] [PATCH] Allow strings longer than 2 characters
 for the HTTP probe
In-Reply-To: <78408f42-4ce3-b186-8174-833f9d890a9a@nlnetlabs.nl>
References: <1488798715-2401-1-git-send-email-thozza@redhat.com>
 <2369b53a-ff53-485e-d9d3-6fef31155619@redhat.com>
 <78408f42-4ce3-b186-8174-833f9d890a9a@nlnetlabs.nl>
Message-ID: <8cbd142f-1bcb-a6cb-2b42-7cca55154133@redhat.com>

That was quick... :)

Thanks Wouter.

Regards,
Tomas

On 04.07.2017 15:02, W.C.A. Wijngaards wrote:
> Hi Tomas,
>
> Sure, merged.
>
> Best regards, Wouter
>
> On 04/07/17 14:50, Tomas Hozza wrote:
> > Hello.
> >
> > Is there any chance that some will review this change and ideally merge it?
> >
> > Thank you.
> >
> > Regards,
> > Tomas
> >
> > On 06.03.2017 12:11, Tomas Hozza wrote:
> >> Previously only content of lenght 2 or less characters was allowed for
> >> the HTTP probe. The length was hardcoded and even if the strings from
> >> the configuration and from the probe matched, the result was failure.
> >>
> >> This could be reproduced e.g. with using the following line in the
> >> configuration:
> >>
> >> url: "http://httpstat.us/200 200 OK"
> >>
> >> Signed-off-by: Tomas Hozza <thozza at redhat.com>
> >> ---
> >>  riggerd/http.c | 10 ++++++++--
> >>  1 file changed, 8 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/riggerd/http.c b/riggerd/http.c
> >> index a08d629..b68e898 100644
> >> --- a/riggerd/http.c
> >> +++ b/riggerd/http.c
> >> @@ -767,11 +767,17 @@ static int
> >>  hg_check_data(ldns_buffer* data, char* result)
> >>  {
> >>      char* s = (char*)ldns_buffer_begin(data);
> >> +    size_t result_len = strlen(result);
> >> +
> >>      while(isspace(*s))
> >>          s++;
> >> -    if(strncmp(s, result, strlen(result)) != 0)
> >> +    if(strncmp(s, result, result_len) != 0)
> >>          return 0;
> >> -    s += 2;
> >> +    /*
> >> +     * check that there is nothing else
> >> +     * than whitespaces after the expected string
> >> +     */
> >> +    s += result_len;
> >>      while(isspace(*s))
> >>          s++;
> >>      if(*s != 0)
> >>
> >
> >
> >
>
>
>
>
> _______________________________________________
> dnssec-trigger mailing list
> dnssec-trigger at NLnetLabs.nl
> https://open.nlnetlabs.nl/mailman/listinfo/dnssec-trigger
>



-- 
Tomas Hozza
Associate Manager, Software Engineering - EMEA ENG Mainstream RHEL

PGP: 1D9F3C2D
UTC+2 (CEST)
Red Hat Inc.                 http://cz.redhat.com


From thozza at redhat.com  Tue Jul  4 13:08:26 2017
From: thozza at redhat.com (Tomas Hozza)
Date: Tue, 4 Jul 2017 15:08:26 +0200
Subject: [Dnssec-trigger] [PATCH] Allow strings longer than 2 characters
 for the HTTP probe
In-Reply-To: <8cbd142f-1bcb-a6cb-2b42-7cca55154133@redhat.com>
References: <1488798715-2401-1-git-send-email-thozza@redhat.com>
 <2369b53a-ff53-485e-d9d3-6fef31155619@redhat.com>
 <78408f42-4ce3-b186-8174-833f9d890a9a@nlnetlabs.nl>
 <8cbd142f-1bcb-a6cb-2b42-7cca55154133@redhat.com>
Message-ID: <bded3194-a24e-db29-0780-9d4f6062d854@redhat.com>

I checked the commit on GitHub (https://github.com/NLnetLabs/dnssec-trigger/commit/947b7a8f41fa7b7a3bf06687910479cc41a1abda) and it seems that tabs in my patch have been replaced by spaces, which broke the formatting...

Regards,
Tomas

On 04.07.2017 15:05, Tomas Hozza wrote:
> That was quick... :)
>
> Thanks Wouter.
>
> Regards,
> Tomas
>
> On 04.07.2017 15:02, W.C.A. Wijngaards wrote:
> > Hi Tomas,
> >
> > Sure, merged.
> >
> > Best regards, Wouter
> >
> > On 04/07/17 14:50, Tomas Hozza wrote:
> >> Hello.
> >>
> >> Is there any chance that some will review this change and ideally merge it?
> >>
> >> Thank you.
> >>
> >> Regards,
> >> Tomas
> >>
> >> On 06.03.2017 12:11, Tomas Hozza wrote:
> >>> Previously only content of lenght 2 or less characters was allowed for
> >>> the HTTP probe. The length was hardcoded and even if the strings from
> >>> the configuration and from the probe matched, the result was failure.
> >>>
> >>> This could be reproduced e.g. with using the following line in the
> >>> configuration:
> >>>
> >>> url: "http://httpstat.us/200 200 OK"
> >>>
> >>> Signed-off-by: Tomas Hozza <thozza at redhat.com>
> >>> ---
> >>>  riggerd/http.c | 10 ++++++++--
> >>>  1 file changed, 8 insertions(+), 2 deletions(-)
> >>>
> >>> diff --git a/riggerd/http.c b/riggerd/http.c
> >>> index a08d629..b68e898 100644
> >>> --- a/riggerd/http.c
> >>> +++ b/riggerd/http.c
> >>> @@ -767,11 +767,17 @@ static int
> >>>  hg_check_data(ldns_buffer* data, char* result)
> >>>  {
> >>>      char* s = (char*)ldns_buffer_begin(data);
> >>> +    size_t result_len = strlen(result);
> >>> +
> >>>      while(isspace(*s))
> >>>          s++;
> >>> -    if(strncmp(s, result, strlen(result)) != 0)
> >>> +    if(strncmp(s, result, result_len) != 0)
> >>>          return 0;
> >>> -    s += 2;
> >>> +    /*
> >>> +     * check that there is nothing else
> >>> +     * than whitespaces after the expected string
> >>> +     */
> >>> +    s += result_len;
> >>>      while(isspace(*s))
> >>>          s++;
> >>>      if(*s != 0)
> >>>
> >>
> >>
> >>
> >
> >
> >
> >
> > _______________________________________________
> > dnssec-trigger mailing list
> > dnssec-trigger at NLnetLabs.nl
> > https://open.nlnetlabs.nl/mailman/listinfo/dnssec-trigger
> >
>
>
>



-- 
Tomas Hozza
Associate Manager, Software Engineering - EMEA ENG Mainstream RHEL

PGP: 1D9F3C2D
UTC+2 (CEST)
Red Hat Inc.                 http://cz.redhat.com


From carsten at strotmann.de  Tue Jul  4 13:48:34 2017
From: carsten at strotmann.de (Carsten Strotmann)
Date: Tue, 4 Jul 2017 15:48:34 +0200
Subject: [Dnssec-trigger] libgcc_s_sjlj-1.dll
In-Reply-To: <6037010b-e712-d328-6a63-0c59ad6a340c@airmail.cc>
References: <alpine.DEB.2.11.1701131549020.27231@delta.uni-mb.si>
 <587912C4.80301@nlnetlabs.nl>
 <6037010b-e712-d328-6a63-0c59ad6a340c@airmail.cc>
Message-ID: <c9d8ff3a-6e8c-9d26-9bf5-43af0b770719@strotmann.de>

Hello Wouter,
Hello List,

On 27.03.17 10:56 PM, Jeremy Rand wrote:
> wouter at nlnetlabs.nl (W.C.A. Wijngaards):
>> Hi Ales,
>>
>> On 13/01/17 16:02, Ales Casar wrote:
>>> Hello!
>>
>>> I have tried to install dnssec-trigger 0.13 on Windows Vista x64. 
>>> Unfortunately with no success. Many (all?) .exe binaries crashed
>>> during setup without any useful message. After some research of
>>> EventLog and manual testing I think the problem is in missing
>>> libgcc_s_sjlj-1.dll library. Then I've tried the same manual tests
>>> also with previous version of dnssec-trigger 0.12, and there was no
>>> such problems.
>>
>>> Did perhaps maintainer of dnssec-trigger windows packages forgot
>>> to include libgcc_s_sjlj-1.dll library into the package? Or should
>>> I install some dependency before? If yes, which one? Or something 
>>> completely different?
>>
>> Yes the dependencies seem to have changed between the versions, here
>> is a link to the package with the dll you refer to and
>> libwinpthread-1.dll.
>>
>> www.nlnetlabs.nl/~wouter/dnssec_trigger_setup_0.14_20170106_2.exe
>>
>> Best regards, Wouter
> 
> Hi Wouter,
> 
> Will this fixed version be posted on the main Dnssec-Trigger website?
> This would be useful for verifying its authenticity (e.g. via hashes
> posted on the main website).
> 
> Cheers,
> -Jeremy Rand
> 
> 


I've run into the very same issue today while installing dnssec-trigger
on a Win7 machine.

Would it be possible to make a new release of dnssec-trigger, possibly
also including an updated Unbound (1.6.4) that includes the new Root-DNS
KSK trust anchor?

Greetings

Carsten



From carsten at strotmann.de  Tue Jul  4 13:57:28 2017
From: carsten at strotmann.de (Carsten Strotmann)
Date: Tue, 4 Jul 2017 15:57:28 +0200
Subject: [Dnssec-trigger] libgcc_s_sjlj-1.dll
In-Reply-To: <c9d8ff3a-6e8c-9d26-9bf5-43af0b770719@strotmann.de>
References: <alpine.DEB.2.11.1701131549020.27231@delta.uni-mb.si>
 <587912C4.80301@nlnetlabs.nl>
 <6037010b-e712-d328-6a63-0c59ad6a340c@airmail.cc>
 <c9d8ff3a-6e8c-9d26-9bf5-43af0b770719@strotmann.de>
Message-ID: <1a3cb9f9-5e8f-aa29-5170-836461a7edba@strotmann.de>

On 04.07.17 15:48 PM, Carsten Strotmann wrote:
> Would it be possible to make a new release of dnssec-trigger, possibly
> also including an updated Unbound (1.6.4) that includes the new Root-DNS
> KSK trust anchor?

And yes, I volunteer beta testing of a new release (can test on MacOS
Sierra, Windows 7/8, Debian 8, Debian 9, Fedora, Red Hat EL 7, Suse 42.x)

-- Carsten