diff options
author | Jim Shaver <dcypherd@gmail.com> | 2015-03-19 15:58:53 -0400 |
---|---|---|
committer | Jim Shaver <dcypherd@gmail.com> | 2015-03-19 15:58:53 -0400 |
commit | 998c9c49c44969b0e5421c649cfb714e5f578dda (patch) | |
tree | 41821482f4bf1db2ebdb1d8aad2be9de40f2ccfd /libmproxy/onboarding/app.py | |
parent | 36bec7b77e1a8c02211c706b3e651fee13a3b3e2 (diff) | |
parent | 97c6d7ed25e026ae8d5511550df9718f829a7f1e (diff) | |
download | mitmproxy-998c9c49c44969b0e5421c649cfb714e5f578dda.tar.gz mitmproxy-998c9c49c44969b0e5421c649cfb714e5f578dda.tar.bz2 mitmproxy-998c9c49c44969b0e5421c649cfb714e5f578dda.zip |
Merge branch 'master' of github.com:mitmproxy/mitmproxy into ssldocs
Diffstat (limited to 'libmproxy/onboarding/app.py')
-rw-r--r-- | libmproxy/onboarding/app.py | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/libmproxy/onboarding/app.py b/libmproxy/onboarding/app.py index f0aecc15..37f05e96 100644 --- a/libmproxy/onboarding/app.py +++ b/libmproxy/onboarding/app.py @@ -38,27 +38,31 @@ class Index(tornado.web.RequestHandler): class PEM(tornado.web.RequestHandler): + @property + def filename(self): + return config.CONF_BASENAME + "-ca-cert.pem" + def get(self): - p = os.path.join( - self.request.master.server.config.cadir, - config.CONF_BASENAME + "-ca-cert.pem" - ) - self.set_header( - "Content-Type", "application/x-x509-ca-cert" - ) - self.write(open(p, "rb").read()) + p = os.path.join(self.request.master.server.config.cadir, self.filename) + self.set_header("Content-Type", "application/x-x509-ca-cert") + self.set_header("Content-Disposition", "inline; filename={}".format(self.filename)) + + with open(p, "rb") as f: + self.write(f.read()) class P12(tornado.web.RequestHandler): + @property + def filename(self): + return config.CONF_BASENAME + "-ca-cert.p12" + def get(self): - p = os.path.join( - self.request.master.server.config.cadir, - config.CONF_BASENAME + "-ca-cert.p12" - ) - self.set_header( - "Content-Type", "application/x-pkcs12" - ) - self.write(open(p, "rb").read()) + p = os.path.join(self.request.master.server.config.cadir, self.filename) + self.set_header("Content-Type", "application/x-pkcs12") + self.set_header("Content-Disposition", "inline; filename={}".format(self.filename)) + + with open(p, "rb") as f: + self.write(f.read()) application = tornado.web.Application( |