[PATCH] ddns.cgi: Fix sanity check logic.

[PATCH] ddns.cgi: Fix sanity check logic.

[Stefan Schantl]

[-- Attachment #1: Type: text/plain, Size: 2242 bytes --]

The input validation did not work in the proper way. It allways
reported "No password" when using a provider which supports token and
the token has been given.

This of course is wrong and leaded to unuseable providers.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/ddns.cgi | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index e30aa3d4f..0e3ccbe45 100644
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -171,20 +171,28 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang::
 		$errormessage = $Lang::tr{'invalid domain name'};
 	}
 
-	# Check if a username has been sent.
-	if ($settings{'LOGIN'} eq '') {
-		$errormessage = $Lang::tr{'username not set'};
-	}
+	# Check if the choosen provider supports token based authentication.
+	if ($settings{'SERVICE'} ~~ @token_provider) {
+		# Check if a token has been given.
+		unless ($settings{'TOKEN'}) {
+			$errormessage = $Lang::tr{'token not set'};
+		}
 
-	# Check if a password has been typed in.
-	# freedns.afraid.org does not require this field.
-	if (($settings{'PASSWORD'} eq '') && ($settings{'SERVICE'} ne 'freedns.afraid.org') && ($settings{'SERVICE'} ne 'regfish.com')) {
-		$errormessage = $Lang::tr{'password not set'};
-	}
+		# Automatically set the username to token.
+		$settings{'LOGIN'} = "token";
 
-	# Check if a token has been given for provider which support tokens.
-	if (($settings{'SERVICE'} ~~ @token_provider) && ($settings{'TOKEN'} eq '')) {
-		$errormessage = $Lang::tr{'token not set'};
+	# A provider without token support has been choosen.
+	} else {
+		# Check if a username has been sent.
+		if ($settings{'LOGIN'} eq '') {
+			$errormessage = $Lang::tr{'username not set'};
+		}
+
+		# Check if a password has been typed in.
+		# freedns.afraid.org does not require this field.
+		if (($settings{'PASSWORD'} eq '') && ($settings{'SERVICE'} ne 'freedns.afraid.org') && ($settings{'SERVICE'} ne 'regfish.com')) {
+			$errormessage = $Lang::tr{'password not set'};
+		}
 	}
 
 	# Go furter if there was no error.
-- 
2.30.2

Re: [PATCH] ddns.cgi: Fix sanity check logic.

[Bernhard Bitsch]

[-- Attachment #1: Type: text/plain, Size: 2454 bytes --]

Tested-by: Bernhard Bitsch <bbitsch(a)ipfire.org>

Am 06.07.2021 um 18:08 schrieb Stefan Schantl:
> The input validation did not work in the proper way. It allways
> reported "No password" when using a provider which supports token and
> the token has been given.
> 
> This of course is wrong and leaded to unuseable providers.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>   html/cgi-bin/ddns.cgi | 32 ++++++++++++++++++++------------
>   1 file changed, 20 insertions(+), 12 deletions(-)
> 
> diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
> index e30aa3d4f..0e3ccbe45 100644
> --- a/html/cgi-bin/ddns.cgi
> +++ b/html/cgi-bin/ddns.cgi
> @@ -171,20 +171,28 @@ if (($settings{'ACTION'} eq $Lang::tr{'add'}) || ($settings{'ACTION'} eq $Lang::
>   		$errormessage = $Lang::tr{'invalid domain name'};
>   	}
>   
> -	# Check if a username has been sent.
> -	if ($settings{'LOGIN'} eq '') {
> -		$errormessage = $Lang::tr{'username not set'};
> -	}
> +	# Check if the choosen provider supports token based authentication.
> +	if ($settings{'SERVICE'} ~~ @token_provider) {
> +		# Check if a token has been given.
> +		unless ($settings{'TOKEN'}) {
> +			$errormessage = $Lang::tr{'token not set'};
> +		}
>   
> -	# Check if a password has been typed in.
> -	# freedns.afraid.org does not require this field.
> -	if (($settings{'PASSWORD'} eq '') && ($settings{'SERVICE'} ne 'freedns.afraid.org') && ($settings{'SERVICE'} ne 'regfish.com')) {
> -		$errormessage = $Lang::tr{'password not set'};
> -	}
> +		# Automatically set the username to token.
> +		$settings{'LOGIN'} = "token";
>   
> -	# Check if a token has been given for provider which support tokens.
> -	if (($settings{'SERVICE'} ~~ @token_provider) && ($settings{'TOKEN'} eq '')) {
> -		$errormessage = $Lang::tr{'token not set'};
> +	# A provider without token support has been choosen.
> +	} else {
> +		# Check if a username has been sent.
> +		if ($settings{'LOGIN'} eq '') {
> +			$errormessage = $Lang::tr{'username not set'};
> +		}
> +
> +		# Check if a password has been typed in.
> +		# freedns.afraid.org does not require this field.
> +		if (($settings{'PASSWORD'} eq '') && ($settings{'SERVICE'} ne 'freedns.afraid.org') && ($settings{'SERVICE'} ne 'regfish.com')) {
> +			$errormessage = $Lang::tr{'password not set'};
> +		}
>   	}
>   
>   	# Go furter if there was no error.
>