STI/Astroport.ONE
STI
/
Astroport.ONE
4
1
Fork 2
Code Issues 12 Pull Requests Projects Releases 1 Wiki Activity

PGP encode / decode $PASS : ${salt} != "" && ${pepper} != ""

This commit is contained in:
fred 2023-03-27 20:53:11 +02:00
parent 6d0a510032
commit eea9199356
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
API/QRCODE.sh
View File

@ -90,32 +90,44 @@ if [[ ${QRCODE:0:5} == "-----" ]]; then
arr=(${DISCO//[=&]/ })
salt=$(urldecode ${arr[1]} | xargs)
pepper=$(urldecode ${arr[3]} | xargs)
echo "$DISCO DECODED" >> ~/.zen/tmp/${MOATS}/disco
if [[ ${salt} != "" && ${pepper} != "" && ${WHAT} != "" && ${VAL} != "" ]]; then
echo "<br>${salt} <br>${pepper} <br>" >> ~/.zen/tmp/${MOATS}/disco
if [[ ${salt} != "" && ${pepper} != "" ]]; then
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/secret.key "$salt" "$pepper"
G1PUB=$(cat ~/.zen/tmp/${MOATS}/secret.key | grep 'pub:' | cut -d ' ' -f 2)
## COMMAND A PAYMENT
if [[ $APPNAME == "pay" ]]; then
if [[ $WHAT =~ ^[0-9]+$ ]]; then
echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${G1PUB}"
~/.zen/Astroport.ONE/tools/COINScheck.sh ${G1PUB} > ~/.zen/tmp/${G1PUB}.curcoin
cat ~/.zen/tmp/${G1PUB}.curcoin
CURCOINS=$(cat ~/.zen/tmp/${G1PUB}.curcoin | tail -n 1)
echo "CURRENT KEY : $CURCOINS G1"
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m"
~/.zen/Astroport.ONE/tools/timeout.sh -t 3 \
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
[[ ${WHAT} == "" ]] && echo "<br> Missing amount <br>" >> ~/.zen/tmp/${MOATS}/disco
[[ ${VAL} == "" ]] && echo "<br> Missing Destination PublicKey <br>" >> ~/.zen/tmp/${MOATS}/disco
if [[ ${WHAT} != "" && ${VAL} != "" && ${CURCOINS} != "null" && ${CURCOINS} != "" ]]; then
## COMMAND A PAYMENT
if [[ $APPNAME == "pay" ]]; then
if [[ $WHAT =~ ^[0-9]+$ ]]; then
echo "${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m"
~/.zen/Astroport.ONE/tools/timeout.sh -t 3 \
${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/tmp/${MOATS}/secret.key pay -a ${WHAT} -p ${VAL} -c 'Bro' -m 2>&1 >> ~/.zen/tmp/${MOATS}/disco
fi
fi
fi
else
echo "<br>${WHAT} ${VAL} ${CURCOINS} PROBLEM " >> ~/.zen/tmp/${MOATS}/disco
fi
else
echo "BAD PASS FOR ${QRCODE} ${WHAT} ${VAL} " >> ~/.zen/tmp/${MOATS}/disco
echo "<br>BAD PASS FOR ${QRCODE} ${WHAT} ${VAL} " >> ~/.zen/tmp/${MOATS}/disco
fi
else
echo "DATA MISSING" >> ~/.zen/tmp/${MOATS}/disco
echo "<br>DATA MISSING" >> ~/.zen/tmp/${MOATS}/disco
fi
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect

2
ASTROBOT/G1Voeu.sh
View File

@ -102,7 +102,7 @@ mkdir -p ~/.zen/tmp/$MOATS
convert -gravity southeast -pointsize 25 -fill black -draw "text 30,30 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/layer1.png ~/.zen/tmp/${MOATS}/result.png
## MAKE amzqr WITH astro:// LINK
amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~')" \
amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~' | tr '+' '_' | jq -Rr @uri)" \
-d "$HOME/.zen/game/world/$PEPPER/$WISHKEY" \
-l H \
-p ~/.zen/tmp/${MOATS}/result.png -c

4
tools/VISA.new.sh
View File

@ -209,8 +209,8 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
## Add logo to QRCode
cp ${MY_PATH}/../images/astrologo_nb.png ~/.zen/tmp/${MOATS}/fond.png
## MAKE amzqr WITH astro:// LINK
amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~')" \
## MAKE amzqr WITH astro:// ---- PGP LINK
amzqr "$(cat ~/.zen/tmp/${MOATS}/gpg.${PSEUDO}.asc | tr '\n' '~' | tr '+' '_' | jq -Rr @uri)" \
-d ~/.zen/tmp/${MOATS} \
-l H \
-p ~/.zen/tmp/${MOATS}/fond.png