diff --git a/zen/ipns_TAG_refresh.sh b/zen/ipns_TAG_refresh.sh index 93e6654..003a6e7 100755 --- a/zen/ipns_TAG_refresh.sh +++ b/zen/ipns_TAG_refresh.sh @@ -23,8 +23,8 @@ ME="${0##*/}" IPFSNODEID=$(ipfs id -f='\n') [[ $IPFSNODEID == "" ]] && echo "ERROR missing IPFS Node id !! IPFS is not installed !?" && exit 1 ######################################################################## -[[ ! -f ~/.ssb/secret.dunikey ]] && $MY_PATH/tools/secret2dunikey.sh -G1PUB=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) +[[ ! -f ~/.zen/secret.dunikey ]] && exit 1 +G1PUB=$(cat ~/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) ######################################################################## echo ' @@ -34,31 +34,44 @@ echo ' ( I | P | N | S ) \_/ \_/ \_/ \_/ -ZENTAG REFRESH +ZENTAG KEY REFRESH ' -echo "I am /ipns/$IPFSNODEID controling and refreshing my ZenTag" +echo "I am /ipns/$IPFSNODEID controling and refreshing my KEY ZenTag" count=0 -[[ ! -d ~/.zen/tag/ ]] && exit 1 +[[ ! -d ~/.zen/KEY/ ]] && exit 1 -for id in ~/.zen/tag/*; # Alternative search +for id in $(ls ~/.zen/KEY/); # Alternative search do - count=$((count+1)) - ipnskey=$(cat $id/_tag.uid) - zenvalue=$(cat $id/_tag.zen) - passengername=$(cat $id/_passenger.filename) + count=$((count+1)) + IPNSLINK=$(ipfs key list -l | grep ${id} | cut -d ' ' -f 1) - echo "ZenTag $count : $ipnskey ($zenvalue Zen) $passengername" - # TODO: Add control to alert ZenTags strange behaviour +### IPNS LINK CAN EVOLVE (REFRESH EVERY 12 H) +echo " +

Rejoignez ASTROPORT


Installez astrXbian..." > ~/.zen/KEY/${id}/index.html + + [[ -f ~/.zen/KEY/${id}/${G1PUB}/.ipfs.filelink.natools.encrypt ]] && $MY_PATH/tools/natools.py decrypt -f pubsec -k "~/.zen/secret.dunikey" -i "~/.zen/KEY/${id}/${G1PUB}/.ipfs.filelink.natools.encrypt" -o "/tmp/filelink.txt" && cat /tmp/filelink.txt && rm /tmp/filelink.txt + I=$(ipfs add -qrH ~/.zen/KEY/${id}/ | tail -n 1) - # TODO :SECURITY BREACH: DO NOT PUBLISH _QRCODE.write.png !!! - - I=$(ipfs add -qr ${id} | tail -n 1) - # ZenTag IPNS name publish - Tkey=$(ipfs key list | grep -F ${ipnskey}.key) - J=$(ipfs name publish -k ${Tkey} --quieter /ipfs/${I}) + OLDCHAIN=$(cat ~/.zen/KEY/.chain) + if [[ "$OLDCHAIN" != "$I" ]] # MODIFY CHAIN only if something was changed + then + echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/KEY/.timestamp + echo $MIPFS > ~/.zen/KEY/.chain + fi - echo "http://127.0.0.1/ipns/$J" + # KEY ZenTag IPNS name publish + J=$(ipfs name publish -k ${id} --quieter /ipfs/${I}) + + echo "$count $id REFRESHED https://aries.copylaradio.com/ipns/$J" done +# echo "Ajouter une ML en relatif DU : +# DU(t+1)=(DU+c²)/r +# S(t+1)=(S+DU)/r +# M(t+1)=N (et oui, si vous regardez les formules, on n’a pas besoin de M :slight_smile: On a donc pas besoin de stocker M !) +# r=(1+DU)*N/N(t+1) (diviser par r, c’est multiplier par [N(t+1)/N]/(1+DU), qui prend en compte la variation de N) + +# https://forum.monnaie-libre.fr/t/etude-commencer-a-la-moyenne/15231/34?u=qoop +# " diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index 6b8e4a3..3bca8b3 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -84,15 +84,14 @@ if [[ $KEY ]]; then echo "${file}" > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipfs.filename # TRANSFERT from ajouter_video.sh "ajouter_video.txt" later used line 118 [[ -f ~/astroport/${CAT}/${TMDB}/ajouter_video.txt ]] && mv ~/astroport/${CAT}/${TMDB}/ajouter_video.txt ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/ -# echo "" > ~/.zen/ipfs/KEY/${INDEXPREFIX}${REFERENCE}/ipns.html -# TRY NATOOLS FOR SECURE SHARING # $MY_PATH/jaklis/lib/natools.py encrypt -k $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/ipfs/.${IPFSNODEID}/KEY/${INDEXPREFIX}${REFERENCE}/.ipns.key.encrypt.natools - $MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/.ipns.key.natools.encrypt - $MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipfs.filelink -o ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/.ipfs.filelink.natools.encrypt +################ ENCRYPT SENSIBLE DATA + $MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.ipfs/keystore/$KEYFILE -o ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipns.key.natools.encrypt + $MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipfs.filelink -o ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipfs.filelink.natools.encrypt rm ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.ipfs.filelink fi # IPNS index.html Redirect to ipfs streaming link (could be contract or anything !!) echo "" > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/index.html -echo " +echo "

Essayez ASTROPORT/KODI

" > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/index.html NEWIPFS=$(ipfs add -rHq ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/ | tail -n 1 ) IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS) @@ -101,7 +100,7 @@ IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS) ######################################################################## # PUBLISH GCHANGE AD ######################################################################## -GOFFER=$(~/.zen/astrXbian/zen/jaklis/jaklis.py setoffer -t "#kodi / ${file}" -d "http://$IPNS.ipns.localhost:8181/ ($G1PUB)" -p ~/.zen/astrXbian/disk.png) +GOFFER=$(~/.zen/astrXbian/zen/jaklis/jaklis.py setoffer -t "#kodi / ${file}" -d "https://aries.copylaradio.com/ipns/$IPNSLINK/" -p ~/.zen/astrXbian/disk.png) echo $GOFFER > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad NEWIPFS=$(ipfs add -rHq ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/ | tail -n 1 ) IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS)