diff options
| author | Trumeet <17158086+Trumeet@users.noreply.github.com> | 2021-01-09 12:57:26 -0800 |
|---|---|---|
| committer | Trumeet <17158086+Trumeet@users.noreply.github.com> | 2021-01-09 12:57:28 -0800 |
| commit | e0f56eda062a63ddd12e42c858190ce4b0d99197 (patch) | |
| tree | 09b140d9cd1b5cb656117d871e8c516cbeef9b82 | |
| parent | 5c5d425eed0692bf144219e83199ff9b2231464a (diff) | |
| download | dn42peering-e0f56eda062a63ddd12e42c858190ce4b0d99197.tar dn42peering-e0f56eda062a63ddd12e42c858190ce4b0d99197.tar.gz dn42peering-e0f56eda062a63ddd12e42c858190ce4b0d99197.tar.bz2 dn42peering-e0f56eda062a63ddd12e42c858190ce4b0d99197.zip | |
fix(central): correct WireGuard endpoint IP non-null check
The request body could contain keys without values. In this case, we use
non-null and non-empty check to make sure their values are present.
| -rw-r--r-- | central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java | 4 |
1 files changed, 1 insertions, 3 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 9615bbf..e3da5fe 100644 --- a/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java +++ b/central/src/main/java/moe/yuuta/dn42peering/manage/ManageHandler.java @@ -663,9 +663,7 @@ public class ManageHandler implements ISubRouter { if (form.containsKey("wg_endpoint")) { if (type == Peer.VPNType.WIREGUARD) { wgEndpoint = form.getString("wg_endpoint"); - if (wgEndpoint == null || wgEndpoint.isEmpty()) { - errors.add("WireGuard tunneling is not selected but WireGuard Endpoint configuration appears."); - } else { + if (wgEndpoint != null && !wgEndpoint.isEmpty()) { if (InetAddressValidator.getInstance().isValidInet4Address(wgEndpoint)) { if (new CIDRUtils("10.0.0.0/8").isInRange(wgEndpoint) || new CIDRUtils("192.168.0.0/16").isInRange(wgEndpoint) || |