Aldo Cortesi
|
becc790d83
|
Merge pull request #645 from elitest/hardfailvenv
Add a check to see if virtualenv is installed.
|
2015-06-24 15:10:41 +12:00 |
|
Jim Shaver
|
080e453425
|
Merge branch 'master' into hardfailvenv
Conflicts:
dev
|
2015-06-23 21:48:05 -05:00 |
|
Jim Shaver
|
db5c0b210b
|
merged with upstream changes in dev
|
2015-06-23 20:50:51 -05:00 |
|
Jim Shaver
|
854dc004ee
|
revert change, already done on master.
|
2015-06-23 20:47:36 -05:00 |
|
Jim Shaver
|
951fe2f7ed
|
Add a check to see if virtualenv is installed.
|
2015-06-23 20:17:57 -05:00 |
|
Aldo Cortesi
|
074d8d7c74
|
Merge pull request #640 from Kriechi/ssl-version-handling
unify SSL version/method handling
|
2015-06-23 22:20:10 +12:00 |
|
Thomas Kriechbaumer
|
14e49f4fc7
|
unify SSL version/method handling
|
2015-06-23 12:05:34 +02:00 |
|
Aldo Cortesi
|
2c928181e8
|
Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy
|
2015-06-23 14:01:50 +12:00 |
|
Aldo Cortesi
|
237e05c823
|
Travis to Slack
|
2015-06-23 14:01:31 +12:00 |
|
Aldo Cortesi
|
e2069d52a8
|
Merge pull request #638 from iroiro123/http-transparent
HTTP Transparent Proxy
|
2015-06-23 09:40:25 +12:00 |
|
iroiro123
|
fbb23b5c9f
|
changed error handling (ssl spoof mode)
|
2015-06-23 01:49:22 +09:00 |
|
iroiro123
|
5c7fa7a594
|
add unit tests for spoof mode
|
2015-06-23 00:57:33 +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 |
|
Maximilian Hils
|
159543dd2b
|
Update README.mkd
|
2015-06-18 18:10:06 +02:00 |
|
iroiro123
|
59ec291b6c
|
HTTP Transparent Proxy
|
2015-06-18 23:53:27 +09:00 |
|
Thomas Kriechbaumer
|
e9fecbf830
|
add landscape/prospector config
|
2015-06-18 10:31:27 +02:00 |
|
Maximilian Hils
|
36d7e3fcd6
|
Update README.mkd
|
2015-06-16 03:05:21 +02:00 |
|
Thomas Kriechbaumer
|
5fea5d7813
|
fix pep8 config
|
2015-06-15 12:01:42 +02:00 |
|
Aldo Cortesi
|
7890450b0c
|
Handle invalid IDNA encoding in hostnames
Fixes #622
|
2015-06-12 16:00:16 +12:00 |
|
Aldo Cortesi
|
fcc1558180
|
Fix typo in docs - thanks to Jim_Showalter@intuit.com
|
2015-06-12 14:15:26 +12:00 |
|
Aldo Cortesi
|
85e1ae7543
|
Merge pull request #624 from drahosj/master
Added flow marking functionality in the console
|
2015-06-12 13:53:07 +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
|
f2d7a6aa57
|
Merge remote-tracking branch 'origin/master'
Conflicts:
libmproxy/console/flowlist.py
|
2015-06-11 16:34:53 -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
|
d45d0ce22a
|
Added functionality to write marked flows to file
w (write) -> m (marked)
|
2015-06-11 16:15:24 -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 |
|
Thomas Kriechbaumer
|
c59f045bd9
|
import travis config from netlib
this enables ALPN support with OpenSSL 1.0.2
|
2015-06-08 13:39:46 +02:00 |
|
David Weinstein
|
9b70d4bd2a
|
Merge pull request #613 from dweinstein/patch/docker-tweaks
match name of automated build base img
|
2015-06-07 21:43:26 -04:00 |
|
David Weinstein
|
84b4ca6a65
|
match name of automated build base img
|
2015-06-07 11:06:47 -04:00 |
|
Aldo Cortesi
|
60ee1dd3aa
|
Merge pull request #611 from dweinstein/feature/dockerfiles
initial add of docker mitmproxy
|
2015-06-07 10:12:49 +12:00 |
|
David Weinstein
|
3bd36b58e5
|
initial add of docker mitmproxy
|
2015-06-06 00:14:53 -04:00 |
|
Aldo Cortesi
|
bf7b76a997
|
Merge pull request #610 from tekii/fix-607
Fix 607
|
2015-06-06 11:10:33 +12: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 |
|
Aldo Cortesi
|
946fd375fa
|
Changelog for v0.12.1
|
2015-06-03 09:33:09 +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 |
|