aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-02-01 09:56:56 +0100
committerMaximilian Hils <git@maximilianhils.com>2018-02-01 09:57:25 +0100
commit4decb5c2e321f582cb99f70aa2d19c533dee3b2f (patch)
treeb85ce48dca4068c67be474a571d358259c3b924f
parentb57f1a86af5a5a1f7b300963b5b0b7eb77be4fc7 (diff)
downloadmitmproxy-4decb5c2e321f582cb99f70aa2d19c533dee3b2f.tar.gz
mitmproxy-4decb5c2e321f582cb99f70aa2d19c533dee3b2f.tar.bz2
mitmproxy-4decb5c2e321f582cb99f70aa2d19c533dee3b2f.zip
remove quotes around filename
-rw-r--r--mitmproxy/addons/script.py4
-rw-r--r--test/mitmproxy/addons/test_script.py12
2 files changed, 15 insertions, 1 deletions
diff --git a/mitmproxy/addons/script.py b/mitmproxy/addons/script.py
index 0494aa91..0a524359 100644
--- a/mitmproxy/addons/script.py
+++ b/mitmproxy/addons/script.py
@@ -44,7 +44,9 @@ class Script:
def __init__(self, path):
self.name = "scriptmanager:" + path
self.path = path
- self.fullpath = os.path.expanduser(path)
+ self.fullpath = os.path.expanduser(
+ path.strip("'\" ")
+ )
self.ns = None
self.last_load = 0
diff --git a/test/mitmproxy/addons/test_script.py b/test/mitmproxy/addons/test_script.py
index c4fe6b43..78a5be6c 100644
--- a/test/mitmproxy/addons/test_script.py
+++ b/test/mitmproxy/addons/test_script.py
@@ -68,6 +68,18 @@ class TestScript:
with pytest.raises(exceptions.OptionsError):
script.Script("nonexistent")
+ def test_quotes_around_filename(self):
+ """
+ Test that a script specified as '"foo.py"' works to support the calling convention of
+ mitmproxy 2.0, as e.g. used by Cuckoo Sandbox.
+ """
+ path = tutils.test_data.path("mitmproxy/data/addonscripts/recorder/recorder.py")
+
+ s = script.Script(
+ '"{}"'.format(path)
+ )
+ assert '"' not in s.fullpath
+
def test_simple(self):
with taddons.context() as tctx:
sc = script.Script(