Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-28 18:50:42 +00:00
Code Issues Projects Releases Wiki Activity
4,219 Commits 1 Branch 67 Tags 50 MiB
1699592f09
Commit Graph

4219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kriechbaumer
01f0982968 prettify html docs 2015-06-26 10:48:42 +02:00
Thomas Kriechbaumer
5c0f0c2c22 http2: update docs 2015-06-26 10:48:15 +02:00
Thomas Kriechbaumer
46255e6e9c http2: implement more language features 2015-06-25 14:59:22 +02:00
Thomas Kriechbaumer
09d76e1758 remove unused imports 2015-06-25 14:53:48 +02:00
Aldo Cortesi
41925b01f7 Fix printing of SSL version error 
Fixes #73
 2015-06-25 10:37:01 +12:00
Aldo Cortesi
94a7770a94 Output warning info to log fp using logging methods 2015-06-25 10:33:35 +12:00
Aldo Cortesi
876252eba8 Remove stray print & massage whitespace a bit 2015-06-25 10:27:22 +12:00
Aldo Cortesi
becc790d83 Merge pull request #645 from elitest/hardfailvenv 
Add a check to see if virtualenv is installed.
 2015-06-24 15:10:41 +12:00
Jim Shaver
080e453425 Merge branch 'master' into hardfailvenv 
Conflicts:
	dev
 2015-06-23 21:48:05 -05:00
Jim Shaver
db5c0b210b merged with upstream changes in dev 2015-06-23 20:50:51 -05:00
Jim Shaver
854dc004ee revert change, already done on master. 2015-06-23 20:47:36 -05:00
Jim Shaver
951fe2f7ed Add a check to see if virtualenv is installed. 2015-06-23 20:17:57 -05:00
Aldo Cortesi
db6576ca6f Merge pull request #76 from kyle-m/master 
Provide debugging information when upstream server certificate fails validation
 2015-06-24 09:27:08 +12:00
Kyle Morton
4766bce63d Adding test data to support post OpenSSL v1.0 cert hashing 2015-06-23 10:46:42 -07:00
Aldo Cortesi
074d8d7c74 Merge pull request #640 from Kriechi/ssl-version-handling 
unify SSL version/method handling
 2015-06-23 22:20:10 +12:00
Aldo Cortesi
0e15b94368 Merge pull request #29 from Kriechi/ssl-version-handling 
unify SSL version/method handling
 2015-06-23 22:19:42 +12:00
Aldo Cortesi
80dd703a2a Merge branch 'Kriechi-ssl-version-handling' 2015-06-23 22:18:10 +12:00
Aldo Cortesi
239f4758af Remove dependence on pathod in test suite. 2015-06-23 22:16:03 +12:00
Thomas Kriechbaumer
14e49f4fc7 unify SSL version/method handling 2015-06-23 12:05:34 +02:00
Aldo Cortesi
ed06cdcdc9 Merge branch 'ssl-version-handling' of https://github.com/Kriechi/netlib into Kriechi-ssl-version-handling 2015-06-23 22:04:09 +12:00
Aldo Cortesi
2c928181e8 Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy 2015-06-23 14:01:50 +12:00
Aldo Cortesi
237e05c823 Travis to Slack 2015-06-23 14:01:31 +12:00
Aldo Cortesi
ed8a80e65a Travis to Slack 2015-06-23 13:55:25 +12:00
Aldo Cortesi
5588e57ca4 Moar Travis. 2015-06-23 13:51:08 +12:00
Aldo Cortesi
85b46cd888 Refine travis. 
And, lest some meticulous code reader (I'm looking at you, Thomas) notices the
extra colon:

https://github.com/travis-ci/travis-ci/issues/2894
 2015-06-23 13:28:40 +12:00
Aldo Cortesi
45c2ac2cf7 Travis notifications for Slack. 2015-06-23 13:16:52 +12:00
Kyle Morton
d1452424be Cleaning up upstream server verification. Adding storage of cerificate 
verification errors on TCPClient object to enable warnings in downstream
projects.
 2015-06-22 17:31:13 -07:00
Kyle Morton
7afe44ba4e Updating TCPServer to allow tests (and potentially other use cases) to serve 
certificate chains instead of only single certificates.
 2015-06-22 16:48:09 -07:00
Aldo Cortesi
e2069d52a8 Merge pull request #638 from iroiro123/http-transparent 
HTTP Transparent Proxy
 2015-06-23 09:40:25 +12:00
Thomas Kriechbaumer
58118d607e unify SSL version/method handling 2015-06-22 20:39:34 +02:00
Thomas Kriechbaumer
5d63afdc6d unify SSL version/method handling 2015-06-22 20:39:05 +02:00
iroiro123
fbb23b5c9f changed error handling (ssl spoof mode) 2015-06-23 01:49:22 +09:00
iroiro123
5c7fa7a594 add unit tests for spoof mode 2015-06-23 00:57:33 +09:00
Aldo Cortesi
2aa1b98fbf netlib/test.py -> test/tservers.py 2015-06-22 14:52:23 +12:00
iroiro123
fd90367329 SSL Spoof mode 2015-06-21 00:51:56 +09:00
iroiro123
378aa78324 Spoof mode 2015-06-20 21:43:50 +09:00
Thomas Kriechbaumer
7a3623a14e fix pep8 whitespace 2015-06-18 18:15:22 +02:00
Maximilian Hils
159543dd2b Update README.mkd 2015-06-18 18:10:06 +02:00
Maximilian Hils
90aeda47ae Update README.mkd 2015-06-18 18:09:40 +02:00
Thomas Kriechbaumer
bfc889d29a fix prospector code smells 2015-06-18 18:05:09 +02:00
Thomas Kriechbaumer
f5c5deb2ae fix http user agents 2015-06-18 17:36:58 +02:00
Thomas Kriechbaumer
69e71097f7 mark unused variables and arguments 2015-06-18 17:14:38 +02:00
iroiro123
59ec291b6c HTTP Transparent Proxy 2015-06-18 23:53:27 +09:00
Maximilian Hils
ce0e2b12b4 Merge pull request #28 from Kriechi/fix-mitmproxy-error 
fix failing mitmproxy tests
 2015-06-18 15:02:08 +02:00
Thomas Kriechbaumer
40436ffb1f fix setup.py 2015-06-18 13:12:06 +02:00
Thomas Kriechbaumer
231cfcea38 fix failing mitmproxy tests 2015-06-18 12:53:36 +02:00
Maximilian Hils
3e282d764e Merge branch 'master' of github.com:mitmproxy/netlib 2015-06-18 11:37:04 +02:00
Maximilian Hils
014b76bff7 include wheel as dev dependency 2015-06-18 11:36:58 +02:00
Maximilian Hils
6a4dcaf356 remove implementation badge 
line too short :-/
 2015-06-18 11:33:43 +02:00
Thomas Kriechbaumer
65be004bb2 fix prospector code smells 2015-06-18 11:07:33 +02:00