mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
improved logging
This commit is contained in:
parent
b382d37f20
commit
9a9f636562
3 changed files with 9 additions and 2 deletions
|
@ -921,8 +921,14 @@ class DATA:
|
||||||
|
|
||||||
# check if hmac signing enabled
|
# check if hmac signing enabled
|
||||||
if TNC.enable_hmac:
|
if TNC.enable_hmac:
|
||||||
|
self.log.info(
|
||||||
|
"[TNC] [HMAC] Enabled",
|
||||||
|
)
|
||||||
# now check if we have valid hmac signature - returns salt or bool
|
# now check if we have valid hmac signature - returns salt or bool
|
||||||
salt_found = helpers.search_hmac_salt(self.dxcallsign, self.mycallsign, data_frame_crc, data_frame, token_iters=100)
|
salt_found = helpers.search_hmac_salt(self.dxcallsign, self.mycallsign, data_frame_crc, data_frame, token_iters=100)
|
||||||
|
self.log.info(
|
||||||
|
"[TNC] [HMAC] Salt found", salt=salt_found
|
||||||
|
)
|
||||||
if salt_found:
|
if salt_found:
|
||||||
# hmac digest received
|
# hmac digest received
|
||||||
self.arq_process_received_data_frame(data_frame, snr, signed=True)
|
self.arq_process_received_data_frame(data_frame, snr, signed=True)
|
||||||
|
|
|
@ -531,6 +531,7 @@ def get_hmac_salt(dxcallsign: bytes, mycallsign: bytes):
|
||||||
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):
|
||||||
|
|
||||||
filename = f"freedata_hmac_STATION_{dxcallsign.decode('utf-8')}_REMOTE_{mycallsign.decode('utf-8')}.txt"
|
filename = f"freedata_hmac_STATION_{dxcallsign.decode('utf-8')}_REMOTE_{mycallsign.decode('utf-8')}.txt"
|
||||||
if sys.platform == "linux":
|
if sys.platform == "linux":
|
||||||
|
|
||||||
|
@ -570,7 +571,7 @@ def search_hmac_salt(dxcallsign: bytes, mycallsign: bytes, search_token, data_fr
|
||||||
if search_token == search_digest:
|
if search_token == search_digest:
|
||||||
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.warning(
|
log.info(
|
||||||
"[TNC] [HMAC] Signature found", expected=search_token,
|
"[TNC] [HMAC] Signature found", expected=search_token,
|
||||||
)
|
)
|
||||||
return True
|
return True
|
||||||
|
|
|
@ -129,7 +129,7 @@ class TCIParam:
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class TNC:
|
class TNC:
|
||||||
version = "0.10.3-alpha.1-hmac-exp2"
|
version = "0.10.3-alpha.1-hmac-exp3"
|
||||||
host: str = "0.0.0.0"
|
host: str = "0.0.0.0"
|
||||||
port: int = 3000
|
port: int = 3000
|
||||||
SOCKET_TIMEOUT: int = 1 # seconds
|
SOCKET_TIMEOUT: int = 1 # seconds
|
||||||
|
|
Loading…
Reference in a new issue