proto/ipv6: emit a validation error if 6in4 username is still an md5sum

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

diff --git a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
index b4cba5887a07b9e92eea5d7775d1eacfd28fc1ff..9b668cdda88fb3a96d31b623c02c1a4ae1fd84a5 100644 (file)
--- a/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
+++ b/protocols/ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua
@@ -66,13 +66,22 @@ tunnelid:depends("_update", update.enabled)
 
 
 username = section:taboption("general", Value, "username",
-       translate("HE.net user ID"),
-       translate("This is the 32 byte hex encoded user ID, not the login name"))
+       translate("HE.net username"),
+       translate("This is the plain username for logging into the account"))
 
 username:depends("_update", update.enabled)
+username.validate = function(self, val, sid)
+       if type(val) == "string" and #val == 32 and val:match("^[a-fA-F0-9]+$") then
+               return nil, translate("The HE.net endpoint update configuration changed, you must now use the plain username instead of the user ID!")
+       end
+       return val
+end
+
 
+password = section:taboption("general", Value, "password",
+       translate("HE.net password"),
+       translate("This is either the \"Update Key\" configured for the tunnel or the account password if no update key has been configured"))
 
-password = section:taboption("general", Value, "password", translate("HE.net password"))
 password.password = true
 password:depends("_update", update.enabled)