aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'Kriechi-cleanup'Aldo Cortesi2015-05-2832-361/+538
|\
| * add pep8 autoformat checks to travisThomas Kriechbaumer2015-05-273-4/+9
| |
| * cleanup code with autoflakeThomas Kriechbaumer2015-05-2710-28/+8
| | | | | | | | run the following command: $ autoflake -r -i --remove-all-unused-imports --remove-unused-variables .
| * cleanup code with autopep8Thomas Kriechbaumer2015-05-2727-332/+510
| | | | | | | | run the following command: $ autopep8 -i -r -a -a .
* | Merge pull request #59 from Kriechi/update-tls-defaultsAldo Cortesi2015-05-282-14/+32
|\ \ | |/ |/| update TLS defaults: signature hash and DH params
| * update TLS defaults: signature hash and DH paramsThomas Kriechbaumer2015-05-272-14/+32
|/ | | | | * SHA1 is deprecated (use SHA256) * increase RSA key to 2048 bits * increase DH params to 4096 bits (LogJam attack)
* Merge pull request #58 from Kriechi/update-opensslAldo Cortesi2015-05-272-10/+7
|\ | | | | Update openssl
| * remove outdated workaroundsThomas Kriechbaumer2015-05-271-8/+4
| |
| * bump pyOpenSSL and cryptography dependenciesThomas Kriechbaumer2015-05-271-2/+3
|/
* Merge pull request #56 from Kriechi/http2-framesAldo Cortesi2015-05-275-0/+742
|\ | | | | implement basic HTTP/2 frame classes
| * implement basic HTTP/2 frame classesThomas Kriechbaumer2015-05-265-0/+742
| |
* | Post release version bump.Aldo Cortesi2015-05-261-1/+1
|/
* improve displaying tcp addressesMaximilian Hils2015-05-181-1/+4
|
* release prep: bump versionAldo Cortesi2015-05-181-1/+1
|
* Zap outdated commentAldo Cortesi2015-05-161-3/+1
|
* Zap a left-over testAldo Cortesi2015-05-051-12/+0
|
* Add tcp.Reader.safe_read, use it in socks and websocketsAldo Cortesi2015-05-057-62/+80
| | | | | | safe_read is guaranteed to raise or return a byte string of the requested length. It's particularly useful for implementing binary protocols.
* websockets: more flexible masking interface.Aldo Cortesi2015-05-011-3/+8
|
* websockets: A progressive masker.Aldo Cortesi2015-05-012-14/+34
|
* websockets: more compact and legible human_readableAldo Cortesi2015-04-304-28/+55
|
* Add a tiny utility class for keeping bi-directional mappings.Aldo Cortesi2015-04-305-35/+91
| | | | Use it in websocket and socks.
* testing: http read_request corner caseAldo Cortesi2015-04-301-0/+5
|
* websockets: nicer frame constructionAldo Cortesi2015-04-242-15/+35
| | | | | | - Resolve unspecified values on instantiation - Add a check for masking key length - Smarter resolution for masking_key and mask values. Do the right thing unless told not to.
* websockets: include all header values in frame roundtripAldo Cortesi2015-04-242-12/+19
|
* websockets: remove validationAldo Cortesi2015-04-242-38/+12
| | | | | | | We don't really need this any more. The interface is much less error prone because bit flags are no longer integers, we have a range check on opcode on header instantiation, and we've deferred length code calculation and so forth into the byte render methods.
* websocket: interface refactoringAldo Cortesi2015-04-243-167/+201
| | | | | | | - Separate out FrameHeader. We need to deal with this separately in many circumstances. - Simpler equality scheme. - Bits are now specified by truthiness - we don't care about the integer value. This means lots of validation is not needed any more.
* websockets: refactor to avoid rundantly specifying payloads and payload lengthsAldo Cortesi2015-04-242-51/+26
|
* websockets: extract frame header creation into a functionAldo Cortesi2015-04-242-120/+147
|
* websockets: handshake checks only take headersAldo Cortesi2015-04-234-40/+24
|
* websockets: (very) slightly nicer is_valid constraintsAldo Cortesi2015-04-211-5/+3
|
* websockets: constants, variable names, refactoringAldo Cortesi2015-04-212-35/+67
|
* Whitespace, interface simplificationAldo Cortesi2015-04-212-25/+5
| | | | | - safe_tobytes doesn't buy us much - move masking key generation inline
* websockets: refactor to use http and header functions in http.pyAldo Cortesi2015-04-213-194/+152
|
* Whitespace, indentation, nounce -> nonceAldo Cortesi2015-04-213-66/+79
|
* Whitespace, pep8, mixed indentationAldo Cortesi2015-04-213-19/+74
|
* Return a named tuple from read_responseAldo Cortesi2015-04-212-6/+20
|
* Migrate requeset reading from mitmproxy to netlibAldo Cortesi2015-04-213-3/+195
|
* Merge pull request #55 from Chandler/websocketsAldo Cortesi2015-04-202-45/+77
|\ | | | | small websockets cleanup
| * whitespaceChandler Abraham2015-04-191-2/+1
| |
| * remove subproject commitChandler Abraham2015-04-191-6/+0
| |
| * fixing test coverage, adding to_file/from_file reader writes to match socks.pyChandler Abraham2015-04-193-45/+84
|/
* Websockets: reorganiseAldo Cortesi2015-04-204-98/+90
| | | | | - websockets.py to top-level - implementations into test suite
* Merge branch 'master' of github.com:mitmproxy/netlibMaximilian Hils2015-04-1713-24/+1088
|\
| * websockets: more whitespace, WebSocketFrame -> FrameAldo Cortesi2015-04-173-76/+81
| |
| * websockets: whitespace, PEP8Aldo Cortesi2015-04-171-73/+96
| |
| * Merge pull request #54 from Chandler/websocketsAldo Cortesi2015-04-175-0/+556
| |\ | | | | | | Netlib WebSockets take 1
| | * 100% test coverage, though still need plenty moreChandler Abraham2015-04-134-29/+18
| | |
| | * whitespaceChandler Abraham2015-04-111-6/+1
| | |
| | * handshake tests, serialization testChandler Abraham2015-04-113-28/+105
| | |
| | * small cleanups, working on testsChandler Abraham2015-04-113-28/+41
| | |