diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 15:47:27 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-03-08 15:47:27 +0100 |
| commit | 2b01c4eee7a52dfb5fd30bb9b248cec87d563db9 (patch) | |
| tree | 72604de5152bdf15147a78e03a669a207baeac95 /libmproxy/app.py | |
| parent | 3032672f10c727623ee085d04d623901dac856df (diff) | |
| parent | 221973aff6553ffb1d40859c5d35b88d959f9718 (diff) | |
| download | mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.gz mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.tar.bz2 mitmproxy-2b01c4eee7a52dfb5fd30bb9b248cec87d563db9.zip | |
Merge branch 'master' of github.com:mitmproxy/mitmproxy
Diffstat (limited to 'libmproxy/app.py')
| -rw-r--r-- | libmproxy/app.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libmproxy/app.py b/libmproxy/app.py index b046f712..24187704 100644 --- a/libmproxy/app.py +++ b/libmproxy/app.py @@ -1,5 +1,6 @@ import flask -import os.path +import os.path, os +import proxy mapp = flask.Flask(__name__) mapp.debug = True @@ -16,14 +17,12 @@ def index(): @mapp.route("/cert/pem") def certs_pem(): - capath = master().server.config.cacert - p = os.path.splitext(capath)[0] + "-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(): - capath = master().server.config.cacert - p = os.path.splitext(capath)[0] + "-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') |