aboutsummaryrefslogtreecommitdiffstats
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
...
| * Extract flow reading into addonsAldo Cortesi2017-03-155-53/+140
| | | | | | | | | | | | | | | | This patch moves the final pieces of master functionality into addons. - Add a ReadFile addon to read from file - Add a separate ReadStdin addon to read from stdin, only used by mitmdump - Remove all methods that know about io and serialization from master.Master
* | add Request.makeMaximilian Hils2017-03-152-2/+28
|/
* stateobject: automatically change id when copyingMaximilian Hils2017-03-142-4/+16
|
* add connection idsMaximilian Hils2017-03-141-0/+24
|
* Merge pull request #2149 from mhils/multidictview-copyMaximilian Hils2017-03-141-0/+9
|\ | | | | Add MultiDictView.copy()
| * add MultiDictView.copyMaximilian Hils2017-03-141-0/+9
| |
* | Merge pull request #2145 from mhils/neMaximilian Hils2017-03-143-11/+1
|\ \ | | | | | | py3: __ne__ delegates to __eq__ by default
| * | py3: __ne__ delegates to __eq__ by defaultMaximilian Hils2017-03-143-11/+1
| | |
* | | Merge pull request #2120 from ujjwal96/replace-from-fileMaximilian Hils2017-03-141-33/+36
|\ \ \ | |_|/ |/| | Replace from file through replacement editor #1458
| * | Merge remote-tracking branch 'origin/master' into pr-2120Maximilian Hils2017-03-1216-319/+321
| |\| | | | | | | | | | | | | Conflicts: test/mitmproxy/addons/test_replace.py
| * | replacements: error right away when file does not existMaximilian Hils2017-03-121-28/+30
| | |
| * | minor fixesMaximilian Hils2017-03-121-23/+20
| | |
| * | Fixed Replacement testUjjwal Verma2017-03-091-5/+5
| | |
* | | Enable custom options in config filesAldo Cortesi2017-03-141-6/+9
| | | | | | | | | | | | | | | We also now ignore unknown options in config files by default, and print a warning if verbosity is incremented.
* | | Move serialization methods out of OptionsAldo Cortesi2017-03-141-15/+15
| | | | | | | | | | | | | | | | | | Attributes on options share a namespace with options themselves. It's getting too crowded on our Options object, so let's shift some obvious stuff into the module.
* | | Optmanager: handle unknown options in value setsAldo Cortesi2017-03-141-0/+3
| | |
* | | Show custom addon options in --options outputAldo Cortesi2017-03-141-2/+2
| | |
* | | Enable custom options for addonsAldo Cortesi2017-03-1411-29/+62
| |/ |/| | | | | | | | | | | | | - Add an options parameter to the start() event. This is to be used by addons on startup to add custom options. - Add a running() event that is called once the proxy is up and running. - With the new paradigm we can't log during master __init__, so add a tiny termstatus addon to print proxy status to terminal once we're running.
* | nuke tutils.tmpdir, use pytest tmpdirThomas Kriechbaumer2017-03-1212-329/+273
| |
* | Merge pull request #2118 from lymanZerga11/patch-3Maximilian Hils2017-03-111-0/+1
|\ \ | | | | | | Update proxyauth.py to add proxyauth metadata
| * | add testslymanZerga112017-03-091-1/+1
| | |
| * | Add testslymanZerga112017-03-091-0/+1
| | |
* | | Merge pull request #2114 from mitmproxy/fix-websocket-serializationThomas Kriechbaumer2017-03-102-3/+34
|\ \ \ | | | | | | | | make websocket flows serializable
| * | | make websocket flows serializableThomas Kriechbaumer2017-03-092-3/+34
| | |/ | |/| | | | | | | fixes #2113
* / | disable h2c prior knowledge connectionsThomas Kriechbaumer2017-03-102-17/+39
|/ /
* | core -> core_option_validationMaximilian Hils2017-03-081-4/+4
| | | | | | | | longer, but much clearer for devs who are unfamiliar with the codebase.
* | change add_option parameter orderMaximilian Hils2017-03-082-24/+24
| | | | | | | | | | name, type, value matches natural language ($x is a bool with a default value of $y) and also matches the python type annotation order of name: type = value
* | unify server spec parsingMaximilian Hils2017-03-082-20/+33
| |
* | Carefully re-add a small number of short flagsAldo Cortesi2017-03-071-4/+6
| | | | | | | | | | 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-072-20/+22
| | | | | | | | | | | | 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.
* | Options tweaksAldo Cortesi2017-03-071-17/+17
| | | | | | | | | | | | | | - 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-071-24/+0
| | | | | | | | | | | | 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-071-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-1/+23
| |
* | Add --options that dumps annotated option defaultsAldo Cortesi2017-03-071-0/+5
| |
* | Cleanups and test coverageAldo Cortesi2017-03-073-4/+34
| |
* | Automate slurping up command-line optionsAldo Cortesi2017-03-072-9/+4
| | | | | | | | | | 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-062-19/+19
| | | | | | | | | | 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-065-40/+30
| | | | | | | | | | | | | | | | | | | | | | | | 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: streamfileAldo Cortesi2017-03-061-1/+1
| | | | | | | | | | 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-061-3/+3
| |
* | Options unification: simple stringsAldo Cortesi2017-03-063-8/+8
| | | | | | | | Move all simple string options to the new scheme. Also regularise some names.
* | Options unification: sizesAldo Cortesi2017-03-063-3/+20
| | | | | | | | | | | | | | | | | | | | | | 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: booleansAldo Cortesi2017-03-056-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-059-104/+90
|/ | | | | - Options are now explicitly initialized with an add_option method - We have one canonical Options class - ditch dump.Options
* Merge branch 'master' into on-issuesNikhil Soni2017-03-0318-421/+1022
|\
| * http2: fix h2 header normalization test (#2080)Thomas Kriechbaumer2017-03-011-69/+0
| |
| * added XSS scanner example (#1907)David Dworken2017-02-271-0/+368
| |
| * do not return IP addresses in SSLCert.altnamesThomas Kriechbaumer2017-02-261-1/+1
| |
| * certs: coverage++Thomas Kriechbaumer2017-02-262-7/+26
| |