zishuo/Natter
1
0
Fork 0
mirror of https://github.com/MikeWang000000/Natter.git synced 2025-09-26 21:55:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove comments on iptables rules #50

Browse Source
This commit is contained in:
Mike Wang
2024-03-16 17:00:05 +08:00
parent b118119210
commit a001eec1dc
1 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
natter.py
View File

@@ -464,7 +464,7 @@ class ForwardTestServer(object):
class ForwardIptables(object):
def __init__(self, snat=False, sudo=False):
self.uuid = self._get_uuid4()
self.rules = []
self.active = False
self.min_ver = (1, 4, 1)
self.curr_ver = (0, 0, 0)
@@ -543,21 +543,18 @@ class ForwardIptables(object):
def _iptables_clean(self):
Logger.debug("fwd-iptables: Cleaning up Natter rules")
rules = subprocess.check_output(
self.iptables_cmd + ["-t", "nat", "--list-rules", "NATTER"]
).decode().splitlines()
rules += subprocess.check_output(
self.iptables_cmd + ["-t", "nat", "--list-rules", "NATTER_SNAT"]
).decode().splitlines()
for rule in rules:
m = re.search(r"NATTER_UUID=([0-9a-f\-]+)", rule)
if not rule.startswith("-A NATTER") or not m:
continue
rule_uuid = m.group(1)
if rule_uuid == self.uuid:
while self.rules:
rule = self.rules.pop()
rule_rm = ["-D" if arg in ("-I", "-A") else arg for arg in rule]
try:
subprocess.check_output(
self.iptables_cmd + ["-t", "nat", "-D"] + shlex.split(rule[2:])
self.iptables_cmd + rule_rm,
stderr=subprocess.STDOUT
)
return
except subprocess.CalledProcessError as ex:
Logger.error("fwd-iptables: Failed to execute %s: %s" % (ex.cmd, ex.output))
continue
def start_forward(self, ip, port, toip, toport, udp=False):
if ip != toip:
@@ -568,27 +565,29 @@ class ForwardIptables(object):
Logger.debug("fwd-iptables: Adding rule %s forward to %s" % (
addr_to_uri((ip, port), udp=udp), addr_to_uri((toip, toport), udp=udp)
))
subprocess.check_output(self.iptables_cmd + [
rule = [
"-t", "nat",
"-I", "NATTER",
"-p", proto,
"--dst", ip,
"--dport", "%d" % port,
"-j", "DNAT",
"--to-destination", "%s:%d" % (toip, toport),
"-m", "comment", "--comment", "NATTER_UUID=%s" % self.uuid
])
"--to-destination", "%s:%d" % (toip, toport)
]
subprocess.check_output(self.iptables_cmd + rule)
self.rules.append(rule)
if self.snat:
subprocess.check_output(self.iptables_cmd + [
rule = [
"-t", "nat",
"-I", "NATTER_SNAT",
"-p", proto,
"--dst", toip,
"--dport", "%d" % toport,
"-j", "SNAT",
"--to-source", ip,
"-m", "comment", "--comment", "NATTER_UUID=%s" % self.uuid
])
"--to-source", ip
]
subprocess.check_output(self.iptables_cmd + rule)
self.rules.append(rule)
self.active = True
def stop_forward(self):
@@ -606,22 +605,6 @@ class ForwardIptables(object):
else:
Logger.warning("fwd-iptables: '%s' not found" % str(fpath))
def _get_uuid4(self):
fpath = "/proc/sys/kernel/random/uuid"
if os.path.exists(fpath):
fin = open(fpath, "r")
buff = fin.read()
fin.close()
return buff.strip()
else:
return "%08x-%04x-%04x-%04x-%04x%08x" % (
random.getrandbits(32),
random.getrandbits(16),
random.getrandbits(12) | 0x4000,
random.getrandbits(14) | 0x8000,
random.getrandbits(16), random.getrandbits(32)
)
class ForwardSudoIptables(ForwardIptables):
def __init__(self):