summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authordanrl <mail@danrl.com>2017-02-15 09:23:06 +0100
committerdanrl <mail@danrl.com>2017-02-15 10:03:29 +0100
commit8fc55591b9adb10c17b506a2e2d178055d07cba7 (patch)
treecf56e4df711ec423637cf12285e6121c86c2add7
parent07e01d094eb25e1f036e85b8cfc5aceccc56003c (diff)
luci-proto-wireguard: stricter input validation
Signed-off-by: Dan Luedtke <mail@danrl.com>
-rw-r--r--protocols/luci-proto-wireguard/luasrc/model/cbi/admin_network/proto_wireguard.lua11
1 files changed, 6 insertions, 5 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 de4ece347..d95008119 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 = "rangelength(44, 44)"
+private_key.datatype = "and(base64,rangelength(44, 44))"
private_key.optional = false
@@ -76,11 +76,12 @@ preshared_key = section:taboption(
Value,
"preshared_key",
translate("Preshared Key"),
- translate("Optional. Adds in an additional layer of symmetric-key " ..
+ translate("Optional. Base64-encoded preshared key. " ..
+ "Adds in an additional layer of symmetric-key " ..
"cryptography for post-quantum resistance.")
)
preshared_key.password = true
-preshared_key.datatype = "rangelength(44, 44)"
+preshared_key.datatype = "and(base64,rangelength(44, 44))"
preshared_key.optional = true
@@ -102,9 +103,9 @@ public_key = peers:option(
Value,
"public_key",
translate("Public Key"),
- translate("Required. Public key of peer.")
+ translate("Required. Base64-encoded public key of peer.")
)
-public_key.datatype = "rangelength(44, 44)"
+public_key.datatype = "and(base64,rangelength(44, 44))"
public_key.optional = false