diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-01-24 10:46:34 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-01-24 10:46:34 +1300 |
| commit | 47c7e37723b416605f232cd85818f41d865a9f85 (patch) | |
| tree | e587ec5bfbe5519ff411ca4d299ea3c03a15cbd3 /libmproxy | |
| parent | 9044b8b8f534debf84de553bf1e57cd91a08ee91 (diff) | |
| download | mitmproxy-47c7e37723b416605f232cd85818f41d865a9f85.tar.gz mitmproxy-47c7e37723b416605f232cd85818f41d865a9f85.tar.bz2 mitmproxy-47c7e37723b416605f232cd85818f41d865a9f85.zip | |
Serve correct certs from app. Enable Windows and Android icons.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/app.py | 12 | ||||
| -rw-r--r-- | libmproxy/templates/index.html | 4 |
2 files changed, 8 insertions, 8 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") diff --git a/libmproxy/templates/index.html b/libmproxy/templates/index.html index cfa81dc2..d46d9854 100644 --- a/libmproxy/templates/index.html +++ b/libmproxy/templates/index.html @@ -8,9 +8,9 @@ <a href="/cert/pem"><i class="fa fa-apple fa-5x"></i></a> </p> - <p><i class="fa fa-windows fa-5x"></i></p> + <p><a href="/cert/p12"><i class="fa fa-windows fa-5x"></i></a></p> - <p><i class="fa fa-android fa-5x"></i></p> + <p><a href="/cert/pem"><i class="fa fa-android fa-5x"></i></a></p> </div> </div> |