Maximilian Hils
dd91cd464c
add read-only flag, add ability to skip auth
2013-08-19 09:44:42 +02:00
Maximilian Hils
37f144ccd4
add webapp authentication
2013-08-19 00:31:59 +02:00
Maximilian Hils
3785f0cb1e
don't remove flows from state when using the webapp
2013-08-18 19:45:27 +02:00
Maximilian Hils
ba3e7db956
more work on the webapp
2013-08-18 19:43:33 +02:00
Maximilian Hils
6713602c46
add read-only command line flag
2013-08-18 11:40:13 +02:00
Maximilian Hils
01660953f1
Merge branch 'master' into integrate_honeyproxy
2013-08-17 13:29:24 +02:00
Maximilian Hils
e6a1e959a0
further simplify argument parsing, adjust tests
2013-08-17 13:24:49 +02:00
Maximilian Hils
f6f66c0daa
simplify argument parsing
2013-08-14 17:16:14 +02:00
Maximilian Hils
017b4dae30
minor improvements
2013-08-14 16:22:28 +02:00
Maximilian Hils
c300e0c827
improve verbosity handling, remove code duplication
2013-08-13 15:20:24 +02:00
Maximilian Hils
63a3000439
move version into common options
2013-08-13 14:37:35 +02:00
Maximilian Hils
d40e199fba
Merge branch 'master' into integrate_honeyproxy
2013-08-13 14:22:31 +02:00
Maximilian Hils
c60a1064c2
HoneyProxy -> mitmproxy
2013-08-13 14:15:00 +02:00
Maximilian Hils
4cd8061717
move non-submodule libraries
2013-08-13 13:39:16 +02:00
Maximilian Hils
8585041045
add util submodule (fck git)
2013-08-13 13:37:03 +02:00
Maximilian Hils
a1e9812e84
add submodules under different directory again
2013-08-13 13:28:37 +02:00
Maximilian Hils
868dde3cc6
remove submodules
2013-08-13 13:22:16 +02:00
Maximilian Hils
bdf56ba7b0
add JS libraries
2013-08-13 12:28:28 +02:00
Aldo Cortesi
f850bdd848
Revamp dummy cert store
...
We no longer keep these on disk. This is for a number of reasons, including
some race conditions and the fact that some valid IDNA-encoded domain names are
not valid file names on Windows.
2013-08-12 16:04:02 +12:00
Aldo Cortesi
2c4e5e0a73
Better handling of cert errors on connection.
2013-08-10 23:07:22 +12:00
Maximilian Hils
2c697b0729
add submodules
2013-08-07 19:31:34 +02:00
Maximilian Hils
890cc65063
fix erroneous revision
2013-08-07 19:06:57 +02:00
Maximilian Hils
a8fd1d1dde
import HoneyProxy GUI
2013-08-07 19:03:36 +02:00
Aldo Cortesi
edb10e33aa
Remove GPL notices left in source files after our change to the MIT license.
...
Thanks to Roy Shamir for reporting this.
2013-08-01 11:08:00 +12:00
Aldo Cortesi
439d9a294c
Make use of a change to netlib.tcp that clarifies error conditions for flush and close.
...
Should fix #144 .
2013-07-30 09:42:29 +12:00
Aldo Cortesi
5f0b5532bc
Show an error when attempting to decode invalid data.
2013-07-29 18:14:11 +12:00
Aldo Cortesi
d54398cc79
Repair minor user interface issue that caused brief flashes of duplicate flows in the flow list.
2013-07-29 12:38:41 +12:00
Maximilian Hils
29bcbd57d5
fix #144
...
netlib wraps IOError in NetLibDisconnect, so we need to cover this as well.
2013-07-28 21:05:17 +02:00
Aldo Cortesi
a21c989ccd
Fix startup with no state.
...
Bug introduced in previous patch.
2013-07-28 22:40:51 +12:00
Aldo Cortesi
df3d2d70ed
Terminate can be called on an unconnected server connection.
2013-07-28 18:05:04 +12:00
Aldo Cortesi
10a9e3365f
Some refactoring of the console inteface.
...
Reduce some state duplication, by removing currentflow variable.
Fixes #141
2013-07-28 18:00:49 +12:00
Aldo Cortesi
10b744ee08
Properly terminate SSL server connections.
...
Before, we had dangling SSL server connections causing resource exhaustion.
I believe this fixe #144 and #153
2013-07-28 10:50:25 +12:00
Aldo Cortesi
5c1157ddaf
Move app instantiation out of proxy.py.
2013-07-24 10:32:56 +12:00
Aldo Cortesi
64ce3b358f
Make a start on mitmproxy web app.
2013-07-23 10:28:35 +12:00
Aldo Cortesi
55f7e8d5b9
Don't take minor version into account when checking serialized data compatiblity.
2013-07-13 14:44:09 +12:00
Aldo Cortesi
c4d03d8b85
Merge pull request #137 from caujka/master
...
Handling for EOF reading error in gzipped content
2013-07-01 17:37:15 -07:00
Matthias Urlichs
d9cc6f1dd6
proxy.py: Catch channel.ask() returning None when terminating
2013-06-28 07:53:56 +02:00
Matthias Urlichs
be1377850e
Close connection when flush fails
2013-06-26 15:02:55 +02:00
Oleksandr Sheremet
0afd3fc42f
Added handling for EOF reading error in gzipped content.
2013-06-17 21:46:54 +03:00
Maximilian Hils
d462b444b7
update tests to reflect changes to options.scripts
2013-06-17 16:48:06 +02:00
Maximilian Hils
84248d431b
fix send_error behavior if there are no headers
2013-06-17 10:52:19 +02:00
Aldo Cortesi
886970040b
Revert "Use lsof instead of pfctl to find target host on OSX in transparent mode."
...
This reverts commit ffeede9b39
2013-06-16 16:23:36 +12:00
Aldo Cortesi
db43f1ffcc
Version bump, doc extension, URLs to github.com/mitmproxy/*
2013-06-16 13:59:01 +12:00
Maximilian Hils
fd36142018
Merge remote-tracking branch 'origin/scripts_improvements' into 0.10
2013-06-16 00:41:43 +02:00
Maximilian Hils
ba47690a03
always read files in binary mode
2013-06-16 00:23:44 +02:00
Maximilian Hils
2b4af8d475
add support for multiple scripts and script arguments. refs #76
2013-06-13 16:09:38 +02:00
Aldo Cortesi
d3beaa7382
Merge pull request #132 from ipopov/master
...
A humble pull request
2013-06-08 16:28:47 -07:00
Aldo Cortesi
1a5c27aa7d
Massage content-type before sending it to mime detection
...
Fixes #67
2013-06-09 11:26:44 +12:00
Aldo Cortesi
7ef68b5a13
Fix creation of new response when none existed before.
...
Fixes #133
2013-06-09 11:14:34 +12:00
Ivaylo Popov
ffeede9b39
Use lsof instead of pfctl to find target host on OSX in transparent mode.
2013-05-27 23:09:42 -04:00
