forked from axiom-team/astrXbian
cat ~/.zen/A_peering_peers.txt
This commit is contained in:
parent
e3d1085191
commit
57f1ba826a
|
@ -22,7 +22,7 @@ IPFSNODEID=$(ipfs --timeout=20s id -f='<id>\n')
|
||||||
## CREATES index.html to web publish
|
## CREATES index.html to web publish
|
||||||
########################################################################
|
########################################################################
|
||||||
########################################################################
|
########################################################################
|
||||||
mkdir -p ~/.zen/ipfs_swarm
|
[ ! -d ~/.zen/ipfs_swarm ] && mkdir -p ~/.zen/ipfs_swarm
|
||||||
echo '
|
echo '
|
||||||
___ _ _ __ __ _ _ _ _ _ _ __
|
___ _ _ __ __ _ _ _ _ _ _ __
|
||||||
| |_)|_(_ (_\ //\ |_)|\/| |_)|_|_|_)|_(_ |_|
|
| |_)|_(_ (_\ //\ |_)|\/| |_)|_|_|_)|_(_ |_|
|
||||||
|
@ -56,7 +56,7 @@ ipfs bootstrap > /tmp/ipfs_swarm_peers
|
||||||
ipfs swarm peers >> /tmp/ipfs_swarm_peers
|
ipfs swarm peers >> /tmp/ipfs_swarm_peers
|
||||||
|
|
||||||
rm ~/.zen/A_peering_peers.txt
|
rm ~/.zen/A_peering_peers.txt
|
||||||
[[ -f ~/.ipfs/config.bak ]] && cp ~/.ipfs/config.bak ~/.ipfs/config
|
# [[ -f ~/.ipfs/config.bak ]] && cp ~/.ipfs/config.bak ~/.ipfs/config
|
||||||
cp ~/.ipfs/config ~/.ipfs/config.new
|
cp ~/.ipfs/config ~/.ipfs/config.new
|
||||||
|
|
||||||
# for ipfsnodeid in $( (cat /tmp/ipfs_swarm_peers | grep -o '[^/]*$' && cat /tmp/A_swarm | grep -o '[^/]*$' ) | sort | uniq); ## TODO ACTIVATE IN DEFCON 4
|
# for ipfsnodeid in $( (cat /tmp/ipfs_swarm_peers | grep -o '[^/]*$' && cat /tmp/A_swarm | grep -o '[^/]*$' ) | sort | uniq); ## TODO ACTIVATE IN DEFCON 4
|
||||||
|
@ -65,16 +65,16 @@ do
|
||||||
## $ipfsnodeid already Treated ?
|
## $ipfsnodeid already Treated ?
|
||||||
[[ "$ipfsnodeid" == "$IPFSNODEID" ]] && continue
|
[[ "$ipfsnodeid" == "$IPFSNODEID" ]] && continue
|
||||||
[[ -f ~/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid ]] && XID=$(cat ~/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid) || XID=''
|
[[ -f ~/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid ]] && XID=$(cat ~/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid) || XID=''
|
||||||
[[ -f ~/.zen/ipfs_swarm/.$ipfsnodeid/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs_swarm/.$ipfsnodeid/G1SSB/_g1.gchange_title) || XZUID=''
|
[[ -f ~/.zen/ipfs_swarm/.$ipfsnodeid/G1SSB/_g1.gchange_title ]] && GZUID=$(cat ~/.zen/ipfs_swarm/.$ipfsnodeid/G1SSB/_g1.gchange_title) || GZUID=''
|
||||||
[[ "$XID" == "" ]] && ipfs swarm disconnect /ipfs/$ipfsnodeid ## NOT COMPLIANT FRIEND STATION
|
[[ "$XID" == "" ]] && ipfs swarm disconnect /ipfs/$ipfsnodeid ## NOT COMPLIANT FRIEND STATION
|
||||||
# [[ $(cat /tmp/treated.ipfs.swarm | grep "$ipfsnodeid") ]] && continue ## TODO ACTIVATE IN DEFCON 4
|
# [[ $(cat /tmp/treated.ipfs.swarm | grep "$ipfsnodeid") ]] && continue ## TODO ACTIVATE IN DEFCON 4
|
||||||
# [[ $(cat ~/.zen/A_dead_swarm.txt | grep "$ipfsnodeid") ]] && echo "DEAD SWARM" && continue ## TODO ACTIVATE IN DEFCON 4
|
# [[ $(cat ~/.zen/A_dead_swarm.txt | grep "$ipfsnodeid") ]] && echo "DEAD SWARM" && continue ## TODO ACTIVATE IN DEFCON 4
|
||||||
|
|
||||||
|
|
||||||
# control ip isLAN?
|
# control ip isLAN?
|
||||||
peerline=$(cat ~/.zen/A_swarm_map.txt | grep "$ipfsnodeid" | grep '/quic/' | tail -n 1) ## Prefer quic protocol addresses
|
peerline=$(cat ~/.zen/A_swarm_map.txt | grep "$ipfsnodeid" | grep '/quic/' | head -n 1) ## Prefer quic protocol addresses
|
||||||
[[ ! $peerline ]] && peerline=$(cat /tmp/ipfs_swarm_peers | grep "$ipfsnodeid" | tail -n 1)
|
[[ ! $peerline ]] && peerline=$(cat /tmp/ipfs_swarm_peers | grep "$ipfsnodeid" | tail -n 1)
|
||||||
ip=$(cat /tmp/ipfs_swarm_peers | grep "$ipfsnodeid" | awk -F '/' '{print $3}' | tail -n 1) && [[ ! $ip ]] && continue
|
ip=$(cat /tmp/ipfs_swarm_peers | grep "$ipfsnodeid" | grep '/quic/' | head -n 1 | awk -F '/' '{print $3}') && [[ ! $ip ]] && continue
|
||||||
isLAN=$(echo $ip | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
|
isLAN=$(echo $ip | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
|
||||||
|
|
||||||
nowdate=$(date)
|
nowdate=$(date)
|
||||||
|
@ -83,7 +83,7 @@ do
|
||||||
[[ "${ipfsnodeid:0:2}" != "Qm" ]] && whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid) || echo "$ipfsnodeid" >> ~/.zen/A_dead_swarm.txt
|
[[ "${ipfsnodeid:0:2}" != "Qm" ]] && whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid) || echo "$ipfsnodeid" >> ~/.zen/A_dead_swarm.txt
|
||||||
|
|
||||||
echo "#############################################################"
|
echo "#############################################################"
|
||||||
echo "### ANALYZING $ipfsnodeid ($ip) $XID $XZUID ###"
|
echo "### ANALYZING $ipfsnodeid ($ip) $XID $GZUID ###"
|
||||||
echo "$peerline"
|
echo "$peerline"
|
||||||
myfriendpeer=$(cat ~/.zen/A_my_swarm.txt | grep $ipfsnodeid )
|
myfriendpeer=$(cat ~/.zen/A_my_swarm.txt | grep $ipfsnodeid )
|
||||||
if [[ "$myfriendpeer" != "" ]];
|
if [[ "$myfriendpeer" != "" ]];
|
||||||
|
@ -101,8 +101,8 @@ do
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
grep -vEi $ip ~/.zen/A_my_swarm.txt
|
grep -vEi $ip ~/.zen/A_my_swarm.txt
|
||||||
echo $ipfsnodeid >> ~/.zen/A_dead_swarm.txt
|
echo $ipfsnodeid >> ~/.zen/A_dead_swarm.txt
|
||||||
echo "SEND MESSAGE ABOUT UNREACHABLE FRIEND $whoisg1 ($XID) ($XZUID)"
|
echo "SEND MESSAGE ABOUT UNREACHABLE FRIEND $whoisg1 ($XID) ($GZUID)"
|
||||||
~/.zen/astrXbian/zen/tools/timeout.sh -t 12 ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d $G1PUB -t "ALERT" -m "Impossible de se synchroniser avec $whoisg1 ($XID) ($XZUID)"
|
~/.zen/astrXbian/zen/tools/timeout.sh -t 12 ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" send -d $G1PUB -t "ALERT" -m "Impossible de se synchroniser avec $whoisg1 ($XID) ($GZUID)"
|
||||||
# KEEPING LAST 10 ALERT MESSAGES
|
# KEEPING LAST 10 ALERT MESSAGES
|
||||||
nbmessage=0
|
nbmessage=0
|
||||||
for messageid in $(~/.zen/astrXbian/zen/tools/timeout.sh -t 12 ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" read -n300 -j | jq -r --arg friendKEY "$G1PUB" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ALERT")' | jq -r '.id')
|
for messageid in $(~/.zen/astrXbian/zen/tools/timeout.sh -t 12 ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" read -n300 -j | jq -r --arg friendKEY "$G1PUB" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ALERT")' | jq -r '.id')
|
||||||
|
@ -114,6 +114,15 @@ do
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
################################################################
|
################################################################
|
||||||
|
echo "## CREATING Peering.Peer entries"
|
||||||
|
################################################################
|
||||||
|
Addr=$(echo "$peerline" | rev | cut -d '/' -f 2- | rev )
|
||||||
|
IsAlreadythere=$(cat ~/.ipfs/config.new | grep $ipfsnodeid)
|
||||||
|
if [[ ! $IsAlreadythere ]]; then
|
||||||
|
echo '{ "ID": "'$ipfsnodeid'", "Addrs": [] }' >> ~/.zen/A_peering_peers.txt
|
||||||
|
jq '.Peering.Peers? += { "Addrs": [], "ID": "'$ipfsnodeid'" }' ~/.ipfs/config.new > ~/.ipfs/config.wew && cp ~/.ipfs/config.wew ~/.ipfs/config.new
|
||||||
|
fi
|
||||||
|
################################################################
|
||||||
## Refresh bootstrap if XID exists
|
## Refresh bootstrap if XID exists
|
||||||
[[ "$XID" != "" ]] && ipfs bootstrap rm "/ipfs/$ipfsnodeid" && ipfs bootstrap add "$peerline" || ipfs bootstrap rm "$peerline"
|
[[ "$XID" != "" ]] && ipfs bootstrap rm "/ipfs/$ipfsnodeid" && ipfs bootstrap add "$peerline" || ipfs bootstrap rm "$peerline"
|
||||||
################################################################
|
################################################################
|
||||||
|
@ -141,15 +150,6 @@ do
|
||||||
[[ -f $HOME/.zen/key/stargates/$whoisg1/stargate5.encrypt ]] && $MY_PATH/tools/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/key/stargates/$whoisg1/stargate5.encrypt" -o "$HOME/.zen/key/stargates/$whoisg1/stargate5"
|
[[ -f $HOME/.zen/key/stargates/$whoisg1/stargate5.encrypt ]] && $MY_PATH/tools/natools.py decrypt -f pubsec -k "$HOME/.zen/secret.dunikey" -i "$HOME/.zen/key/stargates/$whoisg1/stargate5.encrypt" -o "$HOME/.zen/key/stargates/$whoisg1/stargate5"
|
||||||
## KEYS COULD BE ADDED TO ~/.ipfs/keystore/ ?
|
## KEYS COULD BE ADDED TO ~/.ipfs/keystore/ ?
|
||||||
fi
|
fi
|
||||||
################################################################
|
|
||||||
echo "## CREATING Peering.Peer entries"
|
|
||||||
################################################################
|
|
||||||
Addr=$(echo "$peerline" | rev | cut -d '/' -f 2- | rev )
|
|
||||||
IsAlreadythere=$(cat ~/.ipfs/config.new | grep $ipfsnodeid)
|
|
||||||
if [[ ! $IsAlreadythere ]]; then
|
|
||||||
echo '{ "ID": "'$ipfsnodeid'", "Addrs": [] }' >> ~/.zen/A_peering_peers.txt
|
|
||||||
jq '.Peering.Peers? += { "Addrs": [], "ID": "'$ipfsnodeid'" }' ~/.ipfs/config.new > ~/.ipfs/config.wew && cp ~/.ipfs/config.wew ~/.ipfs/config.new
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
else # if [[ "$myfriendpeer" != "" ]];
|
else # if [[ "$myfriendpeer" != "" ]];
|
||||||
# ____ _____ _____ ____ ___ _ _
|
# ____ _____ _____ ____ ___ _ _
|
||||||
|
|
Loading…
Reference in New Issue