Aldo Cortesi
3d6dc0879b
Merge pull request #79 from mitmproxy/remove_certffi
...
Remove certffi
2015-06-27 09:22:33 +12:00
Maximilian Hils
7990503eaf
docs: fix certinstall image max-width
2015-06-26 23:04:15 +02:00
Maximilian Hils
492d3de2ea
Merge branch 'master' into appveyor
2015-06-26 19:23:36 +02:00
Maximilian Hils
26ea1a065e
fix file type
2015-06-26 19:23:12 +02:00
Maximilian Hils
74c50d24eb
fix tests on windows
2015-06-26 19:21:35 +02:00
Maximilian Hils
5b02d5417a
appveyor: minor fixes
2015-06-26 18:36:28 +02:00
Maximilian Hils
643accd5f8
add appveyor
2015-06-26 18:33:31 +02:00
Maximilian Hils
93e515c02f
appveyor: use explicit python version
2015-06-26 18:24:33 +02:00
Maximilian Hils
2fb3d6caed
add appveyor
2015-06-26 18:10:04 +02:00
Maximilian Hils
b369962cbe
remove certforward feature
...
The certforward feature was implemented to support #gotofail,
which only works on unpatched iOS devices. Given that many apps don't
support iOS 7 anymore, jailbreak+ssl killswitch is usually the better option.
By removing certforward, we can make netlib a pure python module again,
which significantly simplifies distribution.
2015-06-26 13:27:40 +02:00
Maximilian Hils
2723a0e573
remove certffi
2015-06-26 13:26:35 +02:00
Thomas Kriechbaumer
427e6d23ef
apply js-beautify changes selectivly
2015-06-26 11:48:22 +02:00
Aldo Cortesi
b3b4a63b05
Add a .jsbeautifyrc to prevent war
2015-06-26 21:24:21 +12:00
Thomas Kriechbaumer
49707dd97f
http2: implement embedded response
2015-06-26 10:48:42 +02:00
Thomas Kriechbaumer
7d7ae446a2
http2: fix framedump argument usage
2015-06-26 10:48:42 +02:00
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
