Changeset 597

Timestamp:

08/03/11 17:17:51 (10 months ago)

Author:

JulioCP

Message:

Web Interface: allow especial chars for root password.

Location:

trunk/nightwing/www/cgi-bin/nw_config

Files:

• basicSettings.cgi (modified) (2 diffs)
• basicSettingsFunctions.cgi (modified) (2 diffs)

trunk/nightwing/www/cgi-bin/nw_config/basicSettings.cgi

@@ -24 +24 @@
 
 # read in our parameters
-WEB_ROOT_PASSWORD=`echo "$QUERY_STRING" | sed -n 's/^.*rootPass=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"`
+#WEB_ROOT_PASSWORD=`echo "$QUERY_STRING" | sed -n 's/^.*rootPass=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"`
+WEB_ROOT_PASSWORD=$(echo -e `echo "$QUERY_STRING" | sed -n 's/^.*rootPass=\([^&]*\).*$/\1/p' | sed "s/+/%20/g" | sed "s/%/\\\\\x/g"`)
 
 WEB_WPA2_PASSPHASE=`echo "$QUERY_STRING" | sed -n 's/^.*wpa2Pass=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"`
@@ -52 +53 @@
 ACCUM=""
 
-if [ ! -z $WEB_ROOT_PASSWORD ]
+if [ ! -z "$WEB_ROOT_PASSWORD" ]
 then
-        ACCUM=$ACCUM$(case_root_pw $WEB_ROOT_PASSWORD)
+        ACCUM=$ACCUM$(case_root_pw "$WEB_ROOT_PASSWORD")
 fi
 

trunk/nightwing/www/cgi-bin/nw_config/basicSettingsFunctions.cgi

@@ -15 +15 @@
 {
  
-password=$1
+password="$1"
 
 fifo_in="/tmp/empty.in"                 # input fifo
@@ -53 +53 @@
         if [ ${#PASSWORD} -gt 7 -a ${#PASSWORD} -lt 64 ]
         then
-                case_cambio_pass $PASSWORD
+                case_cambio_pass "$PASSWORD"
                 if [ $? -ne 0 ]
                 then