Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-02-02 00:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3801 from mitmproxy/issue-3794

Browse Source 
Improve command detection heuristics
This commit is contained in:
Maximilian Hils 2020-02-02 18:34:43 +01:00 committed by GitHub
commit fdc0864b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mitmproxy/command.py
View File

@ -149,9 +149,10 @@ class CommandManager:
if not i.startswith("__"): if not i.startswith("__"):
o = getattr(addon, i) o = getattr(addon, i)
try: try:
is_command = hasattr(o, "command_name") # hasattr is not enough, see https://github.com/mitmproxy/mitmproxy/issues/3794
is_command = isinstance(getattr(o, "command_name", None), str)
except Exception: except Exception:
pass # hasattr may raise if o implements __getattr__. pass # getattr may raise if o implements __getattr__.
else: else:
if is_command: if is_command:
try: try: