CRYPTIP OK !!! no echo & no cat problem

2022-11-17 17:56:50 +01:00 · 2022-11-17 17:56:50 +01:00 · 1580a9cedf
parent 6e046d1ba8
commit 1580a9cedf
3 changed files with 24 additions and 28 deletions
--- a/12345.sh
+++ b/12345.sh
@ -387,19 +387,19 @@ 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 | base16 -d)
-                [[ ! $CRYPTIP ]] && (echo "$HTTPCORS CRYPTIP ERROR - SORRY - CANNOT CONTINUE " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "BAD CRYPTIP (☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && continue
+                SECRET=$(cat ~/.zen/tmp/miz.json | jq -r .[].secret)
+                [[ ! $SECRET ]] && (echo "$HTTPCORS SECRET ERROR - SORRY - CANNOT CONTINUE " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "BAD SECRET (☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && continue
 #
        # CRYPTO DECODING CRYPTIP -> myIP
-        rm -f ~/.zen/tmp/myIP.2
-        echo -n "$CRYPTIP" > ~/.zen/tmp/myIP.$G1PUB.enc.2
-        $MY_PATH/tools/natools.py decrypt -f pubsec -k ~/.zen/tmp/coucou/${MOATS}.secret.key -i ~/.zen/tmp/myIP.$G1PUB.enc.2 -o ~/.zen/tmp/myIP.2 > /dev/null 2>&1
-        OLDIP=$(cat  ~/.zen/tmp/myIP.2 > /dev/null 2>&1)
+                cat ~/.zen/tmp/miz.json | jq -r .[].secret | base16 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2
+                $MY_PATH/tools/natools.py decrypt -f pubsec -k ~/.zen/tmp/coucou/${MOATS}.secret.key -i ~/.zen/tmp/myIP.$G1PUB.enc.2 -o ~/.zen/tmp/myIP.$G1PUB > /dev/null 2>&1
+                GWIP=$(cat  ~/.zen/tmp/myIP.$G1PUB > /dev/null 2>&1)

-                [[ ! $OLDIP ]] && OLDIP=$CRYPTIP ## STILL CLEAR IP TW
-                echo "TW is on $OLDIP ($CRYPTIP)"
+                [[ ! $GWIP ]] && (echo "$HTTPCORS GWIP ERROR - SORRY - CANNOT CONTINUE " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "BAD GWIP (☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && continue
+#
+                echo "TW is on $GWIP"

-                echo "WAS $OLDIP ($TUBE) BECOMING TW GATEWAY : $myIP" ## BECOMING OFFICIAL BECOME R/W TW
+                echo "WAS $GWIP ($TUBE) BECOMING TW GATEWAY : $myIP" ## BECOMING OFFICIAL BECOME R/W TW

                ###########################
                # Modification Tiddlers de contrôle de GW & API
@ -437,7 +437,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
                    echo "$PLAYER" > ~/.zen/game/players/$PLAYER/.player
                    echo "$G1PUB" > ~/.zen/game/players/$PLAYER/.g1pub
                    echo "${ASTRONAUTENS}" > ~/.zen/game/players/$PLAYER/.playerns
-                    OLDIP=${myIP}
+                    GWIP=${myIP}
                    TWIP=${myIP}
                echo "***********  OFFICIAL LOGIN GOES TO $TWIP"

--- a/ASTROBOT/PLAYER.refresh.sh
+++ b/ASTROBOT/PLAYER.refresh.sh
@ -81,37 +81,34 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(
     ## FOUND TW
        #############################################################
        ## 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 | base16 -d)
-        [[ ! $CRYPTIP ]] && echo "(╥☁╥ ) ERROR - SORRY - CRYPTIP IS BROKEN - (╥☁╥ ) " && continue
+                tiddlywiki --load ~/.zen/tmp/coucou/${MOATS}.astroindex.html  --output ~/.zen/tmp --render '.' 'miz.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion'
+                SECRET=$(cat ~/.zen/tmp/miz.json | jq -r .[].secret)
+                [[ ! $SECRET ]] && (echo "$HTTPCORS SECRET ERROR - SORRY - CANNOT CONTINUE " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "BAD SECRET (☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && continue
 #
        # CRYPTO DECODING CRYPTIP -> myIP
-        rm -f ~/.zen/tmp/myIP.2
-        echo -n "$CRYPTIP" > ~/.zen/tmp/myIP.$G1PUB.enc.2
-        $MY_PATH/../tools/natools.py decrypt -f pubsec -k ~/.zen/game/players/$PLAYER/secret.dunikey -i ~/.zen/tmp/myIP.$G1PUB.enc.2 -o ~/.zen/tmp/myIP.2 > /dev/null 2>&1
-        OLDIP=$(cat  ~/.zen/tmp/myIP.2 > /dev/null 2>&1)
+                cat ~/.zen/tmp/miz.json | jq -r .[].secret | base16 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2
+                $MY_PATH/../tools/natools.py decrypt -f pubsec -k ~/.zen/game/players/$PLAYER/secret.dunikey -i ~/.zen/tmp/myIP.$G1PUB.enc.2 -o ~/.zen/tmp/myIP.$G1PUB > /dev/null 2>&1
+                GWIP=$(cat  ~/.zen/tmp/myIP.$G1PUB > /dev/null 2>&1)

-                [[ ! $OLDIP ]] && OLDIP=$CRYPTIP ## STILL CLEAR IP TW ?
-                echo "TW is on $OLDIP"
-                [[ ! $OLDIP ]] && echo "(╥☁╥ ) ERROR - SORRY - TW IP IS BROKEN - (╥☁╥ ) " && continue
+                [[ ! $GWIP ]] && echo "(╥☁╥ ) ERROR - SORRY - TW IP IS BROKEN - (╥☁╥ ) " && continue
+
+                echo "TW is on $GWIP"

        # WHO IS OFFICIAL TW GATEWAY.
    if [[ ! -s ~/.zen/game/players/$PLAYER/ipfs/G1SSB/_g1.pubkey ]]; then
-        if [[ $OLDIP =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
-            if [[ $OLDIP != $myIP && $OLDIP != "_SECRET_" ]]; then
+            if [[ $GWIP != $myIP ]]; then
                # NOT MY PLAYER
                echo "REMOVING PLAYER $PLAYER"
                rm -Rf ~/.zen/game/players/$PLAYER/
                ipfs key rm ${PLAYER}
                ipfs key rm ${G1PUB}
-                echo "*** OFFICIAL GATEWAY : http://$OLDIP:8080/ipns/$ASTRONAUTENS  ***" && continue
+                echo "*** OFFICIAL GATEWAY : http://$GWIP:8080/ipns/$ASTRONAUTENS  ***" && continue
            fi
-        fi
    else
        echo "OFFICIAL VISA - (⌐■_■) -"
    fi
        #############################################################
-        ## OLDIP == myIP or TUBE !!
+        ## GWIP == myIP or TUBE !!
        #############################################################

        # Connect_PLAYER_To_Gchange.sh : Sync FRIENDS TW
@ -135,7 +132,7 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(

        ####################
        echo "# TUBE as 8080 & 5001"
-        #sed -i "s~${OLDIP}~_SECRET_~g" ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html
+        #sed -i "s~${GWIP}~_SECRET_~g" ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html
        TUBE=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 3)
        # sed -i "s~_SECRET_~$TUBE~g" ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html

--- a/tools/VISA.new.sh
+++ b/tools/VISA.new.sh
@ -211,8 +211,7 @@ G1PUB=$(cat /tmp/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
 #
        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'
-        CRYPTIPENC=$(cat ~/.zen/tmp/MadeInZion.json | jq -r .[].secret | base16 -d)
-        echo -n "$CRYPTIPENC" > ~/.zen/tmp/myIP.$G1PUB.enc.2 ### PAS DE RETOUR CHARIOT !
+        cat ~/.zen/tmp/MadeInZion.json | jq -r .[].secret | base16 -d > ~/.zen/tmp/myIP.$G1PUB.enc.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
 #
        ## CRYPTO PROCESS VALIDATED