c_meyer/KasperskyLab-TinyCheck
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating different scripts related to the issue #21

Browse Source
This commit is contained in:
Félix Aime 2020-12-18 14:57:52 +01:00
parent 9fd360d3a5
commit ea53de887d
7 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
analysis/classes/suricataengine.py
View File

@ -28,8 +28,8 @@ class SuricataEngine():
# Generate the rule file an launch suricata.
if self.generate_rule_file():
sp.Popen("suricata -S {} -r {} -l /tmp/".format(self.rules_file,
self.pcap_path), shell=True).wait()
sp.Popen(["suricata", "-S", self.rules_file, "-r",
self.pcap_path, "-l", "/tmp/"]).wait()
# Let's parse the log file.
for line in open("/tmp/fast.log", "r").readlines():

6
config.yaml
View File

@ -29,8 +29,8 @@ analysis:
# access to it from remote location.
#
backend:
login: tinycheck
password: 2de5a04967d6cffd33243bb226db194b97e1d6d1331eea3ad1e8c5e9f6e58315
login: userlogin
password: userpassword
remote_access: true
# FRONTEND -
@ -41,7 +41,7 @@ frontend:
download_links: false
hide_mouse: true
kiosk_mode: true
remote_access: false
remote_access: true
sparklines: true
virtual_keyboard: true

16
server/backend/app/classes/config.py
View File

@ -40,13 +40,21 @@ class Config(object):
Write a new value in the configuration
:return: bool, operation status
"""
config = yaml.load(
open(os.path.join(self.dir, "config.yaml"), "r"), Loader=yaml.SafeLoader)
config[cat][key] = value if key != "password" else self.make_password(
value)
if cat == "network" and key == "in":
self.edit_configuration_files(value)
if cat == "network" and key in ["in", "out"]:
if re.match("^wlan[0-9]{1}$", value):
if key == "in":
self.edit_configuration_files(value)
config[cat][key] = value
else:
return False
elif cat == "backend" and key == "password":
config[cat][key] = self.make_password(value)
else:
config[cat][key] = value
with open(os.path.join(self.dir, "config.yaml"), "w") as yaml_file:
yaml_file.write(yaml.dump(config, default_flow_style=False))

4
server/backend/main.py
View File

@ -62,7 +62,7 @@ if __name__ == '__main__':
ssl_key = "{}/{}".format(path[0], 'key.pem')
if read_config(("backend", "remote_access")):
app.run(host="0.0.0.0", debug=True, port=443,
app.run(host="0.0.0.0", port=443,
ssl_context=(ssl_cert, ssl_key))
else:
app.run(port=443, debug=True, ssl_context=(ssl_cert, ssl_key))
app.run(port=443, ssl_context=(ssl_cert, ssl_key))

4
server/frontend/app/classes/analysis.py
View File

@ -23,8 +23,8 @@ class Analysis(object):
if self.token is not None:
parent = "/".join(sys.path[0].split("/")[:-2])
sp.Popen("{} {}/analysis/analysis.py /tmp/{}".format(sys.executable,
parent, self.token), shell=True)
sp.Popen(
[sys.executable, "{}/analysis/analysis.py".format(parent), "/tmp/{}".format(self.token)])
return {"status": True,
"message": "Analysis started",
"token": self.token}

4
server/frontend/app/classes/capture.py
View File

@ -45,8 +45,8 @@ class Capture(object):
mkdir(self.working_dir)
try:
sp.Popen(
"tshark -i {} -w {} -f \"tcp or udp\" ".format(self.iface, self.pcap), shell=True)
sp.Popen(["tshark", "-i", self.iface, "-w",
self.pcap, "-f", "tcp or udp"])
return {"status": True,
"message": "Capture started",
"capture_token": self.capture_token}

22
server/frontend/app/classes/network.py
View File

@ -132,17 +132,15 @@ class Network(object):
def wifi_connect(self):
"""
Connect to one of the WiFi networks present in the
WPA_CONF_PERSIT_FILE.
Connect to one of the WiFi networks present in the wpa_supplicant.conf.
:return: dict containing the TinyCheck <-> AP status.
"""
# Kill wpa_supplicant instances, if any.
terminate_process("wpa_supplicant")
# Launch a new instance of wpa_supplicant.
sp.Popen("wpa_supplicant -B -i {} -c {}".format(self.iface_out,
"/etc/wpa_supplicant/wpa_supplicant.conf"), shell=True).wait()
sp.Popen(["wpa_supplicant", "-B", "-i", self.iface_out, "-c",
"/etc/wpa_supplicant/wpa_supplicant.conf"]).wait()
# Check internet status
for _ in range(1, 40):
if self.check_internet():
@ -235,9 +233,9 @@ class Network(object):
# Kill potential zombies of hostapd
terminate_process("hostapd")
sp.Popen("ifconfig {} up".format(self.iface_in), shell=True).wait()
sp.Popen(["ifconfig", self.iface_in, "up"]).wait()
sp.Popen(
"/usr/sbin/hostapd {} > /tmp/hostapd.log".format("/tmp/hostapd.conf"), shell=True)
"/usr/sbin/hostapd /tmp/hostapd.conf > /tmp/hostapd.log", shell=True)
while True:
if path.isfile("/tmp/hostapd.log"):
@ -293,8 +291,8 @@ class Network(object):
try:
sp.Popen("echo 1 > /proc/sys/net/ipv4/ip_forward",
shell=True).wait()
sp.Popen("iptables -A POSTROUTING -t nat -o {} -j MASQUERADE".format(
self.iface_out), shell=True).wait()
sp.Popen(["iptables", "-A", "POSTROUTING", "-t", "nat", "-o",
self.iface_out, "-j", "MASQUERADE"]).wait()
return True
except:
return False
@ -304,8 +302,8 @@ class Network(object):
This enable interfaces, with a simple check.
:return: bool if everything goes well
"""
sh = sp.Popen("ifconfig {} ".format(iface),
stdout=sp.PIPE, stderr=sp.PIPE, shell=True)
sh = sp.Popen(["ifconfig", iface],
stdout=sp.PIPE, stderr=sp.PIPE)
sh = sh.communicate()
if b"<UP," in sh[0]:
@ -313,7 +311,7 @@ class Network(object):
elif sh[1]:
return False # The interface doesn't exists (most of the cases).
else:
sp.Popen("ifconfig {} up".format(iface), shell=True).wait()
sp.Popen(["ifconfig", iface, "up"]).wait()
return True
def check_internet(self):