Re: [PATCH] server: trim whitespace from lines in authorization file

[Wouter Verhelst <wouter@grep.be>]

Thanks, applied.

On Sun, Mar 15, 2020 at 06:10:51PM +1100, Jonathan Liu wrote:
> The netmask line can fail to parse when passed to getaddrinfo if it
> contains whitespace such as newline when using glibc 2.29 and later.
> This results in clients being denied access even though their IP
> address is listed in the authorization file.
> 
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> ---
>  nbdsrv.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/nbdsrv.c b/nbdsrv.c
> index b4fa800..168d425 100644
> --- a/nbdsrv.c
> +++ b/nbdsrv.c
> @@ -127,6 +127,7 @@ int authorized_client(CLIENT *opts) {
>    
>  	while (fgets(line,LINELEN,f)!=NULL) {
>  		char* pos;
> +		char* endpos;
>  		/* Drop comments */
>  		if((pos = strchr(line, '#'))) {
>  			*pos = '\0';
> @@ -140,7 +141,12 @@ int authorized_client(CLIENT *opts) {
>  		if(!(*pos)) {
>  			continue;
>  		}
> -		if(address_matches(line, (struct sockaddr*)&opts->clientaddr, NULL)) {
> +		/* Trim trailing whitespace */
> +		endpos = pos;
> +		while ((*endpos) && !isspace(*endpos))
> +			endpos++;
> +		*endpos = '\0';
> +		if(address_matches(pos, (struct sockaddr*)&opts->clientaddr, NULL)) {
>  			fclose(f);
>  			return 1;
>  		}
> -- 
> 2.25.1
> 
> 

-- 
<Lo-lan-do> Home is where you have to wash the dishes.
  -- #debian-devel, Freenode, 2004-09-22