aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | fix other occurences of options shortcutMaximilian Hils2017-03-078-10/+10
| | | |
| * | | Update tcpproxy.rstYamamori Akihiro2017-03-071-1/+1
| | | | | | | | | | | | Correction in key short cut for TCP Proxy
* | | | Revert "clearly indentify git-checkout as dev version"Maximilian Hils2017-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | This temporarily reverts commit 3b4d8d6ecae3ee1f57dd71af990bb480e6c82d6c, which broke the snapshot builds.
* | | | Merge pull request #2106 from davidpshaw/python_3_to_masterMaximilian Hils2017-03-073-4/+4
|\ \ \ \ | |/ / / |/| | | Updated for python 3
| * | | Updated for python 3David Shaw2017-03-063-4/+4
| | | |
* | | | Merge pull request #2101 from s4chin/add-websocket-filter-to-webMaximilian Hils2017-03-062-84/+111
|\ \ \ \ | | | | | | | | | | web: Add websocket filter
| * | | | web: Add websocket filterSachin Kelkar2017-03-062-84/+111
| |/ / /
* | | | Merge pull request #2104 from lymanZerga11/patch-2Maximilian Hils2017-03-061-1/+1
|\ \ \ \ | | | | | | | | | | Fixes #2102
| * | | | Update flowlist.pylymanZerga112017-03-061-1/+1
| |/ / /
* | | | Merge pull request #2105 from Kriechi/dev-versionMaximilian Hils2017-03-061-1/+1
|\ \ \ \ | |/ / / |/| | | clearly indentify git-checkout as dev version
| * | | clearly indentify git-checkout as dev versionThomas Kriechbaumer2017-03-061-1/+1
| | | |
* | | | Merge pull request #2085 from MatthewShao/devMaximilian Hils2017-03-053-2/+15
|\ \ \ \ | | | | | | | | | | [web] Add mouse support for FilterInput popover.
| * | | | [web] Retain focus on input field after selecting. (#2085)Matthew Shao2017-03-041-0/+1
| | | | |
| * | | | [web] Simplify the code. (#2085)Matthew Shao2017-03-031-6/+2
| | | | |
| * | | | [web] Add mouse support for FilterInput popover.Matthew Shao2017-03-023-3/+19
| |/ / /
| | | * Carefully re-add a small number of short flagsAldo Cortesi2017-03-076-39/+48
| | | | | | | | | | | | | | | | | | | | The mechanism for booleans attaches the short flag to whatever the opposite of the default is.
| | | * Change the way proxy authetication is specifiedAldo Cortesi2017-03-075-58/+51
| | | | | | | | | | | | | | | | | | | | | | | | We now have one option "proxyauth". If this is "any", we accept any credentials, if it starts with an @ it's treated as a path to an htpasswd file, if it is of the form username:password it's a single-user credential.
| | | * Add type and choices to options dump commets.Aldo Cortesi2017-03-072-21/+34
| | | |
| | | * Options tweaksAldo Cortesi2017-03-074-111/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Regularise presentation and wording - Help is mandatory for all options - Auto-generate wording to say that sequence options can be passed multiple times on the command-line
| | | * Remove less commonly used command-line optionsAldo Cortesi2017-03-073-74/+5
| | | | | | | | | | | | | | | | | | | | | | | | We now have --set, so only options that really deserve it get a dedicated flag. I'm inclined to strip this back even more. Feel free to argue that YOUR favourite option deserves special treatment here.
| | | * Add the --set option to set options directlyAldo Cortesi2017-03-074-6/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --set option is a universal flag for setting options. Some examples: Turn on a boolean: mitmdump --set onboarding=false Add a value to a sequence: mitumdupm --set setheaders=/foo/bar/voing Zero a sequence: mitumdupm --set setheaders
| | | * Option spacing and coverageAldo Cortesi2017-03-073-15/+37
| | | |
| | | * Add --options that dumps annotated option defaultsAldo Cortesi2017-03-074-5/+39
| | | |
| | | * Fix lintAldo Cortesi2017-03-071-1/+1
| | | |
| | | * Flatten commandline arg structure, extract common run func for toolsAldo Cortesi2017-03-072-100/+51
| | | |
| | | * Cleanups and test coverageAldo Cortesi2017-03-0710-26/+45
| | | |
| | | * Automate slurping up command-line optionsAldo Cortesi2017-03-076-124/+23
| | | | | | | | | | | | | | | | | | | | Now that options are completely regular, we can automate reading them out of arguments, rather than listing them out by hand like savages.
| | | * Replacements and setheaders are always stringsAldo Cortesi2017-03-064-44/+38
| | | | | | | | | | | | | | | | | | | | Instead of having two representations we have one canonical specification. Fixing the editor in console is left ot a further patch.
| | | * Unify mode specificationAldo Cortesi2017-03-0614-129/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have: --mode regular (the default) --mode transparent --mode socks5 --mode reverse:SPEC --mode upstream:SPEC Where SPEC is a host specification.
| | | * Options unification: certsAldo Cortesi2017-03-063-30/+23
| | | | | | | | | | | | | | | | | | | | - Regularise to Sequence[str] - Move conversion and checking into proxy config object
| | | * Options unification: streamfileAldo Cortesi2017-03-064-30/+11
| | | | | | | | | | | | | | | | | | | | We now have one option to control this. If the path is prefixed with a "+" we append, otherwise we overwrite.
| | | * Options unification: string choicesAldo Cortesi2017-03-064-46/+66
| | | |
| | | * Options unification: simple string sequencesAldo Cortesi2017-03-063-76/+73
| | | |
| | | * Options unification: simple stringsAldo Cortesi2017-03-068-163/+126
| | | | | | | | | | | | | | | | Move all simple string options to the new scheme. Also regularise some names.
| | | * Options unification: sizesAldo Cortesi2017-03-0612-46/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start dealing with corner cases: - Sizes are always stored in options as strings - Add a new core addon that's responsible for verifying settings that don't belong to an addon - Add a _processed scratch space on the Options object for processed core values to be stored in. This is pretty dirty, but less dirty than re-parsing values every time. We'll come up with something better down the track.
| | | * Start unifying options and the command-line: intsAldo Cortesi2017-03-053-33/+37
| | | | | | | | | | | | | | | | | | | | | | | | Moves all integer options apart from a few tricky ones like verbosity over to auto generation. Also add a metavar argument to parser generation to support this.
| | | * Start unifying options and the command-line: booleansAldo Cortesi2017-03-0516-255/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit: - Adds a help field to options - Adds a function to generate parser definitions from options - Uses this to migrate all boolean flags over to the new system - Makes all booleans consistently follow the --foo/--not-foo convention There are a number of things left to be done here: - Argparse doesn't give us a nice way to format --foo --not-foo help. Click does, and moving to click is a goal down the track. - For now, we remove all short aliases. I want to re-evaluate these systematically once we have the new structure in place.
| | | * Revamp optionsAldo Cortesi2017-03-0514-381/+266
| |_|/ |/| | | | | | | | | | | - Options are now explicitly initialized with an add_option method - We have one canonical Options class - ditch dump.Options
* | | Merge pull request #2095 from MatthewShao/fix-#2083Clemens Brunner2017-03-041-2/+1
|\ \ \ | | | | | | | | [web] fix scroll bug in flow detail. (#2083)
| * | | [web] fix scroll bug in flow detail. (#2083)Matthew Shao2017-03-041-2/+1
| | | |
* | | | Merge pull request #2082 from tarnacious/masterMaximilian Hils2017-03-041-0/+2
|\ \ \ \ | |/ / / |/| | | Call error handler and mark flow on HTTPException
| * | | Call error handler and mark flow on HTTPExceptiontarnacious2017-03-011-0/+2
| |/ / | | | | | | | | | | | | This allows scripts to handle HTTPExceptions such as "HTTP Body too large" raised in mitmproxy/net/http/http1/read.py:131
* | | update release docsMaximilian Hils2017-03-045-16718/+18855
| | |
* | | Merge pull request #2081 from s4chin/add-pretty-hostMaximilian Hils2017-03-042-5/+2
|\ \ \ | | | | | | | | web: Fix #1888
| * | | web: Fix #1888Sachin Kelkar2017-03-032-5/+2
| | | |
* | | | Merge pull request #2053 from krsoninikhil/on-issuesMaximilian Hils2017-03-047-13/+35
|\ \ \ \ | |_|_|/ |/| | | Adds --keep-host-header option (#2039)
| * | | update docs wordingMaximilian Hils2017-03-041-2/+2
| | | |
| * | | Merge branch 'master' into on-issuesNikhil Soni2017-03-0356-680/+1674
| |\ \ \ | |/ / / |/| | |
* | | | docs: fix cert install linkMaximilian Hils2017-03-021-1/+1
| | | |
* | | | docs: http -> https where possibleMaximilian Hils2017-03-021-6/+6
| | | |