From 73d89a42a5bbadd5c2a16b06b7ed244d05e14169 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 4 Apr 2023 15:43:32 +0200 Subject: [PATCH] Astroport.ONE is reaching self mapping ability + many fun hacking points - App - Security - Stargates - --- 12345.sh | 2 +- API/QRCODE.sh | 4 ++-- README.md | 4 ++-- templates/twdefault.html | 2 +- tools/VISA.new.sh | 6 +++++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/12345.sh b/12345.sh index 2f9b6f00..10ab9009 100755 --- a/12345.sh +++ b/12345.sh @@ -73,7 +73,7 @@ while true; do ## CHECK PORT IS FREE & KILL OLD ONE pidportinuse=$(ps axf --sort=+utime | grep -w "nc -l -p ${PORT}" | grep -v -E 'color=auto|grep' | awk '{gsub(/^ +| +$/,"")} {print $0}' | tail -n 1 | cut -d " " -f 1) - [[ $pidportinuse ]] && kill -9 $pidportinuse && echo "KILLING LOST $pidportinuse" + [[ $pidportinuse ]] && kill -9 $pidportinuse && echo "$(date) KILLING LOST $pidportinuse" ## CHECK 12345 PORT RUNNING (STATION FoF MAP) maprunning=$(ps auxf --sort=+utime | grep -w '_12345.sh' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) diff --git a/API/QRCODE.sh b/API/QRCODE.sh index 41be6d5e..41d4ca4b 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -174,10 +174,10 @@ if [[ ${QRCODE:0:2} == "G1" && ${AND} == "tw" ]]; then if [[ "${APPNAME}" == "json" ]]; then ############################################## - echo "DIRECT JSON OUTPUT" + echo "DIRECT Tag = ${QRCODE:2} OUTPUT" ## DIRECT JSON OUTPUT tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${MOATS} \ - --render '.' "g1voeu.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag['${QRCODE}']]' + --render '.' "g1voeu.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag['${QRCODE:2}']]' echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}/index.redirect sed -i "s~text/html~application/json~g" ~/.zen/tmp/${MOATS}/index.redirect diff --git a/README.md b/README.md index 73196e59..5ec27787 100644 --- a/README.md +++ b/README.md @@ -286,8 +286,8 @@ http://astroport.localhost:1234/?qrcode=G1Serie&tw=k51qzi5uqu5dgobi9ozzzvdftqfd3 redirect to http://ipfs.localhost:8080/ipns/k51qzi5uqu5din47zmnzk6tmk1tjqaeaj9pbb3qilmstbsf9uyc12qpdmigtd3/ -http://astroport.localhost:1234/?qrcode=G1Serie&tw=k51qzi5uqu5dgobi9ozzzvdftqfd3hd7a1488nzymky1edz8j779jov7sbemc0&json -redirect to pure json +http://astroport.localhost:1234/?qrcode=G1G1Serie&tw=k51qzi5uqu5dgobi9ozzzvdftqfd3hd7a1488nzymky1edz8j779jov7sbemc0&json +redirect to pure "tag=" result json If is G1PUB ? G1BILLET adventure with GCHANGE and CESIUM diff --git a/templates/twdefault.html b/templates/twdefault.html index 37d77b4d..65f8199a 100644 --- a/templates/twdefault.html +++ b/templates/twdefault.html @@ -575,7 +575,7 @@ Error message and password prompt {"created":"20220424042238781","title":"$:/UserPanelTitle","modified":"20220504003019519","type":"text/vnd.tiddlywiki","text":"Astroport.ONE","revision":"0","bag":"default"}, {"title":"$:/view","created":"20220403091112476","modified":"20220428183149011","type":"text/vnd.tiddlywiki","text":"multi-column","revision":"0","bag":"default"}, {"created":"20221028140644690","text":"Il s'agit du code situé dans le répertoire ASTROBOT de la distribution Astroport.ONE que vous utilisez.\n\nCelui-ci contient les script de traitement de réplication Ŋ1 de vos G1Voeux.\n\nhttps://git.p2p.legal/qo-op/Astroport.ONE/src/branch/master/ASTROBOT\n","title":"AstroBot","modified":"20221028150232387","tags":"$:/isAttachment $:/isEmbedded"}, -{"created":"20230227185225098","creator":"_PSEUDO_","text":"","title":"AstroID","type":"image/png","modified":"20230325214405391","modifier":"_PSEUDO_","tags":"$:/isAttachment _PLAYER_ $:/isIpfs G1AstroID","_canonical_uri":"/ipfs/bafybeifbebc3ewnzrzbm44arddedbralegnxklhua5d5ymzaqtf2kaub7i","PASS":"_PASS_"}, +{"created":"20230227185225098","creator":"_PSEUDO_","text":"","title":"AstroID","type":"image/png","modified":"20230404134014047","modifier":"_PSEUDO_","tags":"$:/isAttachment _PLAYER_ $:/isIpfs G1AstroID","_canonical_uri":"/ipfs/bafybeifbebc3ewnzrzbm44arddedbralegnxklhua5d5ymzaqtf2kaub7i","PASS":"_PASS_","HPASS":"_HPASS_"}, {"created":"20210804081616558","creator":"_PSEUDO_","text":"!! Participez au développement d'un meilleur Internet !\n\n!! Applications collaboratives pour collectifs en réseau\n\nDans le réseau p2p propulsé par [[Astroport|https://astroport.com]], vous échangez des biens, des services, selon la confiance exprimée par un échange d'étoiles sur [[GChange|https://gchange.fr]].\n\nTissez vos toiles Ŋ1 dans un réseau humain de confiance qui utilise [[Ğ1 (la \"June\")|https://monnaie-libre.fr/]] \n\nA 20H12 ''le protocole de réplication Ŋ1'' active les échanges en fonction des toiles de confiances établies : étoiles Gchange, Transactions G1, etc\n\n!! Comment aider ?\n\nPropagez l'expérience du monde numérique Libre. Révélez. Tissez vos toiles de confiance Ŋ1.\nReliez vos clefs aux nôtres, faites vos voeux. Nos voeux les plus chers, révèlent et gratifient les talents et les ressources près de chez vous.\n\nHébergez votre [[♥BOX|https://opencollective.com/monnaie-libre/projects/coeurbox]]\n\ninstallez IPFS\n\u003C\u003C\u003C\n\n* Installez '[[IPFS kubo|https://docs.ipfs.tech/install/command-line/#official-distributions]]' sur votre ordinateur\n* Ajoutez [[ipfs-companion|https://docs.ipfs.tech/install/ipfs-companion/]] à votre navigateur (ou utilisez \"[[Brave|https://brave.com/fr/]]\")\n\n''Agissez collectif ''\n\n* [[Devenez généreux donateur|https://opencollective.com/monnaie-libre]] aidez à notre développement.\n* [[Rejoignez notre Constellation de ♥BOX|https://opencollective.com/monnaie-libre/projects/coeurbox]] et faite grossir les \"To Utiles\" de notre disque et hébergement collectif.\n* Activez votre Station. Installez [[Astroport.ONE|https://git.p2p.legal/qo-op/Astroport.ONE]] sur votre ordinateur, hébergez vos amis en laissant votre machine allumée.\n\n\n* [[Améliorer, diversifier les modèles de TiddlyWiki|https://tiddlywiki.com/languages/fr-FR/index.html]]\n* [[Enrichissez notre application avec des plugins TW|https://tw-cpl.netlify.app/#Index:Index]] \n\n\u003C\u003C\u003C\n\nTW MODEL REBASE : {{{ [[https://ipfs.copylaradio.com/ipfs/]addsuffix{!!twmodel}] }}}\n\n''{{Astroport!!pseudo}}'' (Astronaute : ''{{MadeInZion!!player}}'')\n\n> NE SUPPRIMEZ PAS CE \"TIDDLER\"\n","title":"Astroport","modified":"20230302203956490","tags":"","g1pub":"_G1PUB_","qrsec":"_QRSEC_","astroport":"_ASTROPORT_","birthdate":"_BIRTHDATE_","pseudo":"_PSEUDO_","modifier":"_PSEUDO_","chain":"_CHAIN_","moats":"_MOATS_","twmodel":"_TWMODEL_"}, {"created":"20230302231451591","creator":"_PSEUDO_","text":"\u003Ciframe src=\"https://carte.monnaie-libre.fr\" height=\"480\" width=\"100%\">\u003C/iframe>","tags":"_PLAYER_ G1App poka@p2p.legal","title":"Carte de la Monnaie Libre : Ğ1","modified":"20230302232007403","type":"text/vnd.tiddlywiki","modifier":"_PSEUDO_"}, {"created":"20230325190916105","creator":"_PSEUDO_","text":"","tags":"_PLAYER_ voeu","title":"CopierYoutube","modified":"20230325191253057","modifier":"_PSEUDO_"}, diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index f7bad862..bf46ab55 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -94,7 +94,7 @@ fi ################################################################################ -TWMODEL="/ipfs/bafybeifd6ktudt4fvalr7jjbyt2ezv3jgaoqe6ik6wey4auty3tgo3q2za" +TWMODEL="/ipfs/bafybeictoh7wq6be4xcbjyuizq2q6elpevbhykpf4ogo6k3itbm23ojlvi" TWLINK="/ipfs/bafybeigyfttjvabeeoa4hbsvtegsqkw3riuquhbil55qhwe3s3q4tesyxi" # ipfs cat $TWMODEL > templates/twdefault.html ##################################################### # NEW PLAYER ############### @@ -240,7 +240,11 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" ## Fill PleaseDELETE sed -i "s~_SALT_~${SALT}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html sed -i "s~_PEPPER_~${PEPPER}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html + ## TODO : FOR STRONGER SECURITY REMOVE THIS LINE sed -i "s~_PASS_~${PASS}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html + ## AND HACK QRCODE.sh FOR _PGP KEY_ TO VERIFY LAST HASH OF PROVIDED PASS + HPASS=$(echo $PASS | sha512sum | cut -d ' ' -f 1) + sed -i "s~_HPASS_~${HPASS}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html ## RESET WISHES TO DEPLOY DERIVATED KEYS ON HOST AGAIN sed -i "s~G1Voeu~voeu~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html