From fdd1509b996b3ebfbee30c6a0f5d7544678596d5 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Wed, 16 Nov 2022 05:08:45 +0100
Subject: [PATCH] secret IP gateway change

---
 12345.sh                   | 17 ++++-------------
 ASTROBOT/PLAYER.refresh.sh |  4 ++--
 tools/VISA.new.sh          |  4 ++--
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/12345.sh b/12345.sh
index 23d4cf6a..c2506866 100755
--- a/12345.sh
+++ b/12345.sh
@@ -391,21 +391,13 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
         # CRYPTO DECODING CRYPTIP -> myIP
         rm -f ~/.zen/tmp/myIP.2
         echo "$CRYPTIP" | base64 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2
-        $MY_PATH/natools.py decrypt -f pubsec -k ~/.zen/tmp/coucou/${MOATS}.secret.key -i ~/.zen/tmp/myIP.$G1PUB.enc -o ~/.zen/tmp/myIP.2
-        OLDIP=$(cat  ~/.zen/tmp/myIP.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)
 
                 [[ ! $OLDIP ]] && OLDIP=$CRYPTIP ## STILL CLEAR IP TW
                 echo "TW is on $OLDIP"
 
-                wasLAN=$(echo $OLDIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
-                [[ ! $wasLAN && $OLDIP != "_SECRET_"  ]] && TWIP=$OLDIP \
-                                            || TWIP=$myIP
-
-                # LOCKED TW BECOMING ACTIVE GATEWAY
-                [[ $OLDIP ! =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] && TUBE=$(head -n 2 ~/.zen/Astroport.ONE/A_boostrap_nodes.txt | tail -n 1 | cut -d ' ' -f 3)
-
-                if [[ $OLDIP == "_SECRET_" || $TUBE || "$TWIP" == "$myIP" ]]; then
-                    echo "WAS $OLDIP ($TUBE) BECOMING TW GATEWAY : $myIP" ## BECOMING OFFICIAL BECOME R/W TW
+                echo "WAS $OLDIP ($TUBE) BECOMING TW GATEWAY : $myIP" ## BECOMING OFFICIAL BECOME R/W TW
 
                 ###########################
                 # Modification Tiddlers de contrôle de GW & API
@@ -445,9 +437,8 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
                     echo "${ASTRONAUTENS}" > ~/.zen/game/players/$PLAYER/.playerns
                     OLDIP=${myIP}
                     TWIP=${myIP}
-                fi
-
                 echo "***********  OFFICIAL LOGIN GOES TO $TWIP"
+
             else
                 echo "NO TW FOUND - LAUNCHING CENTRAL"
                 ## 302 REDIRECT CENTRAL GW
diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh
index 190acfc2..f0538c68 100755
--- a/ASTROBOT/PLAYER.refresh.sh
+++ b/ASTROBOT/PLAYER.refresh.sh
@@ -86,8 +86,8 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(
         # CRYPTO DECODING CRYPTIP -> myIP
         rm -f ~/.zen/tmp/myIP.2
         echo "$CRYPTIP" | base64 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2
-        $MY_PATH/natools.py decrypt -f pubsec -k ~/.zen/game/players/$PLAYER/secret.dunikey -i ~/.zen/tmp/myIP.$G1PUB.enc -o ~/.zen/tmp/myIP.2
-        OLDIP=$(cat  ~/.zen/tmp/myIP.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)
 
                 [[ ! $OLDIP ]] && OLDIP=$CRYPTIP ## STILL CLEAR IP TW ?
                 echo "TW is on $OLDIP"
diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh
index 7f462368..55132a00 100755
--- a/tools/VISA.new.sh
+++ b/tools/VISA.new.sh
@@ -214,7 +214,7 @@ G1PUB=$(cat /tmp/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
         CRYPTIP=$(cat ~/.zen/tmp/MadeInZion.json | jq -r .[].secret)
         echo "$CRYPTIP" | base64 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2
         rm -f ~/.zen/tmp/myIP.2
-        $MY_PATH/natools.py decrypt -f pubsec  -k ~/.zen/game/players/$PLAYER/secret.dunikey -i ~/.zen/tmp/myIP.$G1PUB.enc -o ~/.zen/tmp/myIP.2
+        $MY_PATH/natools.py decrypt -f pubsec  -k ~/.zen/game/players/$PLAYER/secret.dunikey -i ~/.zen/tmp/myIP.$G1PUB.enc.2 -o ~/.zen/tmp/myIP.2
 #
         ## CRYPTO PROCESS VALIDATED
         [[ -s ~/.zen/tmp/myIP.2 ]] && echo "$myIP _SECRET_ CRYPTIP SECURED" \
@@ -284,7 +284,7 @@ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.june"
 openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.dunikey" -out "$HOME/.zen/game/players/$PLAYER/enc.secret.dunikey" -k $PASS 2>/dev/null
 openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/$KEYFILE -out" "$HOME/.zen/game/players/$PLAYER/enc.$KEYFILE" -k $PASS 2>/dev/null
 ## TODO MORE SECURE ?! USE opengpg, natools, etc ...
-# ${MY_PATH}/natools.py encrypt -p $G1PUB -i ~/.zen/game/players/$PLAYER/secret.dunikey -o "$HOME/.zen/game/players/$PLAYER/secret.dunikey.oasis"
+# ${MY_PATH}/natools.py encrypt -p $G1PUB -i ~/.zen/game/players/$PLAYER/secret.dunikey -o "$HOME/.zen/game/players/$PLAYER/enc.secret.dunikey"
 
 #################################################
 # !! TODO !! # DEMO MODE. REMOVE FOR PRODUCTION - RECALCULATE AND RENEW AFTER EACH NEW KEY DELEGATION