Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

solved minor security issue

Browse source
This commit is contained in:
DJ2LS 2021-09-25 14:57:44 +02:00
parent b3219e22af
commit 21eb8fa12b
1 changed files with 43 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
tnc/daemon.py
View file

@ -20,20 +20,6 @@ import static
import psutil import psutil
import sys import sys
import serial.tools.list_ports import serial.tools.list_ports
#PORT = 3001
#TNCPROCESS = 0
#TNCSTARTED = False
#p = pyaudio.PyAudio()
#info = p.get_host_api_info_by_index(0)
#numdevices = info.get('deviceCount')
#for each audio device, determine if is an input or an output and add it to the appropriate list and dictionary
#for i in range (0,numdevices):
# if p.get_device_info_by_host_api_device_index(0,i).get('maxInputChannels')>0:
# print("Input Device id ", i, " - ", p.get_device_info_by_host_api_device_index(0,i).get('name'))#
#
# if p.get_device_info_by_host_api_device_index(0,i).get('maxOutputChannels')>0:
# print("Output Device id ", i, " - ", p.get_device_info_by_host_api_device_index(0,i).get('name'))
def start_daemon(): def start_daemon():
@ -103,32 +89,57 @@ class CMDTCPRequestHandler(socketserver.BaseRequestHandler):
#try: #try:
if received_json["type"] == 'SET' and received_json["command"] == 'STARTTNC' and not static.TNCSTARTED: if received_json["type"] == 'SET' and received_json["command"] == 'STARTTNC' and not static.TNCSTARTED:
rx_audio = received_json["parameter"][0]["rx_audio"] rx_audio = str(received_json["parameter"][0]["rx_audio"])
tx_audio = received_json["parameter"][0]["tx_audio"] tx_audio = str(received_json["parameter"][0]["tx_audio"])
deviceid = received_json["parameter"][0]["deviceid"] deviceid = str(received_json["parameter"][0]["deviceid"])
deviceport = received_json["parameter"][0]["deviceport"] deviceport = str(received_json["parameter"][0]["deviceport"])
serialspeed = received_json["parameter"][0]["serialspeed"] serialspeed = str(received_json["parameter"][0]["serialspeed"])
pttprotocol = received_json["parameter"][0]["pttprotocol"] pttprotocol = str(received_json["parameter"][0]["pttprotocol"])
pttport = received_json["parameter"][0]["pttport"] pttport = str(received_json["parameter"][0]["pttport"])
print("---- STARTING TNC !") print("---- STARTING TNC !")
print(received_json["parameter"][0]) print(received_json["parameter"][0])
command = "--rx "+ str(rx_audio) +" \ #command = "--rx "+ rx_audio +" \
--tx "+ str(tx_audio) +" \ # --tx "+ tx_audio +" \
--deviceport "+ str(deviceport) +" \ # --deviceport "+ deviceport +" \
--deviceid "+ str(deviceid) + " \ # --deviceid "+ deviceid + " \
--serialspeed "+ str(serialspeed) + " \ # --serialspeed "+ serialspeed + " \
--pttprotocol "+ str(pttprotocol) + " \ # --pttprotocol "+ pttprotocol + " \
--pttport "+ str(pttport) # --pttport "+ pttport
# list of parameters, necessary for running subprocess command as a list
options = []
options.append('--rx')
options.append(rx_audio)
options.append('--tx')
options.append(tx_audio)
options.append('--deviceport')
options.append(deviceport)
options.append('--deviceid')
options.append(deviceid)
options.append('--serialspeed')
options.append(serialspeed)
options.append('--pttprotocol')
options.append(pttprotocol)
options.append('--pttport')
options.append(pttport)
# try running tnc from binary, else run from source # try running tnc from binary, else run from source
# this helps running the tnc in a developer environment # this helps running the tnc in a developer environment
try: try:
subprocess.check_call("exec ./tnc " + command) # subprocess.check_call("exec ./tnc " + command)
p = subprocess.Popen("exec ./tnc " + command, shell=True) subprocess.check_call("exec ./tnc ")
command = []
command.append('tnc')
command += options
p = subprocess.Popen(command)
print("running TNC from binary...") print("running TNC from binary...")
except: except:
p = subprocess.Popen("exec python3 main.py " + command, shell=True) command = []
command.append('python3')
command.append('main.py')
command += options
p = subprocess.Popen(command)
print("running TNC from source...") print("running TNC from source...")
static.TNCPROCESS = p#.pid static.TNCPROCESS = p#.pid