aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-05-12 11:16:19 +1200
committerAldo Cortesi <aldo@corte.si>2018-05-12 11:16:19 +1200
commit9f83b6b944db0656372f8c5191670db493415452 (patch)
tree8ae0888a3bcc988f64172037a6fd2e9917c292fc
parenta70b50fe3a3065345cf26112a2148c648695b9d9 (diff)
downloadmitmproxy-9f83b6b944db0656372f8c5191670db493415452.tar.gz
mitmproxy-9f83b6b944db0656372f8c5191670db493415452.tar.bz2
mitmproxy-9f83b6b944db0656372f8c5191670db493415452.zip
script: invoke addons as script with exception handler
Fixes #2837
-rw-r--r--mitmproxy/addons/script.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/addons/script.py b/mitmproxy/addons/script.py
index decd0759..706146b0 100644
--- a/mitmproxy/addons/script.py
+++ b/mitmproxy/addons/script.py
@@ -156,7 +156,8 @@ class ScriptLoader:
s = Script(path, False)
for f in flows:
for evt, arg in eventsequence.iterate(f):
- ctx.master.addons.invoke_addon(s, evt, arg)
+ with addonmanager.safecall():
+ ctx.master.addons.invoke_addon(s, evt, arg)
except exceptions.OptionsError as e:
script_error_handler(path, e, msg=str(e))