Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-24 00:31:33 +00:00
Code Issues Projects Releases Wiki Activity
2,040 Commits 1 Branch 67 Tags 50 MiB
9bffd9cf03
Commit Graph

1440 Commits

Author SHA1 Message Date
Kyle Morton
f0ad1f334c Enabling upstream server verification. Added flags --verify_upstream_cert, 
--upstream-trusted-cadir, and --upstream-trusted-ca.
 2015-06-29 11:00:20 -07:00
Maximilian Hils
b369962cbe remove certforward feature 
The certforward feature was implemented to support #gotofail,
which only works on unpatched iOS devices. Given that many apps don't
support iOS 7 anymore, jailbreak+ssl killswitch is usually the better option.
By removing certforward, we can make netlib a pure python module again,
which significantly simplifies distribution.
 2015-06-26 13:27:40 +02:00
Aldo Cortesi
876252eba8 Remove stray print & massage whitespace a bit 2015-06-25 10:27:22 +12:00
Thomas Kriechbaumer
14e49f4fc7 unify SSL version/method handling 2015-06-23 12:05:34 +02:00
iroiro123
fbb23b5c9f changed error handling (ssl spoof mode) 2015-06-23 01:49:22 +09:00
iroiro123
fd90367329 SSL Spoof mode 2015-06-21 00:51:56 +09:00
iroiro123
378aa78324 Spoof mode 2015-06-20 21:43:50 +09:00
iroiro123
59ec291b6c HTTP Transparent Proxy 2015-06-18 23:53:27 +09:00
Aldo Cortesi
7890450b0c Handle invalid IDNA encoding in hostnames 
Fixes #622
 2015-06-12 16:00:16 +12:00
Jake Drahos
946030367f Added unmark all functionality 
- 'U' to unmark all marked flows
 2015-06-11 20:31:54 -05:00
Jake Drahos
2a6698bf5a Moved marking from flow to console 
No longer taints the flow primitive
 2015-06-11 20:27:33 -05:00
Jake Drahos
dd1e401e01 Changed mark symbol 
Smaller symbol now, still just as easy to see while scrolling
 2015-06-11 16:33:46 -05:00
Jake Drahos
486177edc7 Added functionality to write marked flows to file 
w (write) -> m (marked)
 2015-06-11 16:25:28 -05:00
Jake Drahos
122ee88021 Unmark duplicated flows 
If a marked flow is duplicated, the duplicate will now be unmarked
 2015-06-11 12:52:15 -05:00
Jake Drahos
13e71eba10 Changed symbols and colors 
Added a better symbol for the mark, and changed the color to red. This helps it
stand out more easily.
 2015-06-11 12:02:15 -05:00
Jake Drahos
a34eeb9a28 Fixed console rendering bug 
Clearing all flows now works properly
 2015-06-11 11:49:23 -05:00
Jake Drahos
e53a2426c1 Marked flows not deleted on clear all 
Marked flows survive a clear all unless all current flows are marked.

Bug: They don't show up until another flow is added
 2015-06-11 11:40:03 -05:00
Jake Drahos
8b998cfbea Implemented basic marking of flows 
- Press m to toggle flow mark
- Flow mark is set in libmproxy/console/common.py. Currently set to "==="
 2015-06-11 10:27:48 -05:00
Maximilian Hils
d389b9c59d fix #615 2015-06-08 19:01:32 +02:00
Maximilian Hils
083b404bba fix #618 2015-06-08 18:26:02 +02:00
Marcelo Glezer
1befa9477c fix #607 fix message 2015-06-05 15:33:36 -03:00
Marcelo Glezer
17b34de28d fix #607 decode data before sending it to pyperclip 2015-06-05 15:19:57 -03:00
Aldo Cortesi
783e904b92 Merge pull request #603 from Kriechi/remove-contrib 
replace contrib libraries with pypi dependencies
 2015-06-04 13:30:18 +12:00
Aldo Cortesi
249bb4a2ac Bump version 2015-06-04 11:15:29 +12:00
Thomas Kriechbaumer
fbb2633dd3 replace contrib libraries with pypi dependencies 2015-06-02 10:00:34 +02:00
Aldo Cortesi
0b8cddddf5 console: click-enable tabs 2015-06-02 15:25:58 +12:00
Aldo Cortesi
57a61ae8fd console: convert add_event to a signal. 2015-06-02 13:45:19 +12:00
Aldo Cortesi
776f0a9669 Minor typo in script error. 2015-06-02 11:58:16 +12:00
Aldo Cortesi
1076c25e5b console: click in flow list to view flow 2015-06-02 11:27:26 +12:00
Aldo Cortesi
b5bb4106fd console: mouse scrollwheel throughout. 2015-06-02 11:13:12 +12:00
Aldo Cortesi
62330e4b0f Enable mouse interaction, add a hint for selecting text. 
Fixes #597
 2015-06-02 11:05:45 +12:00
Marcelo Glezer
14bce0dd12 fixes #604 catch method not found for handling pyperclip not found 2015-06-01 12:06:46 -03:00
Aldo Cortesi
7439e244a6 Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy 2015-06-01 12:32:03 +12:00
Jim Shaver
07cc7f6f50 reverting change in libmproxy/contrib/pyparsing.py 2015-05-31 08:09:03 -04:00
Jim Shaver
bd019a7124 revert changes in ncontrib 2015-05-31 07:59:00 -04:00
Jim Shaver
b51363b3ca Merge remote-tracking branch 'upstream/master' into print-bracket-fix 
Conflicts:
	examples/har_extractor.py
	examples/nonblocking.py
	examples/read_dumpfile
	libmproxy/web/app.py
 2015-05-31 01:21:44 -04:00
Aldo Cortesi
6c3233ce0c Appease the code style gods. 2015-05-31 13:16:03 +12:00
Aldo Cortesi
13ee54da86 Remove dependency on PyOpenSSL, move version check into netlib. 
There are a few more functions in the code that accesses PyOpenSSL
directly that should probably also be moved to netlib. Later.
 2015-05-31 13:13:12 +12:00
Jim Shaver
4fe2c069cc Fixed print function to be inline with python 3 2015-05-29 23:17:48 -04:00
Aldo Cortesi
a05a70d816 Add coding style check, reformat. 2015-05-30 12:03:28 +12:00
Aldo Cortesi
1a106f4080 Ensure that flow/view state is consistent. 
Fixes #595 and #592
 2015-05-29 11:36:56 +12:00
Aldo Cortesi
99c691def5 Post-release version bump, and checklist addition. 2015-05-26 10:44:52 +12:00
Aldo Cortesi
14341ffa19 Merge pull request #584 from dlethin/feature/http_1_0 
Make sure proxy returns the httpversion specified in the request
 2015-05-18 11:03:05 +12:00
Aldo Cortesi
33169d610c Release pep: bump version, changelog, contributors 2015-05-18 10:44:09 +12:00
Doug Lethin
cdff79fd4c Make sure proxy returns the httpversion specified in the request rather 
than hardcoding to 1.1.
 2015-05-15 22:20:09 -04:00
Nick Raptis
202ede3c54 Accurately timestamp start of request 
When building a request from a stream, try to get an accurate
start timestamp from the Reader. This was already in the code
and also used when building response objects, but was ommited
in commit ddf458b330

Without his logic and when the client is reusing a connection
to send requests, the timestamp_start of subsequent requests
is early and equal to when the connection started read blocking
 2015-05-08 10:58:05 +03:00
Aldo Cortesi
e1d3ebb446 Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy 2015-05-02 17:20:09 +12:00
Aldo Cortesi
50b7bfaadc Adapt to new Pathoc API - silence output to stdout. 2015-05-02 16:46:15 +12:00
Maximilian Hils
bb965b8e34 web: try harder to fix editor 2015-05-01 20:45:31 +02:00
Maximilian Hils
c780fc7bdf Merge branch 'master' of github.com:mitmproxy/mitmproxy 2015-05-01 17:25:00 +02:00