diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2017-07-14 17:56:01 +0200 | 
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-07-15 10:01:14 +0200 | 
| commit | 74708d546bee4f873932dc41a90ff8f434ad7c4d (patch) | |
| tree | d1d8d19fe9a7d7af5703529da83caaa6318c6ca3 | |
| parent | fdc64be04a00e04f7acd934e3decc3996c29c7f1 (diff) | |
| download | mitmproxy-74708d546bee4f873932dc41a90ff8f434ad7c4d.tar.gz mitmproxy-74708d546bee4f873932dc41a90ff8f434ad7c4d.tar.bz2 mitmproxy-74708d546bee4f873932dc41a90ff8f434ad7c4d.zip  | |
Update test_allowremote.py
| -rw-r--r-- | test/mitmproxy/addons/test_allowremote.py | 59 | 
1 files changed, 28 insertions, 31 deletions
diff --git a/test/mitmproxy/addons/test_allowremote.py b/test/mitmproxy/addons/test_allowremote.py index 4e1752e3..9fc71525 100644 --- a/test/mitmproxy/addons/test_allowremote.py +++ b/test/mitmproxy/addons/test_allowremote.py @@ -5,37 +5,34 @@ from mitmproxy.addons import allowremote  from mitmproxy.test import taddons -class TestAllowRemote: -    @pytest.mark.parametrize("allow_remote, ip, should_be_killed", -                             [ -                                 (True, "192.168.1.3", False), -                                 (True, "122.176.243.101", False), -                                 (False, "192.168.1.3", False), -                                 (False, "122.176.243.101", True), +@pytest.mark.parametrize("allow_remote, ip, should_be_killed", [ +    (True, "192.168.1.3", False), +    (True, "122.176.243.101", False), +    (False, "192.168.1.3", False), +    (False, "122.176.243.101", True), +    (True, "::ffff:1:2", False), +    (True, "fe80::", False), +    (True, "2001:4860:4860::8888", False), +    (False, "::ffff:1:2", False), +    (False, "fe80::", False), +    (False, "2001:4860:4860::8888", True), +]) +def test_allowremote(allow_remote, ip, should_be_killed): +    ar = allowremote.AllowRemote() +    with taddons.context() as tctx: +        tctx.master.addons.register(ar) +        tctx.options.allow_remote = allow_remote -                                 (True, "::ffff:1:2", False), -                                 (True, "fe80::", False), -                                 (True, "2001:4860:4860::8888", False), -                                 (False, "::ffff:1:2", False), -                                 (False, "fe80::", False), -                                 (False, "2001:4860:4860::8888", True), +        with mock.patch('mitmproxy.proxy.protocol.base.Layer') as layer: +            layer.client_conn.address = (ip, 12345) -                             ]) -    def test_allowremote(self, allow_remote, ip, should_be_killed): -        ar = allowremote.AllowRemote() -        with taddons.context() as tctx: -            tctx.master.addons.register(ar) -            tctx.options.allow_remote = allow_remote - -            with mock.patch('mitmproxy.proxy.protocol.base.Layer') as layer: -                layer.client_conn.address = (ip,) -                ar.clientconnect(layer) -                if should_be_killed: -                    assert tctx.master.has_log("Client connection was killed", "warn") -                else: -                    assert tctx.master.logs == [] - -                tctx.master.clear() -                tctx.options.proxyauth = "any" -                ar.clientconnect(layer) +            ar.clientconnect(layer) +            if should_be_killed: +                assert tctx.master.has_log("Client connection was killed", "warn") +            else:                  assert tctx.master.logs == [] +            tctx.master.clear() + +            tctx.options.proxyauth = "any" +            ar.clientconnect(layer) +            assert tctx.master.logs == []  | 
