Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 1 | -11/+16 | |
| | | | ||||||
* | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-08-17 | 1 | -15/+18 | |
|\| | | ||||||
| * | | Remove GPL notices left in source files after our change to the MIT license. | Aldo Cortesi | 2013-08-01 | 1 | -15/+0 | |
| | | | | | | | | | | | | Thanks to Roy Shamir for reporting this. | |||||
| * | | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 1 | -0/+18 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10 | Maximilian Hils | 2013-06-16 | 1 | -3/+6 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | add support for multiple scripts and script arguments. refs #76 | Maximilian Hils | 2013-06-13 | 1 | -3/+6 | |
| | | ||||||
* | | always read files in binary mode | Maximilian Hils | 2013-06-16 | 1 | -1/+1 | |
|/ | ||||||
* | Add a basic built-in web app. | Aldo Cortesi | 2013-03-25 | 1 | -1/+8 | |
| | ||||||
* | Add the --host option, which uses the value in the Host header for dispaly URLs. | Aldo Cortesi | 2013-03-17 | 1 | -0/+6 | |
| | | | | | - Can be toggled with "o" then "h" in mitmproxy - Useful for transparent mode | |||||
* | Remove cert_wait_time flag. | Aldo Cortesi | 2013-01-06 | 1 | -5/+0 | |
| | | | | | We now cater for this by generating certs with a commencement date an hour in the past in netlib. | |||||
* | Refactor proxy auth a bit | Aldo Cortesi | 2013-01-02 | 1 | -25/+8 | |
| | | | | | | - Remove authentication scheme option. We only support basic at the moment - we'll add the option back when we diversify. - Add some meta variables to make printout nicer | |||||
* | adding some simple authetication code to limit proxy access | israel | 2012-12-30 | 1 | -1/+47 | |
| | ||||||
* | Command-line options for header setting. | Aldo Cortesi | 2012-08-19 | 1 | -25/+78 | |
| | ||||||
* | add dummy cert dir | Maximilian Hils | 2012-08-17 | 1 | -2/+2 | |
| | ||||||
* | use argparse instead of optparse | Maximilian Hils | 2012-08-17 | 1 | -42/+38 | |
| | ||||||
* | Adds --dummy-certs option to specify certdir | Jim Lloyd | 2012-08-06 | 1 | -0/+6 | |
| | | | | | | If --dummy-certs=CERTSDIR is provided, use CERTSDIR as the location for generating/finding the dummy certs. And in this case, preserve the CERTSDIR directory on exit. | |||||
* | Make upstream-cert the default. There's now a --no-upstream-cert option to ↵ | Aldo Cortesi | 2012-07-03 | 1 | -3/+3 | |
| | | | | turn it off. | |||||
* | Move palette option getting/setting to mitmproxy. | Aldo Cortesi | 2012-07-03 | 1 | -7/+0 | |
| | | | | Unbreaks mitmdump. | |||||
* | Add --palette option to select color palette | Alexis Hildebrandt | 2012-07-01 | 1 | -0/+7 | |
| | ||||||
* | Transparent proxy command-line flag stub. | Aldo Cortesi | 2012-06-26 | 1 | -0/+5 | |
| | ||||||
* | Remove -T and -U command-line options. | Aldo Cortesi | 2012-06-26 | 1 | -16/+2 | |
| | | | | They're redundant convenience options, and we need more space. | |||||
* | add missing parser.add_option_group(group) | Maximilian Hils | 2012-06-06 | 1 | -0/+1 | |
| | ||||||
* | Minor cruft removal. | Aldo Cortesi | 2012-04-09 | 1 | -1/+1 | |
| | ||||||
* | Docs: replacements, upstream certs. | Aldo Cortesi | 2012-04-04 | 1 | -1/+1 | |
| | | | | Also, move reverse proxy command-line flag to -P. | |||||
* | Add specification of replacement patterns on the command line. | Aldo Cortesi | 2012-03-17 | 1 | -1/+96 | |
| | ||||||
* | Adds space between sentences on no-pop's help | Valtteri Virtanen | 2012-03-05 | 1 | -1/+1 | |
| | ||||||
* | Adds no-pop option to server-side replay | Valtteri Virtanen | 2012-03-05 | 1 | -0/+7 | |
| | ||||||
* | Rationalise upstream cert flag and variable names. | Aldo Cortesi | 2012-02-28 | 1 | -3/+3 | |
| | ||||||
* | Add upstream certificate lookup. | Aldo Cortesi | 2012-02-27 | 1 | -6/+11 | |
| | | | | | | This initiates a connection to the server to obtain certificate information to generate interception certificates. At the moment, the information used is the Common Name, and the list of Subject Alternative Names. | |||||
* | License notifications, minor docs. | Aldo Cortesi | 2012-02-23 | 1 | -0/+15 | |
| | ||||||
* | Firm up reverse proxy specification. | Aldo Cortesi | 2012-02-18 | 1 | -1/+1 | |
| | | | | | | - Extract proxy spec parsing and unparsing functions. - Add a status indicator in mitmproxy. - Add the "R" keybinding for changing the reverse proxy from within mitmproxy. | |||||
* | Refactor reverse proxying | Aldo Cortesi | 2012-02-18 | 1 | -1/+1 | |
| | | | | | | | - Retain the specification from the Host header as a Request's description. - Expand upstream proxy specifications to include the scheme. We now say https://hostname:port - Move the "R" revert keybinding to "v" to make room for a reverse proxy binding that matches the command-line flag. | |||||
* | Implemented reverse proxy mode: -R upstreamhost:port makes the | Heikki Hannikainen | 2012-02-16 | 1 | -0/+5 | |
| | | | | | | proxy accept a 'GET / HTTP/1.0' request and fill up the destination host and port from the ones given with -R (for example, "-R localhost:80"). | |||||
* | Change size limit cmdline flag to -Z, enable size limits for replay. | Aldo Cortesi | 2011-09-09 | 1 | -7/+7 | |
| | ||||||
* | Add HTTP body size limit specification to command-line tools. | Aldo Cortesi | 2011-09-09 | 1 | -0/+6 | |
| | ||||||
* | Rip out autodecode | Aldo Cortesi | 2011-08-04 | 1 | -6/+0 | |
| | | | | | | | | We simplify things as follows: - If we're in "pretty" view mode, we autodecode. - Otherwise, we display raw data, and the user can manually encode/decode with z shortcut. | |||||
* | Rip out old script interface, start replacing with new stubs. | Aldo Cortesi | 2011-08-03 | 1 | -21/+15 | |
| | | | | Scripts are broken for now. | |||||
* | Add an eventlog option to mitmdump | Aldo Cortesi | 2011-07-23 | 1 | -0/+6 | |
| | | | | | This shows client connections, disconnections and requests (before a complete flow is assembled). We need to add an analogous display to mitmproxy. | |||||
* | Removes should_autodecode attribute from Response. Adds commandline option ↵ | Stephen Altamirano | 2011-07-21 | 1 | -0/+6 | |
| | | | | 'd' to toggle autodecode, adds togglable option 'd' to do the same | |||||
* | Fix error in anticomp commandline specification. | Aldo Cortesi | 2011-07-17 | 1 | -1/+1 | |
| | ||||||
* | Adds support for content encoding, namely gip and deflate | alts | 2011-07-16 | 1 | -1/+1 | |
| | ||||||
* | Introduce an anti-compression command-line argument. | Aldo Cortesi | 2011-07-15 | 1 | -0/+7 | |
| | | | | | This is on by default, which means we avoid compressed content unless the -z flag is specified. | |||||
* | Specify certificate creation waiting time argument to fix type error in ↵ | Felix Wolfsteller | 2011-07-09 | 1 | -1/+1 | |
| | | | | proxy.py . | |||||
* | Make the certificate wait time configurable. | Aldo Cortesi | 2011-06-27 | 1 | -0/+6 | |
| | | | | | | | | | Since OpenSSL doesn't let us set certificate start times in the past, the client and proxy machine time must be synchronized, or the client might reject the certificate. We can bodgy over small discrepancies by waiting a few seconds after a new certificate is generated (i.e. the first time an SSL domain is contacted). Make this a configurable option, and turn it off by default. | |||||
* | Add -r option to mitmdump and mitmproxy. | Aldo Cortesi | 2011-05-15 | 1 | -0/+6 | |
| | | | | | | This option reads a set of flows from a file. I've also regularized the mitmdump and mitmproxy command-line signatures by removing mitmproxy's old way of specifying flow loads through naked arguments. | |||||
* | Add a -n option which tells the tools not to bind a proxy. | Aldo Cortesi | 2011-05-14 | 1 | -7/+13 | |
| | | | | This is useful when you just want to inspect or process dumps. | |||||
* | Add a stickyauth option. | Aldo Cortesi | 2011-03-20 | 1 | -1/+18 | |
| | | | | | | | This allows us to replay an HTTP Authorization header, in the same way as we replay cookies using stickycookies. This lets us conveniently get at HTTP Basic Auth protected resources through the proxy, but is not enough to do the same for HTTP Digest auth. We'll put that on the todo list. | |||||
* | Revamp key generation. | Aldo Cortesi | 2011-03-18 | 1 | -0/+5 | |
| | | | | | | | | | | | We now create three different files in the .mitmproxy directory when a dummy CA is made: mitmproxy-ca.pem - the CA, including private key mitmproxy-ca-cert.p12 - A pkcs12 version of the certificate, for distribution to Windows. mitmproxy-ca-cert.pem - A PEM version of the certificate, for distribution to everyone else. | |||||
* | Unit tests for cmdline.py | Aldo Cortesi | 2011-03-12 | 1 | -1/+1 | |
| | ||||||
* | Unify mitmproxy and mitmdump commandline | Aldo Cortesi | 2011-03-12 | 1 | -0/+110 | |
- Extract common options into cmdline.py - Change mitmproxy keybindings to fit command line Some cmdline options and keybindings aren't in operation yet - just stubs where functionality will be added in the next few commits. |