frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Throw IllegalArgumentExceptions when arguments are bad

Browse Source 
This will make the two way data binding crash more, but it will improve
the robustness of the config file parser, which deals with exceptions
gracefully, and when we move to one way data binding, it will help with
that too.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld
2018-04-27 05:43:07 +02:00
parent 254cc4cc87
commit 9ee976823d
4 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/config/Interface.java
+15 -18
View File
@@ -135,7 +135,7 @@ public class Interface extends BaseObservable implements Parcelable {
return keypair != null ? keypair.getPublicKey() : null;
}
public void parse(final String line) throws UnknownHostException {
public void parse(final String line) {
final Attribute key = Attribute.match(line);
if (key == Attribute.ADDRESS)
addAddresses(key.parseList(line));
@@ -151,11 +151,11 @@ public class Interface extends BaseObservable implements Parcelable {
throw new IllegalArgumentException(line);
}
public void addAddresses(String[] addresses) throws UnknownHostException {
public void addAddresses(String[] addresses) {
if (addresses != null && addresses.length > 0) {
for (final String addr : addresses) {
if (addr.isEmpty())
throw new UnknownHostException("{empty}");
throw new IllegalArgumentException("Address is empty");
this.addressList.add(new IPCidr(addr));
}
}
@@ -166,19 +166,19 @@ public class Interface extends BaseObservable implements Parcelable {
public void setAddressString(final String addressString) {
this.addressList.clear();
try {
addAddresses(Attribute.stringToList(addressString));
} catch (Exception e) {
this.addressList.clear();
}
addAddresses(Attribute.stringToList(addressString));
}
public void addDnses(String[] dnses) throws UnknownHostException {
public void addDnses(String[] dnses) {
if (dnses != null && dnses.length > 0) {
for (final String dns : dnses) {
if (dns.isEmpty())
throw new UnknownHostException("{empty}");
this.dnsList.add(InetAddress.getByName(dns));
throw new IllegalArgumentException("DNS is empty");
try {
this.dnsList.add(InetAddress.getByName(dns));
} catch (UnknownHostException e) {
throw new IllegalArgumentException(e);
}
}
}
notifyPropertyChanged(BR.dnses);
@@ -187,12 +187,8 @@ public class Interface extends BaseObservable implements Parcelable {
}
public void setDnsString(final String dnsString) {
try {
this.dnsList.clear();
addDnses(Attribute.stringToList(dnsString));
} catch (Exception e) {
this.dnsList.clear();
}
this.dnsList.clear();
addDnses(Attribute.stringToList(dnsString));
}
public void setListenPort(int listenPort) {
@@ -228,8 +224,9 @@ public class Interface extends BaseObservable implements Parcelable {
if (privateKey != null && privateKey.length() == KeyEncoding.KEY_LENGTH_BASE64) {
try {
keypair = new Keypair(privateKey);
} catch (final IllegalArgumentException ignored) {
} catch (final IllegalArgumentException e) {
keypair = null;
throw e;
}
} else {
keypair = null;