Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wizard connection for complex passwords (stored as html entities) #81

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix wizard connection for complex passwords (stored as html entities) #81

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f31d64
added missing curl option -k to fix connection with LetsEncrypt certs
enursed May 29, 2020
afc4eaf
decode html entities for password stored in PD xml file
enursed May 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions update_mad.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,17 @@ get_pd_user(){
user=$(awk -F'>' '/auth_username/{print $2}' "$pdconf"|awk -F'<' '{print $1}')
pass=$(awk -F'>' '/auth_password/{print $2}' "$pdconf"|awk -F'<' '{print $1}')
if [[ "$user" ]] ;then
printf "-u $user:$pass"
# decode xml entities in pass (thx to WinEunuuchs2Unix: https://stackoverflow.com/a/43058947)
pass="${pass//&nbsp;/ }"
pass="${pass//&amp;/&}"
pass="${pass//&lt;/<}"
pass="${pass//&gt;/>}"
pass="${pass//&quot;/'"'}"
pass="${pass//&#39;/"'"}"
pass="${pass//&ldquo;/'"'}" # TODO: ASCII/ISO for opening quote
pass="${pass//&rdquo;/'"'}" # TODO: ASCII/ISO for closing quote

printf %s "-u $user:$pass"
fi
}

Expand Down Expand Up @@ -75,7 +85,7 @@ cast_alohomora(){
#update rgc using the wizard
pserver=$(grep -v raw "$pdconf"|awk -F'>' '/post_destination/{print $2}'|awk -F'<' '{print $1}')
origin=$(awk -F'>' '/post_origin/{print $2}' "$pdconf"|awk -F'<' '{print $1}')
newver="$(curl -s -L $(get_pd_user) -H "origin: $origin" "$pserver/mad_apk/rgc/noarch")"
newver="$(curl -s -k -L $(get_pd_user) -H "origin: $origin" "$pserver/mad_apk/rgc/noarch")"
installedver="$(dumpsys package de.grennith.rgc.remotegpscontroller 2>/dev/null|awk -F'=' '/versionName/{print $2}'|head -n1)"
if checkupdate "$newver" "$installedver" ;then
echo "updating RGC..."
Expand All @@ -93,7 +103,7 @@ cast_imperius(){
#update pogodroid using the wizard
pserver=$(grep -v raw "$pdconf"|awk -F'>' '/post_destination/{print $2}'|awk -F'<' '{print $1}')
origin=$(awk -F'>' '/post_origin/{print $2}' "$pdconf"|awk -F'<' '{print $1}')
newver="$(curl -s -L $(get_pd_user) -H "origin: $origin" "$pserver/mad_apk/pogodroid/noarch")"
newver="$(curl -s -k -L $(get_pd_user) -H "origin: $origin" "$pserver/mad_apk/pogodroid/noarch")"
installedver="$(dumpsys package com.mad.pogodroid|awk -F'=' '/versionName/{print $2}'|head -n1)"
if checkupdate "$newver" "$installedver" ;then
echo "updating pogodroid..."
Expand All @@ -110,7 +120,7 @@ reboot=1
update_pokemon(){
pserver=$(grep -v raw "$pdconf"|awk -F'>' '/post_destination/{print $2}'|awk -F'<' '{print $1}')
origin=$(awk -F'>' '/post_origin/{print $2}' "$pdconf"|awk -F'<' '{print $1}')
newver="$(curl -s -L $(get_pd_user) -H "origin: $origin" "$pserver/mad_apk/pogo/armeabi-v7a")"
newver="$(curl -s -k -L $(get_pd_user) -H "origin: $origin" "$pserver/mad_apk/pogo/armeabi-v7a")"
installedver="$(dumpsys package com.nianticlabs.pokemongo|awk -F'=' '/versionName/{print $2}')"
[[ "$newver" == "$installedver" ]] && unset UpdatePoGo && echo "The madmin wizard has version $newver and so do we, doing nothing." && return 0
[[ "$newver" == "" ]] && unset UpdatePoGo && echo "The madmin wizard has no pogo in its system apks, or your pogodroid is not configured" && return 1
Expand Down