diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-01-28 17:29:28 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-01-28 17:29:28 +0100 |
| commit | 1e3e0dd1271afda59ec244b64391b6579a998dce (patch) | |
| tree | 5f1f617ccc8ea2b29650c10197407b1d3ecb7139 /libmproxy/app.py | |
| parent | 17f09aa0afe9695505b746c370e1c5b889c19058 (diff) | |
| parent | 3aa78f9ff38471f84a471618e1a43ca02fc65b6a (diff) | |
| download | mitmproxy-1e3e0dd1271afda59ec244b64391b6579a998dce.tar.gz mitmproxy-1e3e0dd1271afda59ec244b64391b6579a998dce.tar.bz2 mitmproxy-1e3e0dd1271afda59ec244b64391b6579a998dce.zip | |
merge master
Diffstat (limited to 'libmproxy/app.py')
| -rw-r--r-- | libmproxy/app.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmproxy/app.py b/libmproxy/app.py index 5da7d6b2..b0692cf2 100644 --- a/libmproxy/app.py +++ b/libmproxy/app.py @@ -1,4 +1,5 @@ import flask +import os.path mapp = flask.Flask(__name__) mapp.debug = True @@ -13,15 +14,14 @@ def index(): @mapp.route("/cert/pem") def certs_pem(): - p = master().server.config.cacert + capath = master().server.config.cacert + p = os.path.splitext(capath)[0] + "-cert.pem" return flask.Response(open(p).read(), mimetype='application/x-x509-ca-cert') @mapp.route("/cert/p12") def certs_p12(): - return flask.render_template("certs.html", section="certs") + capath = master().server.config.cacert + p = os.path.splitext(capath)[0] + "-cert.p12" + return flask.Response(open(p).read(), mimetype='application/x-pkcs12') - -@mapp.route("/cert/cer") -def certs_cer(): - return flask.render_template("certs.html", section="certs") |