Maximilian Hils
0d98b9dcc5
finalize script reloading 🎉
2015-11-14 05:57:02 +01:00
Maximilian Hils
4499ab61c0
structure libmproxy.script
2015-11-14 04:21:38 +01:00
Maximilian Hils
247f27d821
minor stylistic fixes
2015-11-14 03:46:34 +01:00
Maximilian Hils
dce469d4c1
Merge pull request #833 from zbuc/contentview_scripts
...
Contentview scripts
2015-11-13 18:41:05 -08:00
Maximilian Hils
3cd709d982
Merge pull request #821 from zbuc/protobuf_contentview_test_fix
...
Fix failing protobuf contentview test
2015-11-13 18:35:10 -08:00
Chris Czub
e72a9a62a1
Feedback from PR #832
2015-11-13 16:55:27 -05:00
Chris Czub
d3feaa3bc6
Add custom content view plugin support for mitmproxy/mitmdump
2015-11-13 15:09:05 -05:00
Chris Czub
d7239d665e
Add new contentviews' content type mappings
2015-11-13 15:08:52 -05:00
Chris Czub
82a90511bc
Add "add" ContentView method & test
2015-11-13 15:07:56 -05:00
Maximilian Hils
f62d564cfb
be more conservative about dependency versions
...
We had various examples in the past where new releases break mitmproxy completely. Just as of today, the lxml guys pushed a new release to pypi, but did not include wheels - you cannot install mitmproxy on Windows without a compiler installed now.
2015-11-13 19:57:02 +01:00
Matthew Shao
cd0b9e01be
Decouple libmproxy.script from libmproxy.flow
2015-11-13 21:08:39 +08:00
Matthew Shao
2522ba69fa
Move the observer initalization to the constructor of Script
...
class.Should work with both mitmproxy and mitmdump now.
Change the names in PEP8 style.
2015-11-11 20:59:12 +08:00
Matthew Shao
3f6521f912
Use watchdog to reload scripts automatically.
2015-11-11 09:03:05 +08:00
Maximilian Hils
3739e1fe82
fix scripteditor bug
2015-11-10 04:48:30 +01:00
Maximilian Hils
59d3e9d954
docs++
2015-11-07 20:43:10 +01:00
Maximilian Hils
9298325ca5
Merge pull request #822 from ddworken/master
...
Added information on cert pinning (Fixes #689 )
2015-11-07 11:30:28 -08:00
David Dworken
96465075f4
Added information on cert pinning ( Fixes #689 )
2015-11-06 21:23:10 -05:00
Aldo Cortesi
58aeb2b843
Bump version for next release cycle
2015-11-07 09:30:38 +13:00
Chris Czub
b0648ee8a6
Fix failing protobuf contentview test
2015-11-06 11:18:48 -05:00
Aldo Cortesi
9beae933ba
Bump version, update CONTRIBUTORS, CHANGELOG
2015-11-06 13:52:08 +13:00
Aldo Cortesi
f16f2b9ce3
Adjust pyinstaller spec paths
2015-11-06 11:44:37 +13:00
Aldo Cortesi
6135e16482
Catch and ignore thread errors on exit
...
Keyboard interrupts bugger up Queues in some way, which causes a traceback on
exit in many of our tools. The issue seems easiest to reproduce with binary
builds on OSX.
2015-11-06 11:35:54 +13:00
Maximilian Hils
de5df2e4d4
Merge pull request #819 from tekii/hotfix-broken-copy
...
fix copy to clipboard command when copying content
2015-11-05 04:17:08 +01:00
Marcelo Glezer
6b6b0a9416
fix copy to clipboard command when copying content
2015-11-05 00:09:22 -03:00
Maximilian Hils
fb463f50ed
Merge pull request #809 from zbuc/pfctl_errhandling
...
Better error handling/reporting for pfctl failures on OS X
2015-11-04 21:32:12 +01:00
Chris Czub
9398d5896b
PR 809 make code more pythonic
2015-11-04 15:04:18 -05:00
Maximilian Hils
c62abd67d2
docs: fix broken graphic
2015-11-02 13:04:35 +01:00
Maximilian Hils
96db5edc5c
docs: improve mode flowchart
2015-11-02 11:50:08 +01:00
Maximilian Hils
51a3378290
improve reverse proxy docs
2015-11-02 10:47:14 +01:00
Maximilian Hils
07b60acb7f
try to fix appveyor race conditions in tests
2015-11-01 18:44:50 +01:00
Maximilian Hils
1bf34e6f45
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-11-01 18:39:55 +01:00
Maximilian Hils
978eb17d66
fix #811
2015-11-01 18:37:20 +01:00
Maximilian Hils
5e90459569
Merge pull request #810 from gecko655/ctrl_fb
...
Use ctrl+f and ctrl+b to scroll a page
2015-10-31 18:00:14 +01:00
gecko655
6aa7454f92
Use ctrl+f and ctrl+b to scroll a page
2015-10-30 12:48:38 +09:00
Chris Czub
88451ef245
Declare & define insufficient_priv
2015-10-29 16:01:24 -04:00
Chris Czub
70c28f5d34
Better error handling/reporting for pfctl failures on OS X
2015-10-29 15:56:43 -04:00
Maximilian Hils
65c08ec899
Merge pull request #791 from tunz/master
...
Prevent flowview from creating duplicated windows
2015-10-28 13:10:38 +01:00
Maximilian Hils
8e9cd77b55
Merge pull request #805 from Badg/patch-1
...
Update ubuntu installation to includ libjpeg
2015-10-23 03:25:23 +02:00
Nick Badger
4537d561c6
Ubuntu install missing libjpeg8-dev, zlib1g-dev
...
As per https://pillow.readthedocs.org/en/3.0.0/installation.html#linux-installation , to avoid missing install dependencies.
2015-10-22 18:11:06 -07:00
Nick Badger
a6fee43384
Update ubuntu installation to includ libjpeg
...
Otherwise install fails with error "--enable-jpeg requested but jpeg not found"
2015-10-22 17:38:55 -07:00
Maximilian Hils
ed56eadd28
Merge branch 'master' of https://github.com/mitmproxy/mitmproxy
2015-10-22 02:38:14 +02:00
Maximilian Hils
726b70ccdc
fix #800
2015-10-22 02:38:00 +02:00
Maximilian Hils
4d772d7ce0
Merge pull request #801 from ben-lerner/doc_fix
...
doc typo fix
2015-10-14 09:37:24 +02:00
Ben Lerner
22191d63ab
doc typo fix
2015-10-13 21:09:56 -04:00
Maximilian Hils
7d8191ee37
update web builds, use watchify
2015-10-08 12:43:55 +02:00
Maximilian Hils
442f079e0b
Merge pull request #797 from colinbendell/colinbendell-patch-1
...
server_conn.address might not yet be established
2015-10-08 12:37:43 +02:00
Choongwoo Han
9c0efdf2ec
Refresh flowview instead of reopen the same flowview
2015-10-08 11:31:33 +09:00
Colin Bendell
a85e4bc75c
default should not be None
...
Fixed default value when self.address has not been set
2015-10-07 21:46:08 -04:00
Colin Bendell
77aeac11a9
Check if server connection hasn't yet been initiated
...
This fixes #761 when NoneType error is thrown when non-TLS requests initiate a client request but the server connection hasn't yet been initiated.
2015-10-07 20:30:31 -04:00
Maximilian Hils
09e36fae4e
Merge pull request #792 from tunz/patch-1
...
Correct a wrong link in CONTRIBUTING.md
2015-10-04 10:36:52 +02:00
