PGP encode / decode $PASS : ${salt} != "" && ${pepper} != ""
This commit is contained in:
parent
6d0a510032
commit
eea9199356
|
@ -90,13 +90,22 @@ if [[ ${QRCODE:0:5} == "-----" ]]; then
|
||||||
arr=(${DISCO//[=&]/ })
|
arr=(${DISCO//[=&]/ })
|
||||||
salt=$(urldecode ${arr[1]} | xargs)
|
salt=$(urldecode ${arr[1]} | xargs)
|
||||||
pepper=$(urldecode ${arr[3]} | xargs)
|
pepper=$(urldecode ${arr[3]} | xargs)
|
||||||
echo "$DISCO DECODED" >> ~/.zen/tmp/${MOATS}/disco
|
echo "<br>${salt} <br>${pepper} <br>" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
|
|
||||||
if [[ ${salt} != "" && ${pepper} != "" && ${WHAT} != "" && ${VAL} != "" ]]; then
|
|
||||||
|
|
||||||
|
if [[ ${salt} != "" && ${pepper} != "" ]]; then
|
||||||
${MY_PATH}/../tools/keygen -t duniter -o ~/.zen/tmp/${MOATS}/secret.key "$salt" "$pepper"
|
${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)
|
G1PUB=$(cat ~/.zen/tmp/${MOATS}/secret.key | grep 'pub:' | cut -d ' ' -f 2)
|
||||||
|
|
||||||
|
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"
|
||||||
|
|
||||||
|
[[ ${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
|
## COMMAND A PAYMENT
|
||||||
if [[ $APPNAME == "pay" ]]; then
|
if [[ $APPNAME == "pay" ]]; then
|
||||||
if [[ $WHAT =~ ^[0-9]+$ ]]; then
|
if [[ $WHAT =~ ^[0-9]+$ ]]; then
|
||||||
|
@ -107,15 +116,18 @@ if [[ ${QRCODE:0:5} == "-----" ]]; then
|
||||||
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
echo "BAD PASS FOR ${QRCODE} ${WHAT} ${VAL} " >> ~/.zen/tmp/${MOATS}/disco
|
echo "<br>${WHAT} ${VAL} ${CURCOINS} PROBLEM " >> ~/.zen/tmp/${MOATS}/disco
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
|
||||||
|
echo "<br>BAD PASS FOR ${QRCODE} ${WHAT} ${VAL} " >> ~/.zen/tmp/${MOATS}/disco
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
echo "DATA MISSING" >> ~/.zen/tmp/${MOATS}/disco
|
echo "<br>DATA MISSING" >> ~/.zen/tmp/${MOATS}/disco
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
|
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
|
||||||
|
|
|
@ -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
|
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
|
## 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" \
|
-d "$HOME/.zen/game/world/$PEPPER/$WISHKEY" \
|
||||||
-l H \
|
-l H \
|
||||||
-p ~/.zen/tmp/${MOATS}/result.png -c
|
-p ~/.zen/tmp/${MOATS}/result.png -c
|
||||||
|
|
|
@ -209,8 +209,8 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
||||||
## Add logo to QRCode
|
## Add logo to QRCode
|
||||||
cp ${MY_PATH}/../images/astrologo_nb.png ~/.zen/tmp/${MOATS}/fond.png
|
cp ${MY_PATH}/../images/astrologo_nb.png ~/.zen/tmp/${MOATS}/fond.png
|
||||||
|
|
||||||
## MAKE amzqr WITH astro:// LINK
|
## MAKE amzqr WITH astro:// ---- PGP 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 ~/.zen/tmp/${MOATS} \
|
-d ~/.zen/tmp/${MOATS} \
|
||||||
-l H \
|
-l H \
|
||||||
-p ~/.zen/tmp/${MOATS}/fond.png
|
-p ~/.zen/tmp/${MOATS}/fond.png
|
||||||
|
|
Loading…
Reference in New Issue