toriptables2: convert to python3
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
parent
e852a927c7
commit
248d1d983d
1 changed files with 16 additions and 17 deletions
|
@ -1,4 +1,4 @@
|
|||
#! /usr/bin/env python2
|
||||
#! /usr/bin/env python3
|
||||
# Written by Rupe version 2.1
|
||||
#
|
||||
"""
|
||||
|
@ -7,16 +7,15 @@ that sets up iptables and tor to route all services
|
|||
and traffic including DNS through the tor network.
|
||||
"""
|
||||
|
||||
from __future__ import print_function
|
||||
from commands import getoutput
|
||||
from subprocess import call, check_call, CalledProcessError
|
||||
from subprocess import call, check_call, getoutput, CalledProcessError
|
||||
from os.path import isfile, basename
|
||||
from os import devnull
|
||||
from sys import exit, stdout, stderr
|
||||
from atexit import register
|
||||
from argparse import ArgumentParser
|
||||
from json import load
|
||||
from urllib2 import urlopen, URLError
|
||||
from urllib.request import urlopen
|
||||
from urllib.error import URLError
|
||||
from time import sleep
|
||||
|
||||
|
||||
|
@ -54,15 +53,15 @@ DNSPort %s
|
|||
fnull = open(devnull, 'w')
|
||||
try:
|
||||
tor_restart = check_call(
|
||||
["service", "tor", "restart"],
|
||||
["systemctl", "restart", "tor"],
|
||||
stdout=fnull, stderr=fnull)
|
||||
|
||||
if tor_restart is 0:
|
||||
print(" {0}".format(
|
||||
"[\033[92m+\033[0m] Anonymizer status \033[92m[ON]\033[0m"))
|
||||
if tor_restart == 0:
|
||||
print((" {0}".format(
|
||||
"[\033[92m+\033[0m] Anonymizer status \033[92m[ON]\033[0m")))
|
||||
self.get_ip()
|
||||
except CalledProcessError as err:
|
||||
print("\033[91m[!] Command failed: %s\033[0m" % ' '.join(err.cmd))
|
||||
print(("\033[91m[!] Command failed: %s\033[0m" % ' '.join(err.cmd)))
|
||||
|
||||
# See https://trac.torproject.org/projects/tor/wiki/doc/TransparentProxy#WARNING
|
||||
# See https://lists.torproject.org/pipermail/tor-talk/2014-March/032503.html
|
||||
|
@ -96,8 +95,8 @@ DNSPort %s
|
|||
call(["iptables", "-A", "OUTPUT", "-j", "REJECT"])
|
||||
|
||||
def get_ip(self):
|
||||
print(" {0}".format(
|
||||
"[\033[92m*\033[0m] Getting public IP, please wait..."))
|
||||
print((" {0}".format(
|
||||
"[\033[92m*\033[0m] Getting public IP, please wait...")))
|
||||
retries = 0
|
||||
my_public_ip = None
|
||||
while retries < 12 and not my_public_ip:
|
||||
|
@ -109,12 +108,12 @@ DNSPort %s
|
|||
print(" [\033[93m?\033[0m] Still waiting for IP address...")
|
||||
except ValueError:
|
||||
break
|
||||
print
|
||||
print()
|
||||
if not my_public_ip:
|
||||
my_public_ip = getoutput('wget -qO - ifconfig.me')
|
||||
if not my_public_ip:
|
||||
exit(" \033[91m[!]\033[0m Can't get public ip address!")
|
||||
print(" {0}".format("[\033[92m+\033[0m] Your IP is \033[92m%s\033[0m" % my_public_ip))
|
||||
print((" {0}".format("[\033[92m+\033[0m] Your IP is \033[92m%s\033[0m" % my_public_ip)))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
@ -150,8 +149,8 @@ if __name__ == '__main__':
|
|||
load_tables.load_iptables_rules()
|
||||
elif args.flush:
|
||||
load_tables.flush_iptables_rules()
|
||||
print(" {0}".format(
|
||||
"[\033[93m!\033[0m] Anonymizer status \033[91m[OFF]\033[0m"))
|
||||
print((" {0}".format(
|
||||
"[\033[93m!\033[0m] Anonymizer status \033[91m[OFF]\033[0m")))
|
||||
elif args.ip:
|
||||
load_tables.get_ip()
|
||||
elif args.refresh:
|
||||
|
@ -160,4 +159,4 @@ if __name__ == '__main__':
|
|||
else:
|
||||
parser.print_help()
|
||||
except Exception as err:
|
||||
print("[!] Run as super user: %s" % err[1])
|
||||
print(("[!] Run as super user: %s" % err))
|
||||
|
|
Loading…
Reference in a new issue