Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adjust to netlib changes

This commit is contained in:
Maximilian Hils 2014-08-17 23:06:25 +02:00
parent da3e7c0187
commit bb2ce689a9
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmproxy/cmdline.py
View File

@ -440,7 +440,7 @@ def common_options(parser):
) )
user_specification_group.add_argument( user_specification_group.add_argument(
"--htpasswd", "--htpasswd",
action="store", dest="auth_htpasswd", type=argparse.FileType('r'), action="store", dest="auth_htpasswd", type=str,
metavar="PATH", metavar="PATH",
help="Allow access to users specified in an Apache htpasswd file." help="Allow access to users specified in an Apache htpasswd file."
) )

2
libmproxy/contrib/README
View File

@ -11,6 +11,4 @@ jsbeautifier, git checkout 25/03/12, MIT license
html2text, git checkout 18/08/12, GPLv3 html2text, git checkout 18/08/12, GPLv3
md5crypt, PSF license, http://code.activestate.com/recipes/325204/
WinDivert 1.1.4, LGPL license, http://reqrypt.org/windivert.html WinDivert 1.1.4, LGPL license, http://reqrypt.org/windivert.html

2
test/test_proxy.py
View File

@ -92,7 +92,7 @@ class TestProcessProxyOptions:
p = self.assert_noerr("--htpasswd", tutils.test_data.path("data/htpasswd")) p = self.assert_noerr("--htpasswd", tutils.test_data.path("data/htpasswd"))
assert p.authenticator assert p.authenticator
self.assert_err("invalid htpasswd file", "--htpasswd", tutils.test_data.path("data/htpasswd.invalid")) self.assert_err("malformed htpasswd file", "--htpasswd", tutils.test_data.path("data/htpasswd.invalid"))
p = self.assert_noerr("--singleuser", "test:test") p = self.assert_noerr("--singleuser", "test:test")
assert p.authenticator assert p.authenticator