mirror of https://github.com/Kkevsterrr/geneva
Fixed nits
This commit is contained in:
parent
6f31a29faa
commit
dd13dc3903
|
@ -183,7 +183,7 @@ def get_interface():
|
||||||
"""
|
"""
|
||||||
if os.name == 'nt':
|
if os.name == 'nt':
|
||||||
# Windows code
|
# Windows code
|
||||||
return # TODO: Fix this
|
return
|
||||||
else:
|
else:
|
||||||
ifaces = netifaces.interfaces()
|
ifaces = netifaces.interfaces()
|
||||||
for iface in ifaces:
|
for iface in ifaces:
|
||||||
|
|
25
engine.py
25
engine.py
|
@ -28,10 +28,7 @@ import actions.utils
|
||||||
|
|
||||||
BASEPATH = os.path.dirname(os.path.abspath(__file__))
|
BASEPATH = os.path.dirname(os.path.abspath(__file__))
|
||||||
|
|
||||||
if os.name == 'nt':
|
WINDOWS = (os.name == 'nt')
|
||||||
WINDOWS = True
|
|
||||||
else:
|
|
||||||
WINDOWS = False
|
|
||||||
|
|
||||||
if WINDOWS:
|
if WINDOWS:
|
||||||
import pydivert
|
import pydivert
|
||||||
|
@ -41,21 +38,21 @@ else:
|
||||||
|
|
||||||
from abc import ABC, abstractmethod
|
from abc import ABC, abstractmethod
|
||||||
|
|
||||||
def Engine(server_port, string_strategy, environment_id=None, output_directory="trials", log_level="info"):
|
def Engine(server_port, string_strategy, **kwargs):
|
||||||
# Factory function to dynamically choose which engine to use.
|
# Factory function to dynamically choose which engine to use.
|
||||||
# Users should initialize an Engine using this.
|
# Users should initialize an Engine using this.
|
||||||
if WINDOWS:
|
if WINDOWS:
|
||||||
eng = WindowsEngine(server_port,
|
eng = WindowsEngine(server_port,
|
||||||
string_strategy,
|
string_strategy,
|
||||||
environment_id=environment_id,
|
environment_id=kwargs.get("environment_id", None),
|
||||||
output_directory=output_directory,
|
output_directory=kwargs.get("output_directory", "trials"),
|
||||||
log_level=log_level)
|
log_level=kwargs.get("log_level", "info"))
|
||||||
else:
|
else:
|
||||||
eng = LinuxEngine(server_port,
|
eng = LinuxEngine(server_port,
|
||||||
string_strategy,
|
string_strategy,
|
||||||
environment_id=environment_id,
|
environment_id=kwargs.get("environment_id", None),
|
||||||
output_directory=output_directory,
|
output_directory=kwargs.get("output_directory", "trials"),
|
||||||
log_level=log_level)
|
log_level=kwargs.get("log_level", "info"))
|
||||||
|
|
||||||
return eng
|
return eng
|
||||||
|
|
||||||
|
@ -109,6 +106,7 @@ class GenericEngine(ABC):
|
||||||
"""
|
"""
|
||||||
self.shutdown()
|
self.shutdown()
|
||||||
|
|
||||||
|
|
||||||
class WindowsEngine(GenericEngine):
|
class WindowsEngine(GenericEngine):
|
||||||
def __init__(self, server_port, string_strategy, environment_id=None, output_directory="trials", log_level="info"):
|
def __init__(self, server_port, string_strategy, environment_id=None, output_directory="trials", log_level="info"):
|
||||||
super().__init__(server_port, string_strategy, environment_id=environment_id, output_directory=output_directory, log_level=log_level)
|
super().__init__(server_port, string_strategy, environment_id=environment_id, output_directory=output_directory, log_level=log_level)
|
||||||
|
@ -129,7 +127,8 @@ class WindowsEngine(GenericEngine):
|
||||||
self.logger.debug("Initializing Divert")
|
self.logger.debug("Initializing Divert")
|
||||||
|
|
||||||
self.divert = pydivert.WinDivert("tcp.DstPort == %d || tcp.SrcPort == %d || udp.DstPort == %d || udp.SrcPort == %d" \
|
self.divert = pydivert.WinDivert("tcp.DstPort == %d || tcp.SrcPort == %d || udp.DstPort == %d || udp.SrcPort == %d" \
|
||||||
% (int(self.server_port), int(self.server_port), int(self.server_port), int(self.server_port)))self.divert.open()
|
% (int(self.server_port), int(self.server_port), int(self.server_port), int(self.server_port)))
|
||||||
|
self.divert.open()
|
||||||
self.divert_thread = threading.Thread(target=self.run_divert)
|
self.divert_thread = threading.Thread(target=self.run_divert)
|
||||||
self.divert_thread.start()
|
self.divert_thread.start()
|
||||||
|
|
||||||
|
@ -499,7 +498,7 @@ def main(args):
|
||||||
strategy = LIBRARY[int(args["strategy_index"])][0]
|
strategy = LIBRARY[int(args["strategy_index"])][0]
|
||||||
else:
|
else:
|
||||||
# Default to first strategy
|
# Default to first strategy
|
||||||
strategy = LIBRARY[0][0]
|
strategy = LIBRARY[6][0]
|
||||||
eng = Engine(args["server_port"],
|
eng = Engine(args["server_port"],
|
||||||
strategy,
|
strategy,
|
||||||
environment_id=args.get("environment_id"),
|
environment_id=args.get("environment_id"),
|
||||||
|
|
|
@ -131,7 +131,7 @@ def test_pretty_print():
|
||||||
"""
|
"""
|
||||||
Print complex tree, although difficult to test
|
Print complex tree, although difficult to test
|
||||||
"""
|
"""
|
||||||
if platform.system() == "Windows":
|
if os.name == 'nt':
|
||||||
return
|
return
|
||||||
t = actions.trigger.Trigger("field", "flags", "TCP")
|
t = actions.trigger.Trigger("field", "flags", "TCP")
|
||||||
a = actions.tree.ActionTree("out", trigger=t)
|
a = actions.tree.ActionTree("out", trigger=t)
|
||||||
|
|
Loading…
Reference in New Issue