diff options
| -rw-r--r-- | libmproxy/app.py | 6 | ||||
| -rw-r--r-- | test/test_app.py | 1 | ||||
| -rw-r--r-- | test/tservers.py | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libmproxy/app.py b/libmproxy/app.py index 3ebbb61b..24187704 100644 --- a/libmproxy/app.py +++ b/libmproxy/app.py @@ -1,5 +1,5 @@ import flask -import os.path +import os.path, os import proxy mapp = flask.Flask(__name__) @@ -17,12 +17,12 @@ def index(): @mapp.route("/cert/pem") def certs_pem(): - p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-cert.pem") + p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-ca-cert.pem") return flask.Response(open(p, "rb").read(), mimetype='application/x-x509-ca-cert') @mapp.route("/cert/p12") def certs_p12(): - p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-cert.p12") + p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-ca-cert.p12") return flask.Response(open(p, "rb").read(), mimetype='application/x-pkcs12') diff --git a/test/test_app.py b/test/test_app.py index 52cd1ba6..0b6ed14c 100644 --- a/test/test_app.py +++ b/test/test_app.py @@ -14,4 +14,3 @@ class TestApp(tservers.HTTPProxTest): resp = self.app("/cert/%s" % ext) assert resp.status_code == 200 assert resp.content - diff --git a/test/tservers.py b/test/tservers.py index 3a6a610f..cf9b3f73 100644 --- a/test/tservers.py +++ b/test/tservers.py @@ -1,3 +1,4 @@ +import os.path import threading, Queue import shutil, tempfile import flask @@ -82,7 +83,7 @@ class ProxTestBase(object): cls.server = libpathod.test.Daemon(ssl=cls.ssl, ssloptions=cls.ssloptions) cls.server2 = libpathod.test.Daemon(ssl=cls.ssl, ssloptions=cls.ssloptions) pconf = cls.get_proxy_config() - cls.confdir = tempfile.gettempdir() + cls.confdir = os.path.join(tempfile.gettempdir(), "mitmproxy") config = proxy.ProxyConfig( no_upstream_cert = cls.no_upstream_cert, confdir = cls.confdir, |