[PATCH] Fixed the failing BadConfigExceptionTest unit test

Harsh Shandilya me at msfjarvis.dev
Wed Jan 26 15:02:32 UTC 2022


Hey Michal,

On Jan 19 2022, at 1:58 pm, Michal Murin <michal.murin at jamf.com> wrote:

> Fixed the test by changing the DNS to a string with an invalid char in
> the `invalid-value.conf` test configuration file. Also removed the
> `getParsingClass()` condition from the `parseDnsServers()` method as
> the condition can be never met - the `InetAddresses.parse(dnsServer)`
> method always throws the `ParseException` with the `parsingClass` set
> to `InetAddress.class`.
> ---
> tunnel/src/main/java/com/wireguard/config/Interface.java | 2 +-
> tunnel/src/test/resources/invalid-value.conf             | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tunnel/src/main/java/com/wireguard/config/Interface.java b/tunnel/src/main/java/com/wireguard/config/Interface.java
> index 694f313..5bd4da7 100644
> --- a/tunnel/src/main/java/com/wireguard/config/Interface.java
> +++ b/tunnel/src/main/java/com/wireguard/config/Interface.java
> @@ -356,7 +356,7 @@ public final class Interface {
>                     try {
>                         addDnsServer(InetAddresses.parse(dnsServer));
>                     } catch (final ParseException e) {
> -                        if (e.getParsingClass() != InetAddress.class
> || !InetAddresses.isHostname(dnsServer))
> +                        if (!InetAddresses.isHostname(dnsServer))
>                             throw e;
>                         addDnsSearchDomain(dnsServer);
>                     }
> diff --git a/tunnel/src/test/resources/invalid-value.conf b/tunnel/src/test/resources/invalid-value.conf
> index 2889111..6a1e3b6 100644
> --- a/tunnel/src/test/resources/invalid-value.conf
> +++ b/tunnel/src/test/resources/invalid-value.conf
> @@ -1,6 +1,6 @@
> [Interface]
> Address = 192.0.2.2/32,2001:db8:ffff:ffff:ffff:ffff:ffff:ffff/128
> -DNS = 192.0.2.0,yes
> +DNS = 192.0.2.0,invalid_value
> PrivateKey = TFlmmEUC7V7VtiDYLKsbP5rySTKLIZq1yn8lMqK83wo=
> [Peer]
> AllowedIPs = 0.0.0.0/0, ::0/0
> -- 
> 2.30.1 (Apple Git-130)
> 
> 

Thanks! The patch looks good, if you can send a v2 with a Signed-off-by
line I'd be happy to apply this.

Cheers,
Harsh Shandilya


More information about the WireGuard mailing list