Aldo Cortesi
6d1f036021
Merge remote-tracking branch 'upstream/master'
2016-09-30 11:02:08 +10:00
Aldo Cortesi
825b0917bd
docs: minor formatting/cleanups
2016-09-30 10:59:40 +10:00
Aldo Cortesi
e8aca92ef1
docs: remove auto-generated stubs
...
These are too verbose/low info for these docs. We should include pointers to
where to start reading the code, and perhaps later we can include full
auto-generated API docs separately.
2016-09-30 09:54:35 +10:00
Aldo Cortesi
7998c1ff86
docs: make sidebar headings more legible
2016-09-30 09:34:24 +10:00
Maximilian Hils
d068000f16
fix typo
2016-09-28 17:44:48 -07:00
Maximilian Hils
e0cd33b586
fix host header modification, refs #1571
2016-09-28 11:06:39 -07:00
Aldo Cortesi
070aa27cf5
parse_set_cookie header returns an empty list if no cookies are found
...
This matches parse_cookie, and is more idiomatic.
2016-09-28 15:10:31 +10:00
Aldo Cortesi
b21f076cc8
Merge branch 'multi-cookie' of https://github.com/dufferzafar/mitmproxy
2016-09-28 12:44:40 +10:00
Maximilian Hils
1ed0dbddbc
Merge pull request #1571 from rofreg/server-sni-flag
...
Add command line arg to force specific SNI
2016-09-27 16:00:14 -07:00
Shadab Zafar
fba7fe101e
Clarify that 'expires' values MUST have a comma now
2016-09-27 21:28:54 +05:30
Shadab Zafar
5383c15ff2
Add tests for comma separated Set-Cookies
2016-09-27 21:28:54 +05:30
Shadab Zafar
6e6ed35e3e
Modify format_set_cookie_header to take cookie list
...
and return a comma separated string of cookies
2016-09-27 21:28:51 +05:30
Ryan Laughlin
ad6d675b20
In reverse proxy mode, always send SNI
2016-09-27 10:49:04 -04:00
Shadab Zafar
a104d65851
Fixup an error with indices
2016-09-27 16:44:09 +05:30
Shadab Zafar
e8ffc5167b
Can't have , in the sticky cookie test
...
Since we support comma separated cookies now
2016-09-27 16:44:09 +05:30
Shadab Zafar
9ec0790271
Make needed changes in tests
2016-09-27 16:44:09 +05:30
Shadab Zafar
fd4f662871
Refactor functions
2016-09-27 16:44:09 +05:30
Shadab Zafar
06804e5448
Add a new pairs reader for SetCookie headers
2016-09-27 16:44:09 +05:30
Shadab Zafar
7802a0ba22
Rename _read_pairs to _read_cookie_pairs
...
We will have a separate _read_set_cookie_pairs
2016-09-27 16:44:09 +05:30
Shadab Zafar
90a48ccc06
Rename _read_token to _read_key
...
Since we also have a _read_value
2016-09-27 16:44:09 +05:30
Shadab Zafar
29046e6b48
Move CookieAttrs and SetCookie to top
2016-09-27 16:44:09 +05:30
Shadab Zafar
734a7d8a68
Minor refactor
2016-09-27 16:44:09 +05:30
Shadab Zafar
85bf5e18f6
Update cookie tests
...
This is needed since _read_pairs now returns a list of cookies each of which
is a list of [name, value] tuples.
2016-09-27 16:44:08 +05:30
Shadab Zafar
e80b2af4ae
Add support for comma separated cookies
2016-09-27 16:44:08 +05:30
Thomas Kriechbaumer
160f158372
Merge pull request #1583 from mhils/patch-makesocket
...
allow socket creation monkeypatchs
2016-09-27 10:03:41 +02:00
Maximilian Hils
24ceb0f7ac
allow socket creation monkeypatchs
2016-09-27 00:46:54 -07:00
Ryan Laughlin
e0f9aef89c
Update reverse proxy host header docs
2016-09-26 22:30:01 -07:00
Maximilian Hils
1a762cdce5
override host header in reverse proxy mode, refs #1571
2016-09-26 22:30:01 -07:00
Maximilian Hils
ebccc103d8
Revert "minor fixes"
...
This reverts commit f94219e737
2016-09-26 18:07:04 -07:00
Maximilian Hils
f94219e737
minor fixes
2016-09-26 17:53:10 -07:00
phackt
8021427ab9
Fixes - #1555 sslstrip.py flow.response.headers ( #1556 )
...
* Fixes - #1555 sslstrip.py flow.response.headers
* #1557 - add enhancements in inline script sslstrip.py with upgrade-insecure-requests stripping
* #1557 - update to match python style guide
* #1555 , #1556 , update to a bytes pattern
2016-09-25 19:29:26 -07:00
Maximilian Hils
afe6bf0309
fix #1221 ( #1578 )
2016-09-24 22:12:02 -07:00
Maximilian Hils
eeec17902f
update dependencies, minor fixes ( #1577 )
2016-09-24 21:01:48 -07:00
Maximilian Hils
de65aebfdf
fix tests
2016-09-24 18:28:30 -07:00
Maximilian Hils
6f86741574
minor fixes
2016-09-24 18:21:58 -07:00
Maximilian Hils
0a643ad20f
remove option argument for addons.add ( #1576 )
2016-09-24 18:21:12 -07:00
Maximilian Hils
92dd030c22
minor cleanups
2016-09-24 16:34:20 -07:00
Maximilian Hils
20bcfbb5d0
fix #1492
2016-09-24 15:37:19 -07:00
Thomas Kriechbaumer
258958e073
Merge pull request #1574 from mhils/issue-1393
...
Fix #1393
2016-09-24 18:41:32 +02:00
Maximilian Hils
276b467b0e
fix #1393
2016-09-23 22:52:58 -07:00
Maximilian Hils
9142da1a7d
Merge pull request #1566 from mhils/issue-1546
...
add websocket on/off switch, improve logging (fix #1546 , fix #1547 )
2016-09-22 03:06:39 -07:00
Maximilian Hils
d585236a82
Merge pull request #1567 from mhils/issue-1467
...
Scripts: cut traceback properly, fix #1467
2016-09-22 03:06:11 -07:00
Maximilian Hils
77868434e7
fix tests
2016-09-22 02:10:02 -07:00
Maximilian Hils
2510cd3111
add websocket on/off switch, improve logging ( fix #1546 , fix #1547 )
2016-09-22 02:10:02 -07:00
Maximilian Hils
a3329c5a80
scripts: cut traceback properly, fix #1467
2016-09-22 02:03:12 -07:00
Maximilian Hils
f59ae4a57f
Merge branch 'fully_transparent'
2016-09-22 01:58:08 -07:00
Maximilian Hils
e5b79a6d72
minor cleanup
2016-09-22 01:58:01 -07:00
smill@cuckoo.sh
ec588f8822
Removed obsolete code.
2016-09-22 08:51:17 +00:00
smill@cuckoo.sh
ab546a7348
Introduced comment regarding socket manipulation through the server_conn stub.
2016-09-22 08:29:07 +00:00
smill@cuckoo.sh
3962a11575
Commented on IP_TRANSPARENT and changed an exception type.
2016-09-22 08:15:34 +00:00
