sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #5927: fix: check if message can be handled before attempting to deserialize

Browse Source 
afbae06520 fix: check if message can be handled before attempting to deserialize (thephez)

Pull request description:

  ## Issue being fixed or feature implemented
  Currently `message-capture-parser.py` crashes when encountering certain messages (e.g. mnauth). This at least makes it possible to run the script without crashing. There may be better options for solving this.

  ## What was done?
  Check if the dictionary is going to return `None` before we attempt to do something further with it. Hide whitespace changes to see the few lines that were added: https://github.com/dashpay/dash/pull/5927/files?diff=unified&w=1

  ## How Has This Been Tested?
  Running script locally

  ## Breaking Changes
  N/A

  ## Checklist:
    _Go over all the following points, and put an `x` in all the boxes that apply._
  - [x] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

Top commit has no ACKs.

Tree-SHA512: 041af57afcfd1d93487fd41d34a50e3a99f7fa129563dfe1e1cf2498974c8e658bd6acb9c810887c841160074056ba999e9b6607ac9336b98b9d42806682c607
This commit is contained in:
pasta 2024-03-12 15:18:24 -05:00
parent 1637fa5a9e
commit 2bde1ddca4
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/message-capture/message-capture-parser.py
View File

@ -122,8 +122,8 @@ def process_file(path: str, messages: List[Any], recv: bool, progress_bar: Optio
msg_ser = BytesIO(f_in.read(length)) msg_ser = BytesIO(f_in.read(length))
# Determine message type # Determine message type
if msgtype not in MESSAGEMAP: if msgtype not in MESSAGEMAP or MESSAGEMAP[msgtype] is None:
# Unrecognized message type # Unrecognized or unhandled message type
try: try:
msgtype_tmp = msgtype.decode() msgtype_tmp = msgtype.decode()
if not msgtype_tmp.isprintable(): if not msgtype_tmp.isprintable():
@ -131,10 +131,11 @@ def process_file(path: str, messages: List[Any], recv: bool, progress_bar: Optio
msg_dict["msgtype"] = msgtype_tmp msg_dict["msgtype"] = msgtype_tmp
except UnicodeDecodeError: except UnicodeDecodeError:
msg_dict["msgtype"] = "UNREADABLE" msg_dict["msgtype"] = "UNREADABLE"
err_str = "Unrecognized" if msgtype not in MESSAGEMAP else "Unhandled"
msg_dict["body"] = msg_ser.read().hex() msg_dict["body"] = msg_ser.read().hex()
msg_dict["error"] = "Unrecognized message type." msg_dict["error"] = f"{err_str} message type"
messages.append(msg_dict) messages.append(msg_dict)
print(f"WARNING - Unrecognized message type {msgtype} in {path}", file=sys.stderr) print(f"WARNING - {msg_dict['error']} {msgtype} in {path}", file=sys.stderr)
continue continue
# Deserialize the message # Deserialize the message