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 | |
| parent | 17f09aa0afe9695505b746c370e1c5b889c19058 (diff) | |
| parent | 3aa78f9ff38471f84a471618e1a43ca02fc65b6a (diff) | |
| download | mitmproxy-1e3e0dd1271afda59ec244b64391b6579a998dce.tar.gz mitmproxy-1e3e0dd1271afda59ec244b64391b6579a998dce.tar.bz2 mitmproxy-1e3e0dd1271afda59ec244b64391b6579a998dce.zip | |
merge master
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/app.py | 12 | ||||
| -rw-r--r-- | libmproxy/cmdline.py | 6 | ||||
| -rw-r--r-- | libmproxy/static/mitmproxy.css | 5 | ||||
| -rw-r--r-- | libmproxy/templates/index.html | 31 |
4 files changed, 33 insertions, 21 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/cmdline.py b/libmproxy/cmdline.py index e221a872..8e7ab4a1 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -2,7 +2,7 @@ import proxy import re, filt import argparse -APP_HOST = "mitm" +APP_HOST = "mitm.it" APP_PORT = 80 class ParseException(Exception): pass @@ -263,8 +263,8 @@ def common_options(parser): group = parser.add_argument_group("Web App") group.add_argument( "-a", - action="store_true", dest="app", default=False, - help="Enable the mitmproxy web app." + action="store_false", dest="app", default=True, + help="Disable the mitmproxy web app." ) group.add_argument( "--app-host", diff --git a/libmproxy/static/mitmproxy.css b/libmproxy/static/mitmproxy.css index 09bcb5f7..b390976a 100644 --- a/libmproxy/static/mitmproxy.css +++ b/libmproxy/static/mitmproxy.css @@ -1,4 +1,9 @@ +#certbank div { + text-align: center; + + +} .fronttable { } diff --git a/libmproxy/templates/index.html b/libmproxy/templates/index.html index cfa81dc2..50cfd5db 100644 --- a/libmproxy/templates/index.html +++ b/libmproxy/templates/index.html @@ -1,19 +1,26 @@ {% extends "frame.html" %} {% block body %} -<div class="masthead"> - <div class="container"> - - <p> - <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><i class="fa fa-android fa-5x"></i></p> - +<center> +<h2> Click to install the mitmproxy certificate: </h2> +</center> +<div id="certbank" class="row"> + <div class="col-md-3"> + <a href="/cert/pem"><i class="fa fa-apple fa-5x"></i></a> + <p>Apple</p> + </div> + <div class="col-md-3"> + <a href="/cert/p12"><i class="fa fa-windows fa-5x"></i></a> + <p>Windows</p> + </div> + <div class="col-md-3"> + <a href="/cert/pem"><i class="fa fa-android fa-5x"></i></a> + <p>Android</p> + </div> + <div class="col-md-3"> + <a href="/cert/pem"><i class="fa fa-asterisk fa-5x"></i></a> + <p>Other</p> </div> </div> - {% endblock %} |