From eb44a58c6d54e268678ab631e1cebb6ef8c7adba Mon Sep 17 00:00:00 2001 From: danrl Date: Tue, 15 Nov 2016 23:57:23 +0100 Subject: [PATCH] luci-proto-wireguard: input validation optimization --- .../luasrc/model/cbi/admin_network/proto_wireguard.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua b/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua index e08888129..4cda94c7d 100644 --- a/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua +++ b/protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua @@ -19,7 +19,7 @@ private_key = section:taboption( translate("Required. Base64-encoded private key for this interface.") ) private_key.password = true -private_key.datatype = "and(minlength(44),maxlength(44))" +private_key.datatype = "rangelength(44, 44)" private_key.optional = false @@ -70,7 +70,7 @@ preshared_key = section:taboption( "cryptography for post-quantum resistance.") ) preshared_key.password = true -preshared_key.datatype = "and(minlength(44),maxlength(44))" +preshared_key.datatype = "rangelength(44, 44)" preshared_key.optional = true @@ -94,7 +94,7 @@ public_key = peers:option( translate("Public Key"), translate("Required. Public key of peer.") ) -public_key.datatype = "and(minlength(44),maxlength(44))" +public_key.datatype = "rangelength(44, 44)" public_key.optional = false @@ -105,7 +105,7 @@ allowed_ips = peers:option( translate("Required. IP addresses and prefixes that this peer is allowed " .. "to use inside the tunnel. Routes will be added accordingly.") ) -allowed_ips.datatype = "or(ip6addr, ip4addr)" +allowed_ips.datatype = "ipaddr" allowed_ips.optional = false -- 2.25.1