Просмотр исходного кода

support pre-md5summed passwords in 6in4 scripts

The he.net ipv6 tunnels require that a user supply the md5sum of his password
when updating the ipv4 tunnel endpoint. the 6in4 package supports this well,
but requires that a user store his password in plaintext in uci. this patch
tries to detect whether the password in uci is already an md5sum
(32 characters containing only [a-z0-9]), so users can avoid storing plaintext
passwords.

Signed-off-by: Steven Brudenell <[email protected]>

SVN-Revision: 22889
Florian Fainelli 15 лет назад
Родитель
Сommit
f7538b6864
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      package/6in4/files/6in4.hotplug

+ 3 - 1
package/6in4/files/6in4.hotplug

@@ -32,7 +32,9 @@ if [ "$ACTION" = ifup ]; then
 			config_get password "$cfg" password
 
 			[ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && {
-				password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
+				[ "${#password}" != 32 ] || [ -n "$(echo "$password" | sed 's/[a-z0-9]//g')" ] && {
+					password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
+				}
 				uci_set_state network "$cfg" ipaddr "$wanip"
 
 				( wget -qO/dev/null "http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid" && ifup "$cfg" )&