diff --git a/12345.sh b/12345.sh index abfb0736..097de986 100755 --- a/12345.sh +++ b/12345.sh @@ -387,7 +387,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh if [[ -s ~/.zen/tmp/coucou/${MOATS}.astroindex.html ]]; then echo "GOT TW CACHE !!" tiddlywiki --load ~/.zen/tmp/coucou/${MOATS}.astroindex.html --output ~/.zen/tmp --render '.' 'miz.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' - CRYPTIP=$(cat ~/.zen/tmp/miz.json | jq -r .[].secret) + CRYPTIP=$(cat ~/.zen/tmp/miz.json | jq -r .[].secret | base16 -d) [[ ! $CRYPTIP ]] && (echo "$HTTPCORS 501 ERROR - SORRY - OUT OF SWARM#0 TW - CONTINUE " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "BAD TW (☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && continue # # CRYPTO DECODING CRYPTIP -> myIP @@ -492,14 +492,14 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh echo "$SALT / $PEPPER ($PASS)" if [[ ! -d ~/.zen/game/players/${WHAT} ]]; then - # ASTRONAUT NEW VISA Create VISA.new.sh in background + echo "# ASTRONAUT NEW VISA Create VISA.new.sh in background (~/.zen/tmp/email.${WHAT}.${MOATS}.txt)" ( $MY_PATH/tools/VISA.new.sh "$SALT" "$PEPPER" "${WHAT}" "$PSEUDO" > ~/.zen/tmp/email.${WHAT}.${MOATS}.txt $MY_PATH/tools/mailjet.sh "${WHAT}" ~/.zen/tmp/email.${WHAT}.${MOATS}.txt ) & - echo "$HTTPCORS OK - ASTRONAUT $PSEUDO IPFS FILESYSTEM CREATION [$SALT + $PEPPER] (${WHAT}) -
- BUILDING TW - PLEASE 'ASK BIOS AGAIN' IN A WHILE http://$myIP:1234/ " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & + echo "$HTTPCORS - BOOTING - ASTRONAUT $PSEUDO - IPFS FORMATING - [$SALT + $PEPPER] (${WHAT}) +
- TW - http://$myIP:8080/ipns/$ASTRONAUTENS
- GW - /ipns/$IPFSNODEID" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & echo "(☓‿‿☓) Execution time was "`expr $end - $start` seconds. continue else diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index fc3c8b2f..9d291bcf 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -82,7 +82,7 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|( ############################################################# ## CHECK IF myIP IS ACTUAL OFFICIAL GATEWAY tiddlywiki --load ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html --output ~/.zen/tmp --render '.' 'miz.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' - CRYPTIP=$(cat ~/.zen/tmp/miz.json | jq -r .[].secret) + CRYPTIP=$(cat ~/.zen/tmp/miz.json | jq -r .[].secret | base16 -d) [[ ! $CRYPTIP ]] && echo "(╥☁╥ ) ERROR - SORRY - CRYPTIP IS BROKEN - (╥☁╥ ) " && continue # # CRYPTO DECODING CRYPTIP -> myIP diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index 68faa603..8e37f467 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -206,13 +206,13 @@ G1PUB=$(cat /tmp/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) echo "# CRYPTO ENCODING myIP -> CRYPTIP" echo $myIP > ~/.zen/tmp/myIP $MY_PATH/natools.py encrypt -p $G1PUB -i $HOME/.zen/tmp/myIP -o $HOME/.zen/tmp/myIP.$G1PUB.enc - CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc) + CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc | base16) sed -i "s~_SECRET_~$CRYPTIP~g" ~/.zen/game/players/$PLAYER/ipfs/moa/index.html # echo "# CRYPTO DECODING CRYPTIP -> myIP" tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html --output ~/.zen/tmp --render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' - CRYPTIP2=$(cat ~/.zen/tmp/MadeInZion.json | jq -r .[].secret) - echo "$CRYPTIP2" > ~/.zen/tmp/myIP.$G1PUB.enc.2 + CRYPTIPENC=$(cat ~/.zen/tmp/MadeInZion.json | jq -r .[].secret | base16 -d) + echo "$CRYPTIPENC" > ~/.zen/tmp/myIP.$G1PUB.enc.2 rm -f ~/.zen/tmp/myIP.2 echo "$MY_PATH/natools.py decrypt -f pubsec -k $HOME/.zen/game/players/$PLAYER/secret.dunikey -i $HOME/.zen/tmp/myIP.$G1PUB.enc.2 -o $HOME/.zen/tmp/myIP.2" $MY_PATH/natools.py decrypt -f pubsec -k $HOME/.zen/game/players/$PLAYER/secret.dunikey -i $HOME/.zen/tmp/myIP.$G1PUB.enc.2 -o $HOME/.zen/tmp/myIP.2