VISA.new - UPlanet -

2023-10-03 22:50:59 +02:00 · 2023-10-03 22:50:59 +02:00 · ddc5a7dee4
parent f7fef2fdb4
commit ddc5a7dee4
6 changed files with 55 additions and 55 deletions
--- a/API/SALT.sh
+++ b/API/SALT.sh
@ -165,7 +165,7 @@ Content-Type: text/html; charset=UTF-8
                    startvisa=`date +%s`
                    [[ "$SALT" == "0" && "$PEPPER" == "0" ]] && SALT="" && PEPPER="" # "0" "0" means random salt pepper
                    #~ echo "VISA.new : \"$SALT\" \"$PEPPER\" \"${EMAIL}\" \"$PSEUDO\" \"${WHAT}\"" > ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
-                    ${MY_PATH}/../tools/VISA.new.sh "$SALT" "$PEPPER" "${EMAIL}" "$PSEUDO" "${WHAT}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
+                    ${MY_PATH}/../RUNTIME/VISA.new.sh "$SALT" "$PEPPER" "${EMAIL}" "$PSEUDO" "${WHAT}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt

                    ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL

--- a/API/UPLANET.sh
+++ b/API/UPLANET.sh
@ -222,7 +222,7 @@ if [[ ! -f ~/.zen/tmp/${MOATS}/TW/${EMAIL}/index.html ]]; then
        ## CREATE ASTRONAUTE TW ON CURRENT ASTROPORT
        (
                            ##### (☉_☉ ) #######
-        ${MY_PATH}/../tools/VISA.new.sh "${EMAIL}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
+        ${MY_PATH}/../RUNTIME/VISA.new.sh "${EMAIL}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
        ${MY_PATH}/../tools/mailjet.sh "${EMAIL}" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt ## Send VISA.new log to EMAIL
        ) &

--- a/BOOTSTRAP/Readme.md
+++ b/BOOTSTRAP/Readme.md
@ -46,16 +46,16 @@ For exemple, if you want to know from where VISA.new.sh is called run
 ------------------------------------------------------------------------------
  Searching for VISA.new.sh recursively. Please Wait...
 ------------------------------------------------------------------------------
-./command.sh:            ${MY_PATH}/tools/VISA.new.sh
-./command.sh:            ${MY_PATH}/tools/VISA.new.sh "$SALT" "$PEPPER" "$EMAIL"
+./command.sh:            ${MY_PATH}/RUNTIME/VISA.new.sh
+./command.sh:            ${MY_PATH}/RUNTIME/VISA.new.sh "$SALT" "$PEPPER" "$EMAIL"
 ./API/SALT.sh:                    echo "# ASTRONAUT NEW VISA Create VISA.new.sh in background (~/.zen/tmp/email.${EMAIL}.${MOATS}.txt)"
-./API/SALT.sh:                    ${MY_PATH}/../tools/VISA.new.sh "$SALT" "$PEPPER" "${EMAIL}" "$PSEUDO" "${WHAT}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
-./TODO.list:./tools/VISA.new.sh:######### TODO Ajouter d'autres clefs IPNS, GPG ?
-./TODO.list:./tools/VISA.new.sh:WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance
-./TODO.list:./tools/VISA.new.sh:    ############ TODO améliorer templates, sed, ajouter index.html, etc...
-./TODO.list:./tools/VISA.new.sh:         ## TODO : FOR STRONGER SECURITY REMOVE THIS LINE
-./TODO.list:./tools/VISA.new.sh:# !! TODO !! # DEMO MODE. REMOVE FOR PRODUCTION - RECALCULATE AND RENEW AFTER EACH NEW KEY DELEGATION
-./TODO.list:./tools/VISA.new.sh:# TODO : Allow Astronaut PASS change ;)
+./API/SALT.sh:                    ${MY_PATH}/../RUNTIME/VISA.new.sh "$SALT" "$PEPPER" "${EMAIL}" "$PSEUDO" "${WHAT}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
+./TODO.list:./RUNTIME/VISA.new.sh:######### TODO Ajouter d'autres clefs IPNS, GPG ?
+./TODO.list:./RUNTIME/VISA.new.sh:WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance
+./TODO.list:./RUNTIME/VISA.new.sh:    ############ TODO améliorer templates, sed, ajouter index.html, etc...
+./TODO.list:./RUNTIME/VISA.new.sh:         ## TODO : FOR STRONGER SECURITY REMOVE THIS LINE
+./TODO.list:./RUNTIME/VISA.new.sh:# !! TODO !! # DEMO MODE. REMOVE FOR PRODUCTION - RECALCULATE AND RENEW AFTER EACH NEW KEY DELEGATION
+./TODO.list:./RUNTIME/VISA.new.sh:# TODO : Allow Astronaut PASS change ;)
 ------------------------------------------------------------------------------
 ```

--- a/RUNTIME/VISA.new.sh
+++ b/RUNTIME/VISA.new.sh
@ -81,10 +81,10 @@ if [[ $SALT != "" && PEPPER != "" ]]; then
        tiddlywiki --load ~/.zen/tmp/${MOATS}/TW/index.html --output ~/.zen/tmp/${MOATS} --render '.' 'AstroID.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'AstroID'
        AstroID=$(cat ~/.zen/tmp/${MOATS}/AstroID.json | jq -r .[]._canonical_uri)
        HPass=$(cat ~/.zen/tmp/${MOATS}/AstroID.json | jq -r .[].HPASS)
-        echo "AstroID=$AstroID ($HPass)"
+        #~ echo "AstroID=$AstroID ($HPass)"
        tiddlywiki --load ~/.zen/tmp/${MOATS}/TW/index.html --output ~/.zen/tmp/${MOATS} --render '.' 'G1Visa.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'G1Visa'
        G1Visa=$(cat ~/.zen/tmp/${MOATS}/G1Visa.json | jq -r .[]._canonical_uri)
-        echo "G1Visa=$G1Visa"
+        #~ echo "G1Visa=$G1Visa"

        if [[ ${ASTROPORT} != "" && ${ASTROPORT} != "null" ]]; then

@ -111,21 +111,21 @@ TWMODEL="/ipfs/bafybeiaaf52awrqliwn5mqleua6tcv4qv5oxjfa6j2web6nh42vzdtjkiu"
 # ipfs cat $TWMODEL > templates/twdefault.html
 ##################################################### # NEW PLAYER ###############
 ################################################################################
-echo "=============================================
-ASTROPORT DIPLOMATIC PASSPORT - MadeInZion VISA -
-=============================================
-A Cryptographic Key to control your INTERNET
-Adventure & Exploration P2P Terraforming Game.
-=============================================
-WELCOME 'Astronaute'"; # sleep 1
+#~ echo "=============================================
+#~ ASTROPORT DIPLOMATIC PASSPORT - MadeInZion VISA -
+#~ =============================================
+#~ A Cryptographic Key to control your INTERNET
+#~ Adventure & Exploration P2P Terraforming Game.
+#~ =============================================
+#~ WELCOME 'Astronaute'"; # sleep 1

 #~ echo "Inscription..."

 [[ $SALT == "" ]] && SALT=$(${MY_PATH}/diceware.sh 4 | xargs)
-echo "-> ID : $SALT"
+#~ echo "-> ID : $SALT"

 [[ $PEPPER == "" ]] && PEPPER=$(${MY_PATH}/diceware.sh 2 | xargs)
-echo "-> PASS : $PEPPER"
+#~ echo "-> PASS : $PEPPER"

 PSEUDO=${PLAYER%%[0-9]*}

@ -349,13 +349,13 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
    #~ echo ${ENCODING}
    echo '[{"title":"$:/plugins/astroport/lightbeams/saver/g1/lightbeam-natools-feed","text":"'${ENCODING}'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-natools.json

-    echo
-    echo "IPFS GATEWAY : ${NID}"
-    #~ # cat ~/.zen/tmp/${MOATS}/local.gw.json | jq -r
-    echo "IPFS API : ${WID}"
-    #~ # cat ~/.zen/tmp/${MOATS}/local.api.json | jq -r
-    echo ">>> RSS FEED : ${myIPFS}/ipns/${FEEDNS}"
-    ## CHANGE SELECTED GW & API
+    #~ echo
+    #~ echo "IPFS GATEWAY : ${NID}"
+    # cat ~/.zen/tmp/${MOATS}/local.gw.json | jq -r
+    #~ echo "IPFS API : ${WID}"
+    # cat ~/.zen/tmp/${MOATS}/local.api.json | jq -r
+    #~ echo ">>> RSS FEED : ${myIPFS}/ipns/${FEEDNS}"
+    #~ ## CHANGE SELECTED GW & API

        ## ADD SYSTEM TW
        tiddlywiki  --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \
@ -436,7 +436,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
        sed -i "s~${G1Visa}~${IASTRO}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html

    echo
-    echo "♥ IPFS Ŋ1 DRIVE INIT ♥"
+    echo "♥ IPFS Ŋ1 TW INIT ♥"
    echo "TW ${NID}/ipns/${ASTRONAUTENS}/"
    IPUSH=$(ipfs add -Hq ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html | tail -n 1)
    echo $IPUSH > ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain # Contains last IPFS backup PLAYER KEY
@ -460,7 +460,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"

 #~ echo; echo "Création Clefs et QR codes pour accès au niveau Astroport Ŋ1"; sleep 1

-echo "--- PLAYER : ${PLAYER} - FILE SYSTEM LOADED";
+echo "--- PLAYER : ${PLAYER} - DATA PROTOCOL LAYER LOADED";
 # ls ~/.zen/game/players/${PLAYER}

 [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open "${myIPFS}/ipns/${ASTRONAUTENS}" && espeak "YOUR PASS IS $PASS"
@ -503,26 +503,26 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
 echo "$(${MY_PATH}/face.sh cool)"
 echo " 'Astronaute'  $PSEUDO"
 echo
-echo "* Public G1Visa"
-echo "   ${NID}/ipns/${ASTRONAUTENS}#G1Visa"
-echo "* Personal AstroID ($PASS)"
-echo "   ${NID}/ipns/${ASTRONAUTENS}#AstroID"
-echo "* GPS : ${NID}/ipns/${ASTRONAUTENS}#GPS"
-echo "* U Map : ${myIPFS}${URL}"
+echo "* Public Wallet <a href=${NID}/ipns/${ASTRONAUTENS}#G1Visa>G1Visa</a>"
+echo "   "
+echo "*  G1Card with PASS: <b>$PASS</b>"
+echo "   <a href=${NID}/ipns/${ASTRONAUTENS}#AstroID>AstroID</a>"
+echo
+echo "* <a href=${myIPFS}${URL}> U Map _$LAT_$LON</a>"
 echo
 echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
-echo "BIENVENUE"
-echo "https://monnaie-libre.fr (ğ1) : $G1PUB"; # sleep 1
-echo "
-Vos Secrets :
-    $SALT
-    $PEPPER
+#~ echo "BIENVENUE"
+#~ echo "https://monnaie-libre.fr (ğ1) : $G1PUB"; # sleep 1
+#~ echo "
+#~ Vos Secrets :
+    #~ $SALT
+    #~ $PEPPER

-* WALLET : https://cesium.app
-* MARKET : https://gchange.fr
+#~ * WALLET : https://cesium.app
+#~ * MARKET : https://gchange.fr

-U Planet : ${myUPLANET}
-Astroport.ONE ★ PKI ★ Ğ1/Ŋ1 ★ DAO ★ Libre ★"; # sleep 1
+#~ U Planet : ${myUPLANET}
+#~ Astroport.ONE ★ PKI ★ Ğ1/Ŋ1 ★ DAO ★ Libre ★"; # sleep 1

 echo
 echo "$(${MY_PATH}/face.sh friendly)"
--- a/TODO.list
+++ b/TODO.list
@ -29,12 +29,12 @@ MADE BY
 ./tools/create_ipfsnodeid_from_tmp_secret.dunikey.py:# TODO controls
 ./tools/cron_VRFY.sh:## TODO check for Station geoposition in ~/.zen/GPS and calibrate 20H12
 ./tools/cron_VRFY.sh:cat ~/.zen/GPS 2>/dev/null && echo " TODO calibrate 20H12 with GPS"
-./tools/VISA.new.sh:######### TODO Ajouter d'autres clefs IPNS, GPG ?
-./tools/VISA.new.sh:WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance
-./tools/VISA.new.sh:    ############ TODO améliorer templates, sed, ajouter index.html, etc...
-./tools/VISA.new.sh:         ## TODO : FOR STRONGER SECURITY REMOVE THIS LINE
-./tools/VISA.new.sh:# !! TODO !! # DEMO MODE. REMOVE FOR PRODUCTION - RECALCULATE AND RENEW AFTER EACH NEW KEY DELEGATION
-./tools/VISA.new.sh:# TODO : Allow Astronaut PASS change ;)
+./RUNTIME/VISA.new.sh:######### TODO Ajouter d'autres clefs IPNS, GPG ?
+./RUNTIME/VISA.new.sh:WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance
+./RUNTIME/VISA.new.sh:    ############ TODO améliorer templates, sed, ajouter index.html, etc...
+./RUNTIME/VISA.new.sh:         ## TODO : FOR STRONGER SECURITY REMOVE THIS LINE
+./RUNTIME/VISA.new.sh:# !! TODO !! # DEMO MODE. REMOVE FOR PRODUCTION - RECALCULATE AND RENEW AFTER EACH NEW KEY DELEGATION
+./RUNTIME/VISA.new.sh:# TODO : Allow Astronaut PASS change ;)
 ./tools/search_for_this_email_in_players.sh:### TODO MAKE IT WORKS BETTER
 ./tools/search_for_this_email_in_players.sh:    ## TODO ? SEARCH WITH DNSLINK
 ./tools/new_file_in_astroport.sh:        ## Create gifanime ##  TODO Search for similarities BEFORE ADD
--- a/command.sh
+++ b/command.sh
@ -62,7 +62,7 @@ echo 'PRESS ENTER... '; read
            exit
            ;;
        "CREATE PLAYER")
-            ${MY_PATH}/tools/VISA.new.sh
+            ${MY_PATH}/RUNTIME/VISA.new.sh
            fav=$(cat ~/.zen/tmp/PSEUDO 2>/dev/null) && rm ~/.zen/tmp/PSEUDO
            echo "Astronaute $fav bienvenue dans le jeu de terraformation forêt jardin MadeInZion"
            exit
@ -74,7 +74,7 @@ echo 'PRESS ENTER... '; read
            read PEPPER
            echo "'Adresse Email'"
            read EMAIL
-            ${MY_PATH}/tools/VISA.new.sh "$SALT" "$PEPPER" "$EMAIL"
+            ${MY_PATH}/RUNTIME/VISA.new.sh "$SALT" "$PEPPER" "$EMAIL"
            fav=$(cat ~/.zen/tmp/PSEUDO 2>/dev/null) && rm ~/.zen/tmp/PSEUDO
            echo "Astronaute $fav heureux de vous acceuillir"
            exit