highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-11-18 18:07:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

TOR experimental support

Browse Source
This commit is contained in:
rootzoll
2018-08-15 12:12:21 +02:00
parent e10ab0bd5b
commit 1c8ad20bb7
4 changed files with 224 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
home.admin/00infoBlitz.sh
View File

@@ -117,16 +117,28 @@ if [ "${public_port}" = "" ]; then
fi fi
fi fi
public_check=$(timeout 2s nc -z ${public_ip} ${public_port}; echo $?) public_addr="??"
torInfo=""
if [ $public_check = "0" ]; then # TOR or IP
public="Yes" onionAddress=$(${network}-cli -datadir=${bitcoin_dir} getnetworkinfo | grep '"address"' | cut -d '"' -f4)
if [ ${#onionAddress} -gt 0 ]; then
# TOR address
public_addr="${onionAddress}:${public_port}"
public=""
public_color="${color_green}" public_color="${color_green}"
torInfo="+ TOR"
else else
public="Not reachable" # IP address
public_color="${color_red}" public_addr="${public_ip}:${public_port}"
public_check=$(timeout 2s nc -z ${public_ip} ${public_port}; echo $?)
if [ $public_check = "0" ]; then
public="Yes"
public_color="${color_green}"
else
public="Not reachable"
public_color="${color_red}"
fi
fi fi
public_addr="${public_ip}:${public_port}"
# get LND info # get LND info
/usr/local/bin/lncli --macaroonpath=${lnd_dir}/readonly.macaroon --tlscertpath=${lnd_dir}/tls.cert getinfo 2>&1 | grep "Please unlock" >/dev/null /usr/local/bin/lncli --macaroonpath=${lnd_dir}/readonly.macaroon --tlscertpath=${lnd_dir}/tls.cert getinfo 2>&1 | grep "Please unlock" >/dev/null
@@ -154,12 +166,13 @@ fi
networkVersion=$(${network}-cli -datadir=${bitcoin_dir} -version | cut -d ' ' -f6) networkVersion=$(${network}-cli -datadir=${bitcoin_dir} -version | cut -d ' ' -f6)
ln_alias=`sudo -u admin cat /home/admin/.hostname` ln_alias=`sudo -u admin cat /home/admin/.hostname`
sleep 5
printf " printf "
${color_yellow} ${color_yellow}
${color_yellow} ${color_yellow}
${color_yellow} ${color_yellow}
${color_yellow} ${color_yellow}%s ${color_green} ${ln_alias} ${color_yellow} ${color_yellow}%s ${color_green} ${ln_alias}
${color_yellow} ${color_gray}${network} Fullnode + Lightning Network ${color_yellow} ${color_gray}${network} Fullnode + Lightning Network ${torInfo}
${color_yellow} ${color_yellow}%s ${color_yellow} ${color_yellow}%s
${color_yellow} ,/ ${color_yellow} ${color_yellow} ,/ ${color_yellow}
${color_yellow} ,'/ ${color_gray}%s, CPU %s°C ${color_yellow} ,'/ ${color_gray}%s, CPU %s°C
@@ -174,7 +187,7 @@ ${color_yellow} ${color_gray}${ln_channels_online}/${ln_channels_t
${color_yellow} ${ln_external} ${color_yellow} ${ln_external}
${color_yellow} ${color_yellow}
" \ " \
"RaspiBlitz v0.5" \ "RaspiBlitz v0.6" \
"-------------------------------------------" \ "-------------------------------------------" \
"${load##up*, }" "${temp}" \ "${load##up*, }" "${temp}" \
"${hdd}" "${sync_percentage}" "${hdd}" "${sync_percentage}"

6
home.admin/95switchMainTest.sh
View File

@@ -100,9 +100,11 @@ else
switchToMainnet switchToMainnet
fi fi
echo "copying over config to admin user"
echo "copying over config to bitcoin user"
cp $NETWORK_CONFIG /home/admin/.${network}/ cp $NETWORK_CONFIG /home/admin/.${network}/
chown admin:admin /home/admin/.${network}/${network}.conf
cp $LND_CONFIG /home/admin/.lnd/
chown admin:admin /home/admin/.lnd/lnd.conf
# restarting network # restarting network
if [ ${networkInstalled} -gt 0 ]; then if [ ${networkInstalled} -gt 0 ]; then

214
home.admin/96addTorService.sh
View File

@@ -1,71 +1,197 @@
#!/bin/bash #!/bin/bash
# Background:
# https://medium.com/@lopp/how-to-run-bitcoin-as-a-tor-hidden-service-on-ubuntu-cff52d543756 # https://medium.com/@lopp/how-to-run-bitcoin-as-a-tor-hidden-service-on-ubuntu-cff52d543756
# will output: "Codename: stretch" -.- always... # https://bitcoin.stackexchange.com/questions/70069/how-can-i-setup-bitcoin-to-be-anonymous-with-tor
# codename="$(lsb_release -c)" | cut -c11- # https://github.com/lightningnetwork/lnd/blob/master/docs/configuring_tor.md
# load network
network=`cat .network`
# location of TOR config
torrc="/etc/tor/torrc" torrc="/etc/tor/torrc"
function uncommentTorrcRelayBitcoinOnly { clear
echo "uncommenting #RunAsDaemon 1" echo ""
sudo sed -i "s/^#RunAsDaemon 1/RunAsDaemon 1/g" $torrc echo "*** Check if TOR service is functional ***"
echo "adding PortForward 1 & ControlPort 9051 after RunAsDaemon 1" torRunning=$(curl --socks5-hostname 127.0.0.1:9050 https://check.torproject.org | grep "Congratulations. This browser is configured to use Tor." -c)
sudo sed -i '\|RunAsDaemon 1| {N;s|\n$|\nPortForwarding 1\nControlPort 9051\n|}' $torrc if [ ${torRunning} -gt 0 ]; then
echo "uncommenting #CookieAuthentication 1" clear
sudo sed -i "s/^#CookieAuthentication 1/CookieAuthentication 1/g" $torrc echo "You are all good - TOR is already running."
echo "adding CookieAuthFileGroupReadable 1 after CookieAuthentication 1" echo ""
sudo sed -i '\|CookieAuthentication 1| {N;s|\n$|\nCookieAuthFileGroupReadable 1\n|}' $torrc exit 0
echo "*** enabling logs of tor to /var/log/tor/notices.log ***" else
sudo sed -i "s/^#Log notice file/Log notice file/g" $torrc echo "TOR not running ... proceed with switching to TOR."
echo ""
fi
echo "configured tor" echo "*** Adding Tor Sources to sources.list ***"
}
function torOnlyToBitcoinConf {
sudo echo "onlynet=onion" >> /home/bitcoin/.bitcoin/bitcoin.conf
}
echo "adding Tor sources to sources.list"
echo "deb http://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list echo "deb http://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
echo "deb-src http://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list echo "deb-src http://deb.torproject.org/torproject.org stretch main" | sudo tee -a /etc/apt/sources.list
echo "OK"
echo ""
echo "installing dirmngr" echo "*** Installing dirmngr ***"
sudo apt install dirmngr sudo apt install dirmngr
echo ""
## lopp: gpg --keyserver keys.gnupg.net --recv 886DDD89 ## lopp: gpg --keyserver keys.gnupg.net --recv 886DDD89
echo "Fetching GPG key" echo "*** Fetching GPG key ***"
gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 gpg --keyserver keys.gnupg.net --recv A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89
gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
echo ""
echo "*** Updating System ***"
sudo apt-get update sudo apt-get update
echo "install Tor" echo ""
echo "*** Install Tor & Config ***"
sudo apt install tor tor-arm -y sudo apt install tor tor-arm -y
uncommentTorrcRelayBitcoinOnly echo "uncommenting #RunAsDaemon 1"
sudo sed -i "s/^#RunAsDaemon 1/RunAsDaemon 1/g" $torrc
echo "adding PortForward 1 & ControlPort 9051 after RunAsDaemon 1"
sudo sed -i '\|RunAsDaemon 1| {N;s|\n$|\nPortForwarding 1\nControlPort 9051\n|}' $torrc
echo "uncommenting #CookieAuthentication 1"
sudo sed -i "s/^#CookieAuthentication 1/CookieAuthentication 1/g" $torrc
echo "adding CookieAuthFileGroupReadable 1 after CookieAuthentication 1"
sudo sed -i '\|CookieAuthentication 1| {N;s|\n$|\nCookieAuthFileGroupReadable 1\n|}' $torrc
echo "*** enabling logs of tor to /var/log/tor/notices.log ***"
sudo sed -i "s/^#Log notice file/Log notice file/g" $torrc
echo "OK - configured tor"
echo ""
# todo: ask to act as relay # NYX - Tor monitor tool
# https://nyx.torproject.org/#home
echo "*** Installing NYX - TOR monitoring Tool ***"
sudo pip install nyx
echo ""
# ask: only connect via tor? echo "*** Changing ${network} Config ***"
echo "Only Connect thru TOR"
dialog --title "Tor outgoing only" \ echo "onlynet=onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
--backtitle "Raspiblitz - Tor Setup Script" \ echo "Adding some nodes to connect to"
--yesno "Do you want to serve Bitcoin data ONLY to Tor nodes (.onion)?" 7 60 echo "addnode=fno4aakpl6sg6y47.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
echo "addnode=toguvy5upyuctudx.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
# Get exit status echo "addnode=ndndword5lpb7eex.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
response=$? echo "addnode=6m2iqgnqjxh7ulyk.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
case $response in echo "addnode=5tuxetn7tar3q5kp.onion" | sudo tee --append /home/bitcoin/.${network}/${network}.conf
0) torOnlyToBitcoinConf && echo "serving onion nodes only";; sudo cp /home/bitcoin/.${network}/${network}.conf /home/admin/.${network}/${network}.conf
1) echo "serving clear and onion nodes";; sudo chown admin:admin /home/admin/.${network}/${network}.conf
255) echo "[ESC] key pressed.";; echo ""
esac
#echo "*** Changing LND Config ***"
#echo "tor.active" | sudo tee --append /home/bitcoin/.lnd/lnd.conf
#echo "tor.streamisolation" | sudo tee --append /home/bitcoin/.lnd/lnd.conf
#echo "tor.v2" | sudo tee --append /home/bitcoin/.lnd/lnd.conf
#echo "tor.privatekeypath=/home/bitcoin/.bitcoin/onion_private_key" | sudo tee --append /home/bitcoin/.lnd/lnd.conf
#sudo cp /home/bitcoin/.lnd/lnd.conf /home/admin/.lnd/lnd.conf
#sudo chown admin:admin /home/admin/.lnd/lnd.conf
#echo "OK"
#echo ""
echo "*** Activating TOR system service ***"
sudo systemctl restart tor@default sudo systemctl restart tor@default
echo ""
echo "*** Setting Permissions ***"
# so that Bitcoind can create Tor hidden service # so that Bitcoind can create Tor hidden service
echo "setting bitcoind permissions" echo "setting bitcoind permissions"
sudo usermod -a -G debian-tor bitcoin sudo usermod -a -G debian-tor bitcoin
# so that you can run `arm` as user # so that you can run `arm` as user
echo "setting pi permissions"
sudo usermod -a -G debian-tor pi sudo usermod -a -G debian-tor pi
# restarting bitcoind to start with tor echo "*** Waiting for TOR to boostrap ***"
echo "restarting bitcoind, wait 60 seconds" torIsBootstrapped=0
sudo systemctl restart bitcoind while [ ${torIsBootstrapped} -eq 0 ]
sleep 60 do
echo "--- Checking ---"
date +%s
sudo cat /var/log/tor/notices.log | grep "Bootstrapped" | tail -n 10
torIsBootstrapped=$(sudo cat /var/log/tor/notices.log | grep "Bootstrapped 100" -c)
echo "torIsBootstrapped(${torIsBootstrapped})"
echo "If this takes too long --> CTRL+c, reboot and check manually"
sleep 5
done
echo "OK - Tor Bootstrap is ready"
echo ""
echo "*** ${network} re-init - Waiting for Onion Address ***"
# restarting bitcoind to start with tor and generare onion.address
echo "restarting ${network}d ..."
sudo systemctl restart ${network}d
sleep 8
onionAddress=""
while [ ${#onionAddress} -eq 0 ]
echo "--- Checking ---"
date +%s
sudo cat /mnt/hdd/${network}/debug.log | grep "tor" | tail -n 10
onionAddress=$(${network}-cli getnetworkinfo | grep '"address"' | cut -d '"' -f4)
echo "If this takes too long --> CTRL+c, reboot and check manually"
sleep 5
do
echo ""
echo "*** Setting your Onion Address ***"
onionPort=$(${network}-cli getnetworkinfo | grep '"port"' | tr -dc '0-9')
echo "Your Onion Address is: ${onionAddress}:${onionPort}"
echo "TODO: Make LND reachable over TOR when compiled for ARM with TOR support"
# ACTIVATE LND OVER TOR LATER ... see DEV NOTES AT END OF FILE
#sudo systemctl disable lnd
#echo "Writing Public Onion Address to /run/publicip"
#echo "PUBLICIP=${onionAddress}" | sudo tee /run/publicip
#sed -i "5s/.*/Wants=${network}d.service/" ./assets/lnd.tor.service
#sed -i "6s/.*/After=${network}d.service/" ./assets/lnd.tor.service
#sudo cp /home/admin/assets/lnd.tor.service /etc/systemd/system/lnd.service
#sudo chmod +x /etc/systemd/system/lnd.service
#sudo systemctl enable lnd
#echo "OK"
echo "*** Finshing Setup / REBOOT ***"
echo "OK - all should be set"
echo ""
echo "PRESS ENTER ... to REBOOT"
read key
sudo shutdown -r now
exit 0
DEV NOTES ---> maybe use this /etc/tor/torrc to have all toor config on HDD
--> needs /mnt/hdd/tor & with dirs: sys, lnd9735, web80
--> all with chown debian-tor:debian-tor & chmod 700
--> update getpublicip script to use if available: cat /mnt/hdd/tor/lnd9735/hostname
--> Above activate LND tor service when LND is compiled for ARM with TOR service
### See 'man tor', or https://www.torproject.org/docs/tor-manual.html
DataDirectory /mnt/hdd/tor/sys
PidFile /mnt/hdd/tor/sys/tor.pid
SafeLogging 0
Log notice stdout
Log notice file /mnt/hdd/tor/notice.log
Log info file /mnt/hdd/tor/info.log
RunAsDaemon 1
PortForwarding 1
ControlPort 905
SocksPort 9050
CookieAuthFile /mnt/hdd/tor/sys/control_auth_cookie
CookieAuthentication 1
CookieAuthFileGroupReadable 1
# Hidden Service v2 for WEB ADMIN INTERFACE
HiddenServiceDir /mnt/hdd/tor/web80/
HiddenServicePort 80 127.0.0.1:80
# Hidden Service v3 for LND incomming connections
# https://trac.torproject.org/projects/tor/wiki/doc/NextGenOnions#Howtosetupyourownprop224service
HiddenServiceDir /mnt/hdd/tor/lnd9735
HiddenServiceVersion 3
HiddenServicePort 9735 127.0.0.1:9735
# NOTE: bitcoind get tor service automatically - see /mnt/hdd/bitcoin for onion key

27
home.admin/assets/lnd.tor.service Normal file
View File

@@ -0,0 +1,27 @@
# RaspiBlitz: systemd unit for lnd
[Unit]
Description=LND Lightning Daemon
Wants=bitcoind.service
After=bitcoind.service
# for use with sendmail alert
#OnFailure=systemd-sendmail@%n
[Service]
# get var PUBIP from file
EnvironmentFile=/run/publicip
ExecStart=/usr/local/bin/lnd --tor.active --tor.v2
PIDFile=/home/bitcoin/.lnd/lnd.pid
User=bitcoin
Group=bitcoin
LimitNOFILE=128000
Type=simple
KillMode=process
TimeoutSec=180
Restart=always
RestartSec=60
[Install]
WantedBy=multi-user.target