Changeset 598 for trunk

Show
Ignore:
Timestamp:
08/10/11 23:36:41 (10 months ago)
Author:
JulioCP
Message:

Web Interface: allow especial chars for all passwords.

Location:
trunk/nightwing/www/cgi-bin/nw_config
Files:
2 modified

Legend:

Unmodified
Added
Removed

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

    r597 r598  
    2424 
    2525# read in our parameters 
    26 #WEB_ROOT_PASSWORD=`echo "$QUERY_STRING" | sed -n 's/^.*rootPass=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"` 
    2726WEB_ROOT_PASSWORD=$(echo -e `echo "$QUERY_STRING" | sed -n 's/^.*rootPass=\([^&]*\).*$/\1/p' | sed "s/+/%20/g" | sed "s/%/\\\\\x/g"`) 
    2827 
    … …  
    3332###### 
    3433WEB_WEB_ADMIN_USER=`echo "$QUERY_STRING" | sed -n 's/^.*webUser=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"` 
    35 WEB_WEB_ADMIN_PASS=`echo "$QUERY_STRING" | sed -n 's/^.*webPass=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"` 
     34WEB_WEB_ADMIN_PASS=$(echo -e `echo "$QUERY_STRING" | sed -n 's/^.*webPass=\([^&]*\).*$/\1/p' | sed "s/+/%20/g" | sed "s/%/\\\\\x/g"`) 
    3635 
    37 WEB_WIFIDOG_ACCESS=`echo "$QUERY_STRING" | sed -n 's/^.*wifiDog=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"` 
     36WEB_WIFIDOG_ACCESS=$(echo -e `echo "$QUERY_STRING" | sed -n 's/^.*wifiDog=\([^&]*\).*$/\1/p' | sed "s/+/%20/g" | sed "s/%/\\\\\x/g"`) 
    3837 
    3938WEB_HOSTNAME=`echo "$QUERY_STRING" | sed -n 's/^.*hostname=\([^&]*\).*$/\1/p' | sed "s/%20/ /g"` 
    … …  
    5857fi 
    5958 
    60 if [ ! -z $WEB_WPA2_PASSPHASE ] 
     59if [ ! -z "$WEB_WPA2_PASSPHASE" ] 
    6160then 
    62         ACCUM=$ACCUM$(wpa2_pass_change $WEB_WPA2_PASSPHASE) 
     61        ACCUM=$ACCUM$(wpa2_pass_change "$WEB_WPA2_PASSPHASE") 
    6362        if [ $? -ne 0 ] 
    6463        then  
    … …  
    7877fi 
    7978 
    80 if [ ! -z $WEB_WEB_ADMIN_PASS ] 
     79if [ ! -z "$WEB_WEB_ADMIN_PASS" ] 
    8180then 
    82         ACCUM=$ACCUM$(case_httpd_pass_change $WEB_WEB_ADMIN_PASS) 
     81        ACCUM=$ACCUM$(case_httpd_pass_change "$WEB_WEB_ADMIN_PASS") 
    8382        if [ $? -ne 0 ] 
    8483        then  
    … …  
    102101fi 
    103102 
    104 if [ ! -z $WEB_WIFIDOG_ACCESS ] 
     103if [ ! -z "$WEB_WIFIDOG_ACCESS" ] 
    105104then 
    106105        ACCUM=$ACCUM$(case_wifi_dog_pass $WEB_WIFIDOG_ACCESS) 

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

    r597 r598  
    7474        if [ ${#HTTPPASS} -gt 7 -a ${#HTTPPASS} -lt 64 ]; 
    7575        then 
    76                 echo "/:$HTTPUSER:$(uhttpd -m $HTTPPASS)" > /etc/httpd.conf 
     76                echo "/:$HTTPUSER:$(uhttpd -m "$HTTPPASS")" > /etc/httpd.conf 
    7777                echo "WEB Password changed.<br>" 
    7878                exit 0 
    … …  
    9999wpa2_pass_change () 
    100100{ 
    101         WPA2PASS=$1 
     101        WPA2PASS="$1" 
    102102        if [ ${#WPA2PASS} -gt 7 -a ${#WPA2PASS} -lt 64 ]; 
    103103        then