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

more file related fixes

Browse source
This commit is contained in:
DJ2LS 2023-08-26 16:56:45 +02:00
parent a1e32cca1b
commit d10cfe43ec
1 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
tnc/helpers.py
View file

@ -501,23 +501,38 @@ def bool_to_string(state):
def get_hmac_salt(dxcallsign: bytes, mycallsign: bytes): def get_hmac_salt(dxcallsign: bytes, mycallsign: bytes):
filename = f"freedata_hmac_STATION_{dxcallsign.decode('utf-8')}_REMOTE_{mycallsign.decode('utf-8')}.txt" filename = f"freedata_hmac_STATION_{mycallsign.decode('utf-8')}_REMOTE_{dxcallsign.decode('utf-8')}.txt"
if sys.platform == "linux": if sys.platform in ["linux"]:
filepath = './hmac/' + filename
elif sys.platform == "darwin":
if hasattr(sys, "_MEIPASS"): if hasattr(sys, "_MEIPASS"):
filepath = getattr(sys, "_MEIPASS") + '/hmac/' + filename filepath = getattr(sys, "_MEIPASS") + '/hmac/' + filename
else: else:
filepath = './hmac/' + filename subfolder = Path('hmac')
elif sys.platform in ["win32", "win64"]: filepath = subfolder / filename
filepath = filename
pass
else:
filepath = filename
elif sys.platform in ["darwin"]:
if hasattr(sys, "_MEIPASS"):
filepath = getattr(sys, "_MEIPASS") + '/hmac/' + filename
else:
subfolder = Path('hmac')
filepath = subfolder / filename
elif sys.platform in ["win32", "win64"]:
if hasattr(sys, "_MEIPASS"):
filepath = getattr(sys, "_MEIPASS") + '/hmac/' + filename
else:
subfolder = Path('hmac')
filepath = subfolder / filename
else:
try:
subfolder = Path('hmac')
filepath = subfolder / filename
except Exception as e:
log.error(
"[TNC] [HMAC] File lookup error", file=filepath,
)
# check if file exists else return false # check if file exists else return false
if not check_if_file_exists(filepath): if not check_if_file_exists(filepath):
return False return False
@ -530,7 +545,8 @@ def get_hmac_salt(dxcallsign: bytes, mycallsign: bytes):
hmac_salt = bytes(line[-1], "utf-8").split(b'\n') hmac_salt = bytes(line[-1], "utf-8").split(b'\n')
hmac_salt = hmac_salt[0] hmac_salt = hmac_salt[0]
return hmac_salt if delete_last_line_from_hmac_list(filepath, -1) else False return hmac_salt if delete_last_line_from_hmac_list(filepath, -1) else False
except Exception: except Exception as e:
log.warning("[SCK] [HMAC] File lookup failed", file=filepath, e=e)
return False return False
def search_hmac_salt(dxcallsign: bytes, mycallsign: bytes, search_token, data_frame, token_iters): def search_hmac_salt(dxcallsign: bytes, mycallsign: bytes, search_token, data_frame, token_iters):
@ -591,17 +607,17 @@ def search_hmac_salt(dxcallsign: bytes, mycallsign: bytes, search_token, data_fr
# print(f" key-------------{key.hex()}") # print(f" key-------------{key.hex()}")
# print(f" search token----{search_token.hex()}") # print(f" search token----{search_token.hex()}")
# print(f" search digest---{search_digest.hex()}") # print(f" search digest---{search_digest.hex()}")
if search_token == search_digest: if search_token.hex() == search_digest.hex():
token_position = len(token_list) - _ token_position = len(token_list) - _
delete_last_line_from_hmac_list(filepath, token_position) delete_last_line_from_hmac_list(filepath, token_position)
log.info( log.info(
"[TNC] [HMAC] Signature found", expected=search_token, "[TNC] [HMAC] Signature found", expected=search_token.hex(),
) )
return True return True
log.warning( log.warning(
"[TNC] [HMAC] Signature not found", expected=search_token, "[TNC] [HMAC] Signature not found", expected=search_token.hex(), filepath=filepath,
) )
return False return False