Commit Graph

4863 Commits

Author SHA1 Message Date
Aldo Cortesi
7f8fd3cdff Basic outline of addons
Add addons.py, integrate with our event mechanism, and change the Master API so
options is the first init argument.
2016-07-13 23:26:04 +12:00
Aldo Cortesi
c9a0fe6a0e Show how options integrates with console
This is not functional at the moment, because all mutable options are still on
master.
2016-07-13 19:15:38 +12:00
Aldo Cortesi
a20f8e9620 More powerful Options scheme
This prepares us for the addon configuration mechanism and gives us a more
flexible way to handle options changes. This changeset should spell the end of
the current anti-pattern in our codebase where we duplicate data out of options
onto the master when mutability is needed. From now on, Options can be the one
source of thruth.

- Change notifications
- Rollback on error
2016-07-13 18:45:50 +12:00
Clemens Brunner
2624911d75 fixed bug (#1342)
fix minor mitmweb issues
2016-07-12 14:52:33 -07:00
Thomas Kriechbaumer
3579c6dd43 http2: fix race-condition in tests 2016-07-12 19:55:28 +02:00
Thomas Kriechbaumer
9267b2b501 Merge pull request #1345 from strohu/patch-2
Make sudo pfctl error check Python 3 compatible
2016-07-12 19:31:42 +02:00
strohu
6a9407d7cc Make sudo pfctl error check Python 3 compatible
In Python 3, subprocess.check_output() returns a sequence of bytes. This change ensures that it will be converted to a string, so the substring test for the sudo error message does not raise a TypeError. This fixes the code in Python 3 while remaining compatible with Python 2.
2016-07-12 15:47:01 +01:00
Thomas Kriechbaumer
4fd71d7bfd Merge pull request #1344 from strohu/patch-1
Fix is_ascii check when determining next layer
2016-07-12 15:54:00 +02:00
strohu
6217614204 Fix is_ascii check when determining next layer 2016-07-12 13:18:58 +01:00
Thomas Kriechbaumer
427ba88618 Merge pull request #1338 from Kriechi/http2-tests
Improve HTTP/2 test coverage
2016-07-10 20:40:46 +02:00
Thomas Kriechbaumer
7c09255298 http2: more coverage 2016-07-10 20:07:43 +02:00
Thomas Kriechbaumer
b611997619 http2: simplify test class 2016-07-10 18:53:00 +02:00
Thomas Kriechbaumer
e89defe9ad update dependency and loosen restrictions on good citizens 2016-07-10 13:38:49 +02:00
Thomas Kriechbaumer
81c450ddc8 Merge pull request #1335 from mitmproxy/travis
move OSX Travis job to py3 for snapshots
2016-07-10 13:17:42 +02:00
Thomas Kriechbaumer
c90de8b9a4 fix sysinfo for py3 2016-07-10 13:16:23 +02:00
Thomas Kriechbaumer
ff63fadf0b move OSX Travis job to py3 for snapshots 2016-07-10 12:48:48 +02:00
Thomas Kriechbaumer
6762c6f5a2 Merge pull request #1336 from dufferzafar/rtool-hotfix
rtool hotfix
2016-07-10 12:24:10 +02:00
Shadab Zafar
8135b356d6 Decode commit value in rtool 2016-07-10 15:50:13 +05:30
Thomas Kriechbaumer
22c0db3b19 revert travis osx changes 2016-07-09 22:31:12 +02:00
Maximilian Hils
dc6266e08e Merge pull request #1324 from dufferzafar/sticky-cookies
Delete stickycookies when told by the server
2016-07-09 13:20:45 -07:00
Shadab Zafar
7eade1ef7c Remove redundant tests 2016-07-10 01:08:02 +05:30
Shadab Zafar
39f5108400 Test cookies.is_expired separately 2016-07-10 01:06:50 +05:30
Shadab Zafar
c92992f03b Move cookie expiry detection to separate function 2016-07-09 22:20:25 +05:30
Shadab Zafar
6a746deff5 Add tests for deletion of stickycookies 2016-07-09 22:20:25 +05:30
Shadab Zafar
608435cabf Delete stickycookies when told by the server
Fixes #1096
2016-07-09 22:20:25 +05:30
Thomas Kriechbaumer
7efd63f94c add whitespace to improve url parsing 2016-07-09 12:17:43 +02:00
Thomas Kriechbaumer
3e2d41d507 fix pip install on osx travis 2016-07-09 11:55:52 +02:00
Thomas Kriechbaumer
3a3d9f65e6 upgrade pip on osx travis 2016-07-09 11:50:30 +02:00
Thomas Kriechbaumer
3fe5b47cf9 try to fix weird install behaviour 2016-07-09 11:44:18 +02:00
Thomas Kriechbaumer
8cfa5ad306 update osx travis 2016-07-09 11:29:25 +02:00
Thomas Kriechbaumer
aa1615eafd cleanup tox 2016-07-09 11:20:10 +02:00
Thomas Kriechbaumer
1b0a89abd2 Merge pull request #1334 from mhils/cleanup
Remove unused files
2016-07-09 11:18:34 +02:00
Maximilian Hils
718fa5bbcd remove unused files 2016-07-09 01:39:37 -07:00
Maximilian Hils
636cbfd163 Update README.rst 2016-07-09 01:33:56 -07:00
Maximilian Hils
6f0a733d62 Add Python 3.5 markers to setup.py 2016-07-09 01:29:12 -07:00
Maximilian Hils
e16a632b95 remove pathod doc leftovers 2016-07-09 01:26:06 -07:00
Thomas Kriechbaumer
695c7368e6 Merge pull request #1299 from dufferzafar/py3-dump
Python 3 - test_dump
2016-07-09 10:17:24 +02:00
Maximilian Hils
3d40fae6d7 travis: move osx test to the top
OSX is the slow one, so it should start straight away.
2016-07-09 01:05:04 -07:00
Shadab Zafar
83a1cc5a9a Make escape_control_characters handle strings on Py2 2016-07-09 13:28:20 +05:30
Shadab Zafar
bd58230178 Remove py35 section from tox.ini 2016-07-09 12:51:43 +05:30
Shadab Zafar
0a21d27004 strutils.hexdump returns native_strings 2016-07-09 12:43:21 +05:30
Shadab Zafar
c7cbbf5f0d Set verbosity & flow_detail to 0 2016-07-09 12:32:41 +05:30
Shadab Zafar
147f61fa62 py3++ 2016-07-09 11:14:12 +05:30
Shadab Zafar
b4469d2579 py3++: test_dump 2016-07-09 11:14:12 +05:30
Maximilian Hils
15c10d49f6 Merge pull request #1327 from mitmproxy/remove-script-context
Remove script context
2016-07-08 20:11:12 -07:00
Maximilian Hils
5d2b7c52f9 move script context to mitmproxy.ctx 2016-07-08 19:57:57 -07:00
Maximilian Hils
f7639e077a py3++ 2016-07-08 15:58:12 -07:00
Maximilian Hils
0a1431ed2c fix #1314 2016-07-08 15:50:11 -07:00
Maximilian Hils
035f989890 Merge pull request #1330 from jpkrause/master
Added flow converters for versions 0.11 and 0.12
2016-07-08 15:29:37 -07:00
jpkrause
05ab9c1b37 Updated coding style and modified flow format compat test to use v0.11 and v0.10 dump files 2016-07-08 15:03:36 -07:00