meshcore-dev/meshcore_py
1
0
Fork 0
mirror of https://github.com/meshcore-dev/meshcore_py.git synced 2026-04-20 22:13:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

complet channel log rx and use timestamp to calculate hashes

Browse source
This commit is contained in:
Florent 2026-03-05 21:32:24 -04:00
parent c9bc4193cd
commit 563cbfbade
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/meshcore/reader.py
View file

@ -219,12 +219,12 @@ class MessageReader:
res["channel_idx"] = dbuf.read(1)[0] res["channel_idx"] = dbuf.read(1)[0]
res["path_len"] = dbuf.read(1)[0] res["path_len"] = dbuf.read(1)[0]
res["txt_type"] = dbuf.read(1)[0] res["txt_type"] = dbuf.read(1)[0]
res["sender_timestamp"] = int.from_bytes(dbuf.read(4), byteorder="little") res["sender_timestamp"] = int.from_bytes(dbuf.read(4), byteorder="little", signed=False)
text = dbuf.read().strip(b"\0") text = dbuf.read().strip(b"\0")
res["text"] = text.decode("utf-8", "ignore") res["text"] = text.decode("utf-8", "ignore")
# search for text in log_channels # search for text in log_channels
txt_hash = int.from_bytes(SHA256.new(text).digest()[0:4], "little", signed=False) txt_hash = int.from_bytes(SHA256.new(res["sender_timestamp"].to_bytes(4, "little", signed=False)+text).digest()[0:4], "little", signed=False)
if self.decrypt_channels: if self.decrypt_channels:
logged = next((l for l in reversed(self.channels_log) if 'msg_hash' in l and l['msg_hash'] == txt_hash), None) logged = next((l for l in reversed(self.channels_log) if 'msg_hash' in l and l['msg_hash'] == txt_hash), None)
if not logged is None: if not logged is None:
@ -232,6 +232,7 @@ class MessageReader:
res["RSSI"] = logged["rssi"] res["RSSI"] = logged["rssi"]
res["SNR"] = logged["snr"] res["SNR"] = logged["snr"]
res["recv_time"] = logged["recv_time"] res["recv_time"] = logged["recv_time"]
res["attempt"] = logged["attempt"]
attributes = { attributes = {
"channel_idx": res["channel_idx"], "channel_idx": res["channel_idx"],
@ -250,12 +251,12 @@ class MessageReader:
res["channel_idx"] = dbuf.read(1)[0] res["channel_idx"] = dbuf.read(1)[0]
res["path_len"] = dbuf.read(1)[0] res["path_len"] = dbuf.read(1)[0]
res["txt_type"] = dbuf.read(1)[0] res["txt_type"] = dbuf.read(1)[0]
res["sender_timestamp"] = int.from_bytes(dbuf.read(4), byteorder="little") res["sender_timestamp"] = int.from_bytes(dbuf.read(4), byteorder="little", signed=False)
text = dbuf.read() text = dbuf.read()
res["text"] = text.decode("utf-8", "ignore") res["text"] = text.decode("utf-8", "ignore")
# search for text in log_channels # search for text in log_channels
txt_hash = int.from_bytes(SHA256.new(text).digest()[0:4], "little", signed=False) txt_hash = int.from_bytes(SHA256.new(res["sender_timestamp"].to_bytes(4, "little", signed=False)+text).digest()[0:4], "little", signed=False)
res["txt_hash"] = txt_hash res["txt_hash"] = txt_hash
logged = next((l for l in reversed(self.channels_log) if 'msg_hash' in l and l['msg_hash'] == txt_hash), None) logged = next((l for l in reversed(self.channels_log) if 'msg_hash' in l and l['msg_hash'] == txt_hash), None)
@ -264,6 +265,7 @@ class MessageReader:
res["path"] = logged["path"] res["path"] = logged["path"]
res["RSSI"] = logged["rssi"] res["RSSI"] = logged["rssi"]
res["recv_time"] = logged["recv_time"] res["recv_time"] = logged["recv_time"]
res["attempt"] = logged["attempt"]
attributes = { attributes = {
"channel_idx": res["channel_idx"], "channel_idx": res["channel_idx"],
@ -653,14 +655,24 @@ class MessageReader:
# not found: decrypt the text and hash it # not found: decrypt the text and hash it
aes_key = channel["channel_secret"] aes_key = channel["channel_secret"]
cipher = AES.new(aes_key, AES.MODE_ECB) cipher = AES.new(aes_key, AES.MODE_ECB)
message = cipher.decrypt(msg)[5:].strip(b"\0") uncrypted = cipher.decrypt(msg)
msg_hash = int.from_bytes(SHA256.new(message).digest()[0:4], "little", signed=False) timestamp = int.from_bytes(uncrypted[0:4], "little", signed=False)
attempt = uncrypted[4] & 3
txt_type = int.from_bytes(uncrypted[4:4], "little", signed=False) >> 2
message = uncrypted[5:].strip(b"\0")
msg_hash = int.from_bytes(SHA256.new(timestamp.to_bytes(4, "little", signed=False) + message).digest()[0:4], "little", signed=False)
log_data["message"] = message.decode("utf-8", "ignore") log_data["message"] = message.decode("utf-8", "ignore")
log_data["msg_hash"] = msg_hash log_data["msg_hash"] = msg_hash
log_data["sender_timestamp"] = timestamp
log_data["attempt"] = attempt
log_data["txt_type"] = txt_type
else: else:
# found: copy # found: copy
log_data["message"] = logged["message"] log_data["message"] = logged["message"]
log_data["msg_hash"] = logged["msg_hash"] log_data["msg_hash"] = logged["msg_hash"]
log_data["sender_timestamp"] = logged["sender_timestamp"]
log_data["attempt"] = logged["attempt"]
log_data["txt_type"] = logged["txt_type"]
self.channels_log.append(log_data) self.channels_log.append(log_data)
if len(self.channels_log) > 100: if len(self.channels_log) > 100: