diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..ff19fdb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: [edu4rdshl] diff --git a/files/tor-router b/files/tor-router index 166a83e..5fb5d41 100755 --- a/files/tor-router +++ b/files/tor-router @@ -1,43 +1,83 @@ #!/bin/bash -# Executable file to create rules for transparent proxy -# Destinations you do not want routed through Tor -NON_TOR="192.168.1.0/24 192.168.0.0/24" -# the UID Tor runs as, actually only support for Debian and ArchLinux as been added. -if command -v pacman > /dev/null; then - TOR_UID=$(id -u tor) -elif command -v apt > /dev/null; then - TOR_UID=$(id -u debian-tor) -else - echo "Unknown distro, please create report the issue to https://github.com/edu4rdshl/tor-router/issues" - exit -fi + +RULES="/var/tmp/tor-router.save" # Tor's TransPort TRANS_PORT="9040" -if ! command -v tor > /dev/null; then - echo "You need to install the tor package." - exit -elif ! systemctl is-active tor.service > /dev/null; then - echo "The tor service is not active, please start the tor service before running the script." - exit -else - iptables -F - iptables -t nat -F - iptables -t nat -A OUTPUT -m owner --uid-owner $TOR_UID -j RETURN - iptables -t nat -A OUTPUT -p udp --dport 53 -j REDIRECT --to-ports 5353 +case "$1" in +start) + if test -f "$RULES"; then + echo "$RULES exists. Either delete it, or stop tor-router first." + exit 1 + else + # Executable file to create rules for transparent proxy + # Destinations you do not want routed through Tor + NON_TOR="192.168.1.0/24 192.168.0.0/24 10.0.0.0/8" + # the UID Tor runs as, actually only support for Debian, ArchLinux and Fedora as been added. + if command -v pacman >/dev/null; then + TOR_UID=$(id -u tor) + elif command -v apt >/dev/null; then + TOR_UID=$(id -u debian-tor) + elif command -v dnf >/dev/null; then + TOR_UID=$(id -u toranon) + else + echo "Unknown distro, please create report the issue to https://github.com/edu4rdshl/tor-router/issues" + exit 1 + fi - for NET in $NON_TOR 127.0.0.0/9 127.128.0.0/10; do - iptables -t nat -A OUTPUT -d $NET -j RETURN - done + if ! command -v tor >/dev/null; then + echo "You need to install the tor package." + exit 1 + elif ! systemctl is-active tor.service >/dev/null; then + echo "The tor service is not active, please start the tor service before running the script." + exit 1 + elif ! command -v iptables >/dev/null; then + echo "You need to install the iptables package." + exit 1 + else + # Only save the rules when we are sure that everything is working + iptables-save >$RULES - iptables -t nat -A OUTPUT -p tcp --syn -j REDIRECT --to-ports $TRANS_PORT - iptables -A OUTPUT -m state --state ESTABLISHED,RELATED -j ACCEPT + iptables -F + iptables -t nat -A OUTPUT -m owner --uid-owner "$TOR_UID" -j RETURN + iptables -t nat -A OUTPUT -p udp --dport 53 -j REDIRECT --to-ports 6669 - for NET in $NON_TOR 127.0.0.0/8; do - iptables -A OUTPUT -d $NET -j ACCEPT - done + for NET in $NON_TOR 127.0.0.0/9 127.128.0.0/10; do + iptables -t nat -A OUTPUT -d "$NET" -j RETURN + done - iptables -A OUTPUT -m owner --uid-owner $TOR_UID -j ACCEPT - iptables -A OUTPUT -j ACCEPT -fi + iptables -t nat -A OUTPUT -p tcp --syn -j REDIRECT --to-ports $TRANS_PORT + iptables -t nat -A OUTPUT -p udp -j REDIRECT --to-ports $TRANS_PORT + iptables -A OUTPUT -m state --state ESTABLISHED,RELATED -j ACCEPT + + for NET in $NON_TOR 127.0.0.0/8; do + iptables -A OUTPUT -d "$NET" -j ACCEPT + done + + iptables -A OUTPUT -m owner --uid-owner "$TOR_UID" -j ACCEPT + fi + fi + ;; + +stop) + if test -f "$RULES"; then + echo "Restoring previous rules from $RULES" + iptables -F + iptables-restore <"$RULES" + rm "$RULES" + else + echo "$RULES does not exist. Not doing anything." + exit + fi + ;; + +restart) + stop + sleep 1 + start + ;; +*) + echo "Usage: $0 {start|stop|restart}" + ;; +esac diff --git a/files/tor-router.service b/files/tor-router.service index d9b4a06..6c6d0b1 100644 --- a/files/tor-router.service +++ b/files/tor-router.service @@ -1,12 +1,13 @@ [Unit] Description=Start rules for transparent tor proxy After=network-online.target tor.service + Requires=tor.service [Service] Type=simple - ExecStart=/usr/bin/tor-router + ExecStart=/usr/bin/tor-router start RemainAfterExit=yes - ExecStop=/usr/bin/iptables -F OUTPUT + ExecStop=/usr/bin/tor-router stop TimeoutStopSec=180 KillMode=process KillSignal=SIGINT diff --git a/install.sh b/install.sh index 910d10f..a307739 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Script that automate the procces for setting up TOR as a tranparent proxy # Autor: Edu4rdSHL @edu4rdshl @@ -9,33 +9,31 @@ executablerules="$PWD/files/tor-router" servicefile="$PWD/files/tor-router.service" #Check if the current user have root privileges -if [ "$UID" -ne "0" ] ; then - echo -e "\nYou need root permisions to run it script." - exit +if [ "$UID" -ne "0" ]; then + echo -e "\nYou need root permisions to run it script." + exit fi echo -e "Checking if TOR and Systemd are installed..." -if command -v tor >/dev/null && command -v systemctl > /dev/null ; then - if grep -iq "# Seting up TOR transparent proxy for tor-router" "$torconfig" ; then +if command -v tor >/dev/null && command -v systemctl >/dev/null; then + if grep -iq "# Seting up TOR transparent proxy for tor-router" "$torconfig"; then echo -e "\ntor-router is already configured in $torconfig" else echo -e "\nAll fundamentals tools are installed, proceding..." echo -e "\nMaking a backup of your torrc file, if you have problems with the new configuration, delete $torconfig and move $torconfigbackup to $torconfig" cp "$torconfig" "$torconfigbackup" echo -e "\nConfiguring the torrc file to use TOR as a transparent proxy..." - echo -e "\n# Seting up TOR transparent proxy for tor-router\nVirtualAddrNetwork 10.192.0.0/10\nAutomapHostsOnResolve 1\nTransPort 9040\nDNSPort 5353" >> "$torconfig" + echo -e "\n# Seting up TOR transparent proxy for tor-router\nVirtualAddrNetwork 10.192.0.0/10\nAutomapHostsOnResolve 1\nTransPort 9040\nDNSPort 6669" >>"$torconfig" echo -e "\nCreating, enabling and starting the service file tor transparent proxy..." cp "$executablerules" "/usr/bin/" chmod +x "/usr/bin/tor-router" cp "$servicefile" "/etc/systemd/system/" systemctl enable tor-router.service && systemctl start tor-router.service echo -e "\nEnabling and restarting the TOR daemon using systemctl..." - systemctl enable tor && systemctl restart tor - if [ "$?" == 0 ] ; then + if systemctl enable tor && systemctl restart tor; then echo -e "Checking if all are working..." - if command -v curl >/dev/null ; then - curl https://check.torproject.org/ | grep "Congratulations." - if [ "$?" == 0 ] ; then + if command -v curl >/dev/null; then + if curl https://check.torproject.org/ | grep "Congratulations."; then echo -e "\nAll is OK, from now on all your network traffic is under the TOR Network, look for your IP addres in your browser." exit fi