aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Rename _read_token to _read_keyShadab Zafar2016-09-271-8/+8
| | | | | | | | Since we also have a _read_value
| * Move CookieAttrs and SetCookie to topShadab Zafar2016-09-271-18/+14
| |
| * Minor refactorShadab Zafar2016-09-271-2/+3
| |
| * Update cookie testsShadab Zafar2016-09-271-91/+84
| | | | | | | | | | This is needed since _read_pairs now returns a list of cookies each of which is a list of [name, value] tuples.
| * Add support for comma separated cookiesShadab Zafar2016-09-271-30/+51
| |
* | Merge pull request #1571 from rofreg/server-sni-flagMaximilian Hils2016-09-273-4/+10
|\ \ | |/ |/| Add command line arg to force specific SNI
| * In reverse proxy mode, always send SNIRyan Laughlin2016-09-273-4/+10
|/
* Merge pull request #1583 from mhils/patch-makesocketThomas Kriechbaumer2016-09-271-1/+5
|\ | | | | allow socket creation monkeypatchs
| * allow socket creation monkeypatchsMaximilian Hils2016-09-271-1/+5
| |
* | Update reverse proxy host header docsRyan Laughlin2016-09-261-24/+9
| |
* | override host header in reverse proxy mode, refs #1571Maximilian Hils2016-09-261-0/+4
|/
* Revert "minor fixes"Maximilian Hils2016-09-261-5/+8
| | | | This reverts commit f94219e7377e6eb775867918f7a1382421a97c54.
* minor fixesMaximilian Hils2016-09-261-8/+5
|
* Fixes - #1555 sslstrip.py flow.response.headers (#1556)phackt2016-09-251-2/+14
| | | | | | | | | | * 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
* fix #1221 (#1578)Maximilian Hils2016-09-242-9/+19
|
* update dependencies, minor fixes (#1577)Maximilian Hils2016-09-244-13/+14
|
* fix testsMaximilian Hils2016-09-241-1/+1
|
* minor fixesMaximilian Hils2016-09-242-4/+3
|
* remove option argument for addons.add (#1576)Maximilian Hils2016-09-2419-33/+32
|
* minor cleanupsMaximilian Hils2016-09-242-4/+4
|
* fix #1492Maximilian Hils2016-09-241-0/+1
|
* Merge pull request #1574 from mhils/issue-1393Thomas Kriechbaumer2016-09-245-19/+32
|\ | | | | Fix #1393
| * fix #1393Maximilian Hils2016-09-235-19/+32
|/
* Merge pull request #1566 from mhils/issue-1546Maximilian Hils2016-09-227-46/+66
|\ | | | | add websocket on/off switch, improve logging (fix #1546, fix #1547)
| * fix testsMaximilian Hils2016-09-222-6/+8
| |
| * add websocket on/off switch, improve logging (fix #1546, fix #1547)Maximilian Hils2016-09-226-49/+67
| |
* | Merge pull request #1567 from mhils/issue-1467Maximilian Hils2016-09-222-8/+55
|\ \ | |/ |/| Scripts: cut traceback properly, fix #1467
| * scripts: cut traceback properly, fix #1467Maximilian Hils2016-09-222-8/+55
| |
* | Merge branch 'fully_transparent'Maximilian Hils2016-09-227-7/+154
|\ \ | |/ |/|
| * minor cleanupMaximilian Hils2016-09-223-17/+11
| |
| * Removed obsolete code.smill@cuckoo.sh2016-09-221-6/+2
| |
| * Introduced comment regarding socket manipulation through the server_conn stub.smill@cuckoo.sh2016-09-221-0/+1
| |
| * Commented on IP_TRANSPARENT and changed an exception type.smill@cuckoo.sh2016-09-221-1/+2
| |
| * Fixed restructuredText error.smill2016-09-151-1/+2
| |
| * Added a description to the shim loader, and renamed it.smill2016-09-141-0/+8
| |
| * Fixed travis-ci issues.smill2016-09-143-1/+3
| |
| * Prevent crash in case of a connection timeout.smill2016-09-141-3/+5
| |
| * Improved the documentation.smill2016-09-051-5/+17
| |
| * Made it possible to modify the server_conn.connection attribute,smill2016-09-052-3/+8
| | | | | | | | using the serverconnect stub.
| * Removed a mistakenly inserted newline character.smill2016-09-041-1/+0
| |
| * Improved error-handling / supplemented documention.smill2016-09-046-9/+33
| |
| * Introduced some minor improvements to the shim loader.smill2016-09-031-19/+27
| |
| * Introduced the capability to spoof the source addresssmill2016-09-036-7/+101
| | | | | | | | of outgoing sessions + an accompanying shim loader.
* | ci: enable verbose test logging by defaultMaximilian Hils2016-09-212-2/+2
| |
* | Merge pull request #1522 from chhsiao90/dump-ready-#1505Maximilian Hils2016-09-211-0/+4
|\ \ | | | | | | Notify when proxy server started
| * | Notify when proxy server startedchhsiao902016-09-221-0/+4
| | |
* | | fix mitmdump error logging, fix #1549 (#1565)Maximilian Hils2016-09-213-6/+11
| | | | | | | | | | | | | | | | | | | | | This commit replaces the logging statement introduced in afe34e8b28988bdff91123862194606152c03c33 with the previous implementation where an exception is raised. ProtocolExceptions are normally logged as regular warnings, achieving the same effect for the end user. However, this retains the full stack trace for debug-level logging, which makes the analysis of client errors considerably easier.
* | | Merge pull request #1564 from mhils/issue-1554Maximilian Hils2016-09-212-9/+15
|\ \ \ | |/ / |/| | Fix Response.make content-length header
| * | fix Response.make content-length headerMaximilian Hils2016-09-212-9/+15
| | |
* | | Merge pull request #1563 from mhils/fix-1562Maximilian Hils2016-09-216-4/+19
|\ \ \ | |/ / |/| | Raise TypeError on invalid header assignment, fix #1562