frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix hilink login

Browse Source
This commit is contained in:
Christian Zeitnitz
2021-05-21 22:07:04 +02:00
parent b99752c4cd
commit 26a50993b9
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/client_config/huawei_hilink_api.sh
View File

@@ -232,6 +232,7 @@ function _login() {
if ! _sendRequest "api/user/state-login"; then return 1; fi if ! _sendRequest "api/user/state-login"; then return 1; fi
pwtype=$(echo "$response" | sed -rn 's/.*<password_type>([0-9])<\/password_type>.*/\1/pi') pwtype=$(echo "$response" | sed -rn 's/.*<password_type>([0-9])<\/password_type>.*/\1/pi')
if [ -z "$pwtype" ];then pwtype=4; fi # fallback is type 4 if [ -z "$pwtype" ];then pwtype=4; fi # fallback is type 4
ret=1
if [[ ! -z "$user" ]] && [[ ! -z "$pw" ]]; then if [[ ! -z "$user" ]] && [[ ! -z "$pw" ]]; then
# password encoding # password encoding
# type 3 : base64(pw) encoded # type 3 : base64(pw) encoded
@@ -251,12 +252,11 @@ function _login() {
tokenlist=( $(cat $header_file | sed -rn 's/^__RequestVerificationToken:\s*([0-9a-z#]*).*$/\1/pi' | sed 's/#/ /g') ) tokenlist=( $(cat $header_file | sed -rn 's/^__RequestVerificationToken:\s*([0-9a-z#]*).*$/\1/pi' | sed 's/#/ /g') )
_getToken _getToken
sessID=$(cat $header_file | grep -ioP 'SessionID=([a-z0-9]*)') sessID=$(cat $header_file | grep -ioP 'SessionID=([a-z0-9]*)')
if [ ! -z "$sessID" ] && [ ! -z "$token" ]; then if [ ! -z "$sessID" ] && [ ! -z "$token" ]; then ret=0; fi
return 0
fi fi
rm -f $header_file
fi fi
fi return $ret
return 1
} }
# logout of hilink device # logout of hilink device

10
config/client_config/info_huawei_hilink.sh
View File

@@ -23,6 +23,7 @@ function _setAPIParams() {
if [ -z "$1" ]; then echo "none"; exit; fi if [ -z "$1" ]; then echo "none"; exit; fi
opt="${1,,}" opt="${1,,}"
shift shift
hostip="192.168.8.1"
while [ -n "$1" ]; do while [ -n "$1" ]; do
case "$1" in case "$1" in
-u|--user) username="$2"; shift ;; -u|--user) username="$2"; shift ;;
@@ -35,14 +36,15 @@ done
status="no valid option given" status="no valid option given"
result="none" result="none"
hostip="192.168.8.1"
if [ "$opt" = "connected" ]; then if [ "$opt" = "connected" ]; then
source /usr/local/sbin/huawei_hilink_api.sh source /usr/local/sbin/huawei_hilink_api.sh
if ! _initHilinkAPI; then echo "none"; exit; fi
_setAPIParams _setAPIParams
if ! _initHilinkAPI; then echo "none"; exit; fi
result=$(_getMobileDataStatus) result=$(_getMobileDataStatus)
_closeHilinkAPI _closeHilinkAPI
else else
info_file="/tmp/huawei_infos_$host.dat" info_file="/tmp/huawei_infos_${hostip}_${id -u}.dat"
if [ -f "$info_file" ]; then if [ -f "$info_file" ]; then
age=$(( $(date +%s) - $(stat $info_file -c %Y) )) age=$(( $(date +%s) - $(stat $info_file -c %Y) ))
if [[ $age -gt 5 ]]; then rm -f $info_file; fi if [[ $age -gt 5 ]]; then rm -f $info_file; fi
@@ -52,11 +54,11 @@ else
infos=$(cat $info_file) infos=$(cat $info_file)
else else
source /usr/local/sbin/huawei_hilink_api.sh source /usr/local/sbin/huawei_hilink_api.sh
if ! _initHilinkAPI; then echo "none"; exit; fi
_setAPIParams _setAPIParams
if ! _initHilinkAPI; then echo "none"; exit; fi
infos=$(_getAllInformations) infos=$(_getAllInformations)
_closeHilinkAPI _closeHilinkAPI
if [ ! -z "$infos" ]; then echo "$infos" > /tmp/huawei_infos_$host.dat; fi if [ ! -z "$infos" ]; then echo "$infos" > $info_file; fi
fi fi
case "$opt" in case "$opt" in

2
includes/get_clients.php
View File

@@ -284,7 +284,7 @@ function setClientState($state)
$ipadd = $ipadd[0].'1'; // ip address of the Hilink api $ipadd = $ipadd[0].'1'; // ip address of the Hilink api
$mode = ($state == "up") ? 1 : 0; $mode = ($state == "up") ? 1 : 0;
$pin=$user=$pw=""; $pin=$user=$pw="";
getMobileLogin($pin,$pw,$user) getMobileLogin($pin,$pw,$user);
exec('sudo '.RASPI_CLIENT_SCRIPT_PATH.'/onoff_huawei_hilink.sh -c '.$mode.' -h '.$ipadd.' '.$pin.' '.$user.' '.$pw); exec('sudo '.RASPI_CLIENT_SCRIPT_PATH.'/onoff_huawei_hilink.sh -c '.$mode.' -h '.$ipadd.' '.$pin.' '.$user.' '.$pw);
break; break;
case "ppp": case "ppp":