Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | minor cleanups | Maximilian Hils | 2016-09-24 | 2 | -4/+4 |
| | |||||
* | fix #1492 | Maximilian Hils | 2016-09-24 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1574 from mhils/issue-1393 | Thomas Kriechbaumer | 2016-09-24 | 5 | -19/+32 |
|\ | | | | | Fix #1393 | ||||
| * | fix #1393 | Maximilian Hils | 2016-09-23 | 5 | -19/+32 |
|/ | |||||
* | Merge pull request #1566 from mhils/issue-1546 | Maximilian Hils | 2016-09-22 | 7 | -46/+66 |
|\ | | | | | add websocket on/off switch, improve logging (fix #1546, fix #1547) | ||||
| * | fix tests | Maximilian Hils | 2016-09-22 | 2 | -6/+8 |
| | | |||||
| * | add websocket on/off switch, improve logging (fix #1546, fix #1547) | Maximilian Hils | 2016-09-22 | 6 | -49/+67 |
| | | |||||
* | | Merge pull request #1567 from mhils/issue-1467 | Maximilian Hils | 2016-09-22 | 2 | -8/+55 |
|\ \ | |/ |/| | Scripts: cut traceback properly, fix #1467 | ||||
| * | scripts: cut traceback properly, fix #1467 | Maximilian Hils | 2016-09-22 | 2 | -8/+55 |
| | | |||||
* | | Merge branch 'fully_transparent' | Maximilian Hils | 2016-09-22 | 7 | -7/+154 |
|\ \ | |/ |/| | |||||
| * | minor cleanup | Maximilian Hils | 2016-09-22 | 3 | -17/+11 |
| | | |||||
| * | Removed obsolete code. | smill@cuckoo.sh | 2016-09-22 | 1 | -6/+2 |
| | | |||||
| * | Introduced comment regarding socket manipulation through the server_conn stub. | smill@cuckoo.sh | 2016-09-22 | 1 | -0/+1 |
| | | |||||
| * | Commented on IP_TRANSPARENT and changed an exception type. | smill@cuckoo.sh | 2016-09-22 | 1 | -1/+2 |
| | | |||||
| * | Fixed restructuredText error. | smill | 2016-09-15 | 1 | -1/+2 |
| | | |||||
| * | Added a description to the shim loader, and renamed it. | smill | 2016-09-14 | 1 | -0/+8 |
| | | |||||
| * | Fixed travis-ci issues. | smill | 2016-09-14 | 3 | -1/+3 |
| | | |||||
| * | Prevent crash in case of a connection timeout. | smill | 2016-09-14 | 1 | -3/+5 |
| | | |||||
| * | Improved the documentation. | smill | 2016-09-05 | 1 | -5/+17 |
| | | |||||
| * | Made it possible to modify the server_conn.connection attribute, | smill | 2016-09-05 | 2 | -3/+8 |
| | | | | | | | | using the serverconnect stub. | ||||
| * | Removed a mistakenly inserted newline character. | smill | 2016-09-04 | 1 | -1/+0 |
| | | |||||
| * | Improved error-handling / supplemented documention. | smill | 2016-09-04 | 6 | -9/+33 |
| | | |||||
| * | Introduced some minor improvements to the shim loader. | smill | 2016-09-03 | 1 | -19/+27 |
| | | |||||
| * | Introduced the capability to spoof the source address | smill | 2016-09-03 | 6 | -7/+101 |
| | | | | | | | | of outgoing sessions + an accompanying shim loader. | ||||
* | | ci: enable verbose test logging by default | Maximilian Hils | 2016-09-21 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #1522 from chhsiao90/dump-ready-#1505 | Maximilian Hils | 2016-09-21 | 1 | -0/+4 |
|\ \ | | | | | | | Notify when proxy server started | ||||
| * | | Notify when proxy server started | chhsiao90 | 2016-09-22 | 1 | -0/+4 |
| | | | |||||
* | | | fix mitmdump error logging, fix #1549 (#1565) | Maximilian Hils | 2016-09-21 | 3 | -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-1554 | Maximilian Hils | 2016-09-21 | 2 | -9/+15 |
|\ \ \ | |/ / |/| | | Fix Response.make content-length header | ||||
| * | | fix Response.make content-length header | Maximilian Hils | 2016-09-21 | 2 | -9/+15 |
| | | | |||||
* | | | Merge pull request #1563 from mhils/fix-1562 | Maximilian Hils | 2016-09-21 | 6 | -4/+19 |
|\ \ \ | |/ / |/| | | Raise TypeError on invalid header assignment, fix #1562 | ||||
| * | | fix pathod http2 response creation | Maximilian Hils | 2016-09-21 | 2 | -3/+3 |
| | | | |||||
| * | | raise TypeError on invalid header assignment, fix #1562 | Maximilian Hils | 2016-09-21 | 4 | -1/+16 |
|/ / | |||||
* | | Merge pull request #1509 from arjun23496/regex_star_mod | Maximilian Hils | 2016-09-21 | 2 | -2/+5 |
|\ \ | | | | | | | Fixes #1471 - Change .* to match entire body | ||||
| * | | Changed filter to match replacement for DOTALL | arjun23496 | 2016-09-09 | 1 | -0/+3 |
| | | | |||||
| * | | Convert to flags=value for future compatibility | arjun23496 | 2016-09-09 | 1 | -2/+2 |
| | | | |||||
| * | | Fixes #1471 - Change .* to match entire body | arjun23496 | 2016-09-09 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #1559 from dwfreed/patch-1 | Thomas Kriechbaumer | 2016-09-18 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | console/options: kill -> replay_kill_extra | ||||
| * | | | console/options: kill -> replay_kill_extra | Doug Freed | 2016-09-17 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | @cortesi renamed the kill option to replay_kill_extra in b0213a2, but missed a usage here because it was in a string. This fixes opening the options menu in console. | ||||
* | | | Merge pull request #1558 from vulnminer/patch-1 | Thomas Kriechbaumer | 2016-09-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update app.py | ||||
| * | | | Update app.py | vulnminer | 2016-09-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1552 from cortesi/creplay | Aldo Cortesi | 2016-09-12 | 17 | -216/+156 |
|\ \ \ | | | | | | | | | revamp client replay | ||||
| * | | | Misc cleanups | Aldo Cortesi | 2016-09-12 | 3 | -14/+15 |
| | | | | |||||
| * | | | console: update flow list when state is modified | Aldo Cortesi | 2016-09-11 | 1 | -0/+2 |
| | | | | |||||
| * | | | Remove obsolete exceptions.ScriptException | Aldo Cortesi | 2016-09-11 | 1 | -24/+0 |
| | | | | |||||
| * | | | Redesign client replay | Aldo Cortesi | 2016-09-11 | 16 | -180/+141 |
| | | | | | | | | | | | | | | | | | | | | - Move to an addon - Use a much simpler synchronisation mechanism | ||||
* | | | | Merge pull request #1553 from Kriechi/bump | Thomas Kriechbaumer | 2016-09-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | bump brotlipy | ||||
| * | | | | bump brotlipy | Thomas Kriechbaumer | 2016-09-11 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1551 from cortesi/sreplay | Aldo Cortesi | 2016-09-11 | 3 | -42/+24 |
|\| | | | | | | | | | | | console: fix/improve server replay | ||||
| * | | | console: fix/improve server replay | Aldo Cortesi | 2016-09-11 | 3 | -42/+24 |
|/ / / | | | | | | | | | | | | | | | | - Fix "S" shortcut in list view - Consolidate replay from file in global R shortcut - Fix help |