hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated bash API with unicode support and better usability

Browse source
This commit is contained in:
Thulinma 2017-12-06 16:46:36 +01:00
parent 26d039f278
commit a80146dd25
1 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

51
api/mist_api.sh
View file

@ -16,6 +16,19 @@ function mistCheckDeps {
return 1 return 1
} }
urlencode() {
# urlencode <string>
local LANG=C
local length="${#1}"
for (( i = 0; i < length; i++ )); do
local c="${1:i:1}"
case $c in
[a-zA-Z0-9.~_-]) printf "$c" ;;
*) printf '%%%02X' "'$c" ;;
esac
done
}
function mistCall { function mistCall {
mistCheckDeps || return 3 mistCheckDeps || return 3
@ -28,32 +41,56 @@ function mistCall {
echo " {\"auth\":{...}, COMMAND, \"minimal\":1}" >&2 echo " {\"auth\":{...}, COMMAND, \"minimal\":1}" >&2
echo "" >&2 echo "" >&2
fi fi
if [ "$#" -ne 4 ] ; then if [ "$#" -gt 4 ] ; then
echo "ERROR: Usage: mistCall SERVER USERNAME PASSWORD COMMAND" >&2 echo "ERROR: Usage: mistCall [SERVER] [USERNAME PASSWORD] COMMAND" >&2
return 3 return 3
fi fi
ARG_CMD=""
ARG_SRV="localhost:4242"
ARG_USR=""
ARG_PWD=""
if [ "$#" -eq 1 ] ; then
ARG_CMD=$1
fi
if [ "$#" -eq 2 ] ; then
ARG_SRV=$1
ARG_CMD=$2
fi
if [ "$#" -eq 3 ] ; then
ARG_USR=$1
ARG_PWD=$2
ARG_CMD=$3
fi
if [ "$#" -eq 4 ] ; then
ARG_SRV=$1
ARG_USR=$2
ARG_PWD=$3
ARG_CMD=$4
fi
#Load auth, if any #Load auth, if any
MIST_AUTH=`cat /tmp/MistBashAuth 2> /dev/null` MIST_AUTH=`cat /tmp/MistBashAuth 2> /dev/null`
#Send request #Send request
RESP=`curl -s -X POST -d "command={${MIST_AUTH}, ${4}, \"minimal\":1}" http://${1}/api/` CMD=`urlencode "{${MIST_AUTH} ${ARG_CMD}}"`
RESP=`curl -s -X POST -d "command=$CMD" http://${ARG_SRV}/api2`
#Catch problems with reaching the server, display clear error message #Catch problems with reaching the server, display clear error message
if [ "$?" != "0" ] ; then if [ "$?" != "0" ] ; then
echo "ERROR: Could not contact server (${1}), is it correct and online?" >&2 echo "ERROR: Could not contact server (${ARG_SRV}), is it correct and online?" >&2
return 1 return 1
fi fi
#Check if this is a challenge #Check if this is a challenge
if [ `echo $RESP | jq -r .authorize.status` == "CHALL" ] ; then if [ `echo $RESP | jq -r .authorize.status` == "CHALL" ] ; then
echo "Challenge detected, (re)calculating login string..." >&2 echo "Challenge detected, (re)calculating login string..." >&2
PASSW=`echo -n $3 | md5sum | cut -f 1 -d " "`"" PASSW=`echo -n ${ARG_PWD} | md5sum | cut -f 1 -d " "`""
CHALL=`echo $RESP | jq -r .authorize.challenge` CHALL=`echo $RESP | jq -r .authorize.challenge`
SUMMD=`echo -n $PASSW$CHALL | md5sum | cut -f 1 -d " "` SUMMD=`echo -n $PASSW$CHALL | md5sum | cut -f 1 -d " "`
MIST_AUTH="\"authorize\":{\"username\":\"${2}\",\"password\":\"${SUMMD}\"}" MIST_AUTH="\"authorize\":{\"username\":\"${ARG_USR}\",\"password\":\"${SUMMD}\"},"
#Repeat request #Repeat request
RESP=`curl -s -X POST -d "command={${MIST_AUTH}, ${4}, \"minimal\":1}" http://${1}/api/` CMD=`urlencode "{${MIST_AUTH} ${ARG_CMD}}"`
RESP=`curl -s -X POST -d "command=$CMD" http://${ARG_SRV}/api2`
fi fi
#Still a challenge? We must have invalid credentials #Still a challenge? We must have invalid credentials