aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrumeet <17158086+Trumeet@users.noreply.github.com>2021-01-09 13:04:00 -0800
committerTrumeet <17158086+Trumeet@users.noreply.github.com>2021-01-09 13:04:00 -0800
commit326006fea09ab96733f02f34e0c80059e41e4bd3 (patch)
tree3af50acfab5b7e007ef3239967c91a94a020b2cc
parent0a3b6d430aa390772a66b42af8ad46763c30bd45 (diff)
downloaddn42peering-326006fea09ab96733f02f34e0c80059e41e4bd3.tar
dn42peering-326006fea09ab96733f02f34e0c80059e41e4bd3.tar.gz
dn42peering-326006fea09ab96733f02f34e0c80059e41e4bd3.tar.bz2
dn42peering-326006fea09ab96733f02f34e0c80059e41e4bd3.zip
fix(central): manually reset field values to null if they are blank
-rw-r--r--central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java b/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java
index 57e2701..4637eb2 100644
--- a/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java
+++ b/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java
@@ -623,6 +623,7 @@ public class ManageHandler implements ISubRouter {
ipv4 = form.getString("ipv4");
if (ipv4 == null || ipv4.isEmpty()) {
errors.add("IPv4 address is not specified.");
+ ipv4 = null; // Non-null but empty values could cause problems.
} else {
if (InetAddressValidator.getInstance().isValidInet4Address(ipv4)) {
if (!new CIDRUtils("172.20.0.0/14").isInRange(ipv4)) {
@@ -646,6 +647,8 @@ public class ManageHandler implements ISubRouter {
}
} else
errors.add("IPv6 address is illegal. Cannot parse your address.");
+ } else {
+ ipv6 = null; // Non-null but empty values could cause problems.
}
}
@@ -674,6 +677,8 @@ public class ManageHandler implements ISubRouter {
}
} else
errors.add("WireGuard EndPoint is illegal. Cannot parse your address.");
+ } else {
+ wgEndpoint = null; // Non-null but empty values could cause problems.
}
} else {
errors.add("WireGuard tunneling is not selected but WireGuard Endpoint configuration appears.");
@@ -709,6 +714,7 @@ public class ManageHandler implements ISubRouter {
wgPubKey = form.getString("wg_pubkey");
if (wgPubKey == null || wgPubKey.isEmpty()) {
errors.add("WireGuard public key is not specified.");
+ wgPubKey = null; // Non-null but empty values could cause problems.
} else {
try {
Key.fromBase64(wgPubKey);