Maximilian Hils
d15ddfad14
fix contentview attributes
2016-11-23 22:47:36 +01:00
Maximilian Hils
5d209e5040
Merge commit '9bc5adf'
2016-11-23 22:45:21 +01:00
Thomas Kriechbaumer
48d54e2d4a
bump cryptography dependency
2016-11-23 11:55:11 +01:00
Thomas Kriechbaumer
9bc5adfb03
add more websocket indicators to mitmproxy and mitmdump
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
4b04566a34
add metadata info to flow detail view
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
ea97f62975
websocket: show messages in the eventlog
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
3353aa3cfd
fix docs
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
d3bd04dec0
disable TCP support for now
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
5dfc199086
websocket: add tests
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
4beb693c9c
websocket: change cmdline option
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
aaa4ccc284
websocket: add event documentation
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
3d8f3d4c23
add WebSocket flows and messages
2016-11-23 10:18:45 +01:00
Thomas Kriechbaumer
ffb3988dc9
rename WebSocket{s,} protocol
2016-11-23 10:18:45 +01:00
Maximilian Hils
a6c608e085
make the new mypy release happy
2016-11-23 01:27:23 +01:00
Maximilian Hils
8ba5f40d76
Update README.md
2016-11-22 23:30:57 +01:00
Maximilian Hils
39b24a5bab
Update README.md
2016-11-22 23:11:57 +01:00
Maximilian Hils
40f0193dda
remove mitmweb auth
...
9b08279c7c
2016-11-22 18:27:16 +01:00
Maximilian Hils
21a03d56b5
don't set an empty ALPN, refs #1772
2016-11-22 17:02:37 +01:00
Maximilian Hils
92516a3b5c
Merge pull request #1769 from mhils/update-pydivert
...
update pydivert, fix #1749
2016-11-21 14:40:11 +01:00
Maximilian Hils
f644665cd9
update pydivert, fix #1749
2016-11-21 14:14:52 +01:00
Yoginski
ebff5f2466
Descriptive error message for SSL context initialization failure ( #1767 )
2016-11-21 09:40:09 +01:00
Maximilian Hils
c90405253a
remove stickycookie example
...
The recommended way to do this is mitmproxy/addons/stickycookie.py
2016-11-21 02:46:25 +01:00
Maximilian Hils
2138be8705
Merge pull request #1768 from mhils/organize-examples
...
Organize Examples
2016-11-21 02:42:15 +01:00
Maximilian Hils
9af8f4bb31
organize examples
...
This commit is largely based on work by Thiago Arrais (@thiagoarrais)
and Shane Bradfield (@l33tLumberjack). I wasn't really able to get their
PR reasonably merged onto the latest master, so I reapplied their changes
manually here and did some further improvements on that.
2016-11-21 02:28:10 +01:00
Maximilian Hils
f74e561524
rewrite absolute-form HTTP requests to relative form, fix #1759 ( #1765 )
2016-11-20 17:21:21 +01:00
Thomas Kriechbaumer
79c753d8f8
Merge pull request #1766 from Kriechi/fix-test-race
...
tests: fix race condition
2016-11-20 17:02:49 +01:00
Thomas Kriechbaumer
f45034e8f1
tests: fix race condition
2016-11-20 17:02:26 +01:00
Edgar Boda-Majer
078f36d86a
handle SIGINT with a quit prompt ( #1760 )
2016-11-20 16:40:04 +01:00
Thomas Kriechbaumer
b6e419d640
Merge pull request #1751 from dwfreed/patch-1
...
proxy/protocol/base: Allow spoofing fixed source
2016-11-19 23:00:36 +01:00
Thomas Kriechbaumer
3ea38e6aa4
Merge pull request #1757 from fotinakis/master
...
Remove dead run_scripthooks example reference.
2016-11-19 22:54:42 +01:00
Doug Freed
0ff1967226
proxy/protocol/base: Allow spoofing fixed source
...
Allow combining --spoof-source-address and --upstream-bind-address to
spoof a fixed source address. Also update the help text for
--spoof-source-address to indicate this new possibility.
2016-11-18 14:46:32 +00:00
Thomas Kriechbaumer
d6cfd93357
Merge pull request #1753 from mitmproxy/update-dependencies
...
Update Dependencies
2016-11-18 13:02:58 +01:00
Maximilian Hils
5ce370e2a9
lint!
2016-11-18 12:59:59 +01:00
Maximilian Hils
e8067a2474
update dependencies
2016-11-18 12:59:59 +01:00
Mike Fotinakis
d16a3753d7
Remove dead run_scripthooks example reference.
2016-11-17 16:33:51 -08:00
Maximilian Hils
83fe8b5302
Merge pull request #1729 from mhils/mitmweb-fixes
...
minor fixes
2016-11-16 22:26:17 +01:00
Maximilian Hils
5601338a17
Merge pull request #1752 from dwfreed/patch-2
...
setup.py: adjust mypy-lang dependency for semver
2016-11-16 18:08:58 +01:00
Maximilian Hils
2ee8bc2f1a
fix type checks
2016-11-16 17:19:38 +01:00
Maximilian Hils
de6bf175e2
mitmweb: start browser on startup
2016-11-16 15:09:54 +01:00
Maximilian Hils
677789a617
minor fixes
2016-11-16 15:09:53 +01:00
Doug Freed
6b6e64e09e
setup.py: adjust mypy-lang dependency for semver
...
Looks like the previous form was a typo.
2016-11-16 13:54:10 +00:00
Maximilian Hils
47ec1c9570
Merge pull request #1742 from dwfreed/patch-2
...
Make the upstream bind address a separate option
2016-11-16 13:37:12 +01:00
Thomas Kriechbaumer
3d26bd4aa1
Merge pull request #1748 from Kriechi/better-onboarding
...
add macOS/OSX installation instructions to onboarding page
2016-11-16 13:04:07 +01:00
Thomas Kriechbaumer
d7a22d92ec
add macOS/OSX installation instructions to onboarding page
2016-11-16 11:05:52 +01:00
Aldo Cortesi
92607c2109
Merge pull request #1743 from cortesi/viewsig
...
addons.view: clarify modification events
2016-11-15 10:42:23 +13:00
Aldo Cortesi
8065b44eed
addons.view: clarify modification events
...
This adds a set of store modification events, and uses them for flow settings.
This addresses a bug where settings could persist even after flows were deleted.
2016-11-15 09:53:17 +13:00
Doug Freed
4cfda51c37
proxy/protocol/base: use upstream_bind_address
...
Use the upstream_bind_address option, instead of listen_host.
2016-11-14 12:12:48 +00:00
Doug Freed
f89671a33b
tools/cmdline: add upstream bind address option
...
Allow specifying the upstream bind address on the command line.
2016-11-14 12:12:48 +00:00
Doug Freed
078bd532c3
options: add upstream_bind_address
...
Add upstream_bind_address to the options object
2016-11-14 12:12:48 +00:00
Aldo Cortesi
055a0b7198
Merge pull request #1740 from pquentin/master
...
docs: Fix typos
2016-11-14 19:02:03 +13:00
