summaryrefslogtreecommitdiff
path: root/macaroonbakery/tests
diff options
context:
space:
mode:
Diffstat (limited to 'macaroonbakery/tests')
-rw-r--r--macaroonbakery/tests/test_client.py80
-rw-r--r--macaroonbakery/tests/test_codec.py16
-rw-r--r--macaroonbakery/tests/test_macaroon.py10
-rw-r--r--macaroonbakery/tests/test_namespace.py12
-rw-r--r--macaroonbakery/tests/test_oven.py28
5 files changed, 99 insertions, 47 deletions
diff --git a/macaroonbakery/tests/test_client.py b/macaroonbakery/tests/test_client.py
index 6437a54..4bccb20 100644
--- a/macaroonbakery/tests/test_client.py
+++ b/macaroonbakery/tests/test_client.py
@@ -3,6 +3,7 @@
import base64
import datetime
import json
+import platform
import threading
import macaroonbakery.bakery as bakery
@@ -11,6 +12,7 @@ import macaroonbakery.httpbakery as httpbakery
import pymacaroons
import requests
import macaroonbakery._utils as utils
+from macaroonbakery.httpbakery._error import DischargeError
from fixtures import (
EnvironmentVariable,
@@ -49,7 +51,7 @@ class TestClient(TestWithFixtures):
srv_macaroon = b.oven.macaroon(
version=bakery.LATEST_VERSION, expiry=AGES,
caveats=None, ops=[TEST_OP])
- self.assertEquals(srv_macaroon.macaroon.location, 'loc')
+ self.assertEqual(srv_macaroon.macaroon.location, 'loc')
client = httpbakery.Client()
client.cookies.set_cookie(requests.cookies.create_cookie(
'macaroon-test', base64.b64encode(json.dumps([
@@ -61,7 +63,7 @@ class TestClient(TestWithFixtures):
str(httpd.server_address[1]),
cookies=client.cookies, auth=client.auth())
resp.raise_for_status()
- self.assertEquals(resp.text, 'done')
+ self.assertEqual(resp.text, 'done')
finally:
httpd.shutdown()
@@ -108,7 +110,7 @@ class TestClient(TestWithFixtures):
cookies=client.cookies,
auth=client.auth())
resp.raise_for_status()
- self.assertEquals(resp.text, 'done')
+ self.assertEqual(resp.text, 'done')
finally:
httpd.shutdown()
@@ -155,7 +157,7 @@ class TestClient(TestWithFixtures):
cookies=client.cookies,
auth=client.auth())
resp.raise_for_status()
- self.assertEquals(resp.text, 'done')
+ self.assertEqual(resp.text, 'done')
finally:
httpd.shutdown()
@@ -201,7 +203,7 @@ class TestClient(TestWithFixtures):
cookies=client.cookies,
auth=client.auth())
resp.raise_for_status()
- self.assertEquals(resp.text, 'done')
+ self.assertEqual(resp.text, 'done')
finally:
httpd.shutdown()
@@ -220,7 +222,7 @@ class TestClient(TestWithFixtures):
srv_macaroon = b.oven.macaroon(
version=bakery.LATEST_VERSION, expiry=AGES,
caveats=None, ops=[TEST_OP])
- self.assertEquals(srv_macaroon.macaroon.location, 'loc')
+ self.assertEqual(srv_macaroon.macaroon.location, 'loc')
client = httpbakery.Client()
# Note: by using "localhost" instead of the presumably numeric address held
# in httpd.server_address, we're triggering the no-FQDN logic in the cookie
@@ -229,7 +231,7 @@ class TestClient(TestWithFixtures):
url='http://localhost:' + str(httpd.server_address[1]),
cookies=client.cookies, auth=client.auth())
resp.raise_for_status()
- self.assertEquals(resp.text, 'done')
+ self.assertEqual(resp.text, 'done')
except httpbakery.BakeryException:
pass # interacion required exception is expected
finally:
@@ -252,7 +254,7 @@ class TestClient(TestWithFixtures):
srv_macaroon = b.oven.macaroon(
version=bakery.LATEST_VERSION,
expiry=AGES, caveats=None, ops=[TEST_OP])
- self.assertEquals(srv_macaroon.macaroon.location, 'loc')
+ self.assertEqual(srv_macaroon.macaroon.location, 'loc')
headers = {
'Macaroons': base64.b64encode(json.dumps([
srv_macaroon.to_dict().get('m')
@@ -263,7 +265,7 @@ class TestClient(TestWithFixtures):
str(httpd.server_address[1]),
headers=headers)
resp.raise_for_status()
- self.assertEquals(resp.text, 'done')
+ self.assertEqual(resp.text, 'done')
finally:
httpd.shutdown()
@@ -315,8 +317,8 @@ class TestClient(TestWithFixtures):
base64.b64decode(client.cookies.get('macaroon-test')).decode('utf-8'))[0])
t = checkers.macaroons_expiry_time(
checkers.Namespace(), [m.macaroon])
- self.assertEquals(ages, t)
- self.assertEquals(resp.text, 'done')
+ self.assertEqual(ages, t)
+ self.assertEqual(resp.text, 'done')
finally:
httpd.shutdown()
@@ -516,6 +518,56 @@ class TestClient(TestWithFixtures):
finally:
httpd.shutdown()
+ def test_discharge_jsondecodeerror(self):
+ class _DischargerLocator(bakery.ThirdPartyLocator):
+ def __init__(self):
+ self.key = bakery.generate_key()
+
+ def third_party_info(self, loc):
+ if loc == 'http://1.2.3.4':
+ return bakery.ThirdPartyInfo(
+ public_key=self.key.public_key,
+ version=bakery.LATEST_VERSION,
+ )
+ d = _DischargerLocator()
+ b = new_bakery('loc', d, None)
+
+ @urlmatch(path='.*/discharge')
+ def discharge(url, request):
+ return {
+ 'status_code': 503,
+ 'content': 'bad system',
+ }
+
+ def handler(*args):
+ GetHandler(b, 'http://1.2.3.4', None, None, None, AGES, *args)
+
+ try:
+ httpd = HTTPServer(('', 0), handler)
+ thread = threading.Thread(target=httpd.serve_forever)
+ thread.start()
+
+ client = httpbakery.Client()
+
+ with HTTMock(discharge):
+ with self.assertRaises(DischargeError) as discharge_error:
+ requests.get(
+ 'http://' + httpd.server_address[0] + ':' + str(
+ httpd.server_address[1]),
+ cookies=client.cookies,
+ auth=client.auth())
+ if platform.python_version_tuple()[0] == '2':
+ self.assertEqual(str(discharge_error.exception),
+ 'third party refused dischargex: unexpected response: '
+ "[503] 'bad system'")
+ else:
+ self.assertEqual(str(discharge_error.exception),
+ 'third party refused dischargex: unexpected response: '
+ "[503] b'bad system'")
+
+ finally:
+ httpd.shutdown()
+
def test_extract_macaroons_from_request(self):
def encode_macaroon(m):
macaroons = '[' + utils.macaroon_to_json_string(m) + ']'
@@ -539,10 +591,10 @@ class TestClient(TestWithFixtures):
jar.add_cookie_header(req)
macaroons = httpbakery.extract_macaroons(req)
- self.assertEquals(len(macaroons), 2)
+ self.assertEqual(len(macaroons), 2)
macaroons.sort(key=lambda ms: ms[0].identifier)
- self.assertEquals(macaroons[0][0].identifier, m1.identifier)
- self.assertEquals(macaroons[1][0].identifier, m2.identifier)
+ self.assertEqual(macaroons[0][0].identifier, m1.identifier)
+ self.assertEqual(macaroons[1][0].identifier, m2.identifier)
def test_handle_error_cookie_path(self):
macaroon = bakery.Macaroon(
diff --git a/macaroonbakery/tests/test_codec.py b/macaroonbakery/tests/test_codec.py
index d82a794..11e62ec 100644
--- a/macaroonbakery/tests/test_codec.py
+++ b/macaroonbakery/tests/test_codec.py
@@ -26,7 +26,7 @@ class TestCodec(TestCase):
self.fp_key,
None)
res = bakery.decode_caveat(self.tp_key, cid)
- self.assertEquals(res, bakery.ThirdPartyCaveatInfo(
+ self.assertEqual(res, bakery.ThirdPartyCaveatInfo(
first_party_public_key=self.fp_key.public_key,
root_key=b'a random string',
condition='is-authenticated-user',
@@ -48,7 +48,7 @@ class TestCodec(TestCase):
self.fp_key,
None)
res = bakery.decode_caveat(self.tp_key, cid)
- self.assertEquals(res, bakery.ThirdPartyCaveatInfo(
+ self.assertEqual(res, bakery.ThirdPartyCaveatInfo(
first_party_public_key=self.fp_key.public_key,
root_key=b'a random string',
condition='is-authenticated-user',
@@ -72,7 +72,7 @@ class TestCodec(TestCase):
self.fp_key,
ns)
res = bakery.decode_caveat(self.tp_key, cid)
- self.assertEquals(res, bakery.ThirdPartyCaveatInfo(
+ self.assertEqual(res, bakery.ThirdPartyCaveatInfo(
first_party_public_key=self.fp_key.public_key,
root_key=b'a random string',
condition='is-authenticated-user',
@@ -110,7 +110,7 @@ class TestCodec(TestCase):
'0V2lEOHhRUWdjU3ljOHY4eUt4dEhxejVEczJOYmh1ZDJhUFdt'
'UTVMcVlNWitmZ2FNaTAxdE9DIn0=')
cav = bakery.decode_caveat(tp_key, encrypted_cav)
- self.assertEquals(cav, bakery.ThirdPartyCaveatInfo(
+ self.assertEqual(cav, bakery.ThirdPartyCaveatInfo(
condition='caveat condition',
first_party_public_key=fp_key.public_key,
third_party_key_pair=tp_key,
@@ -164,7 +164,7 @@ class TestCodec(TestCase):
'1LX4VKxymqG62UGPo78wOv0_fKjr3OI6PPJOYOQgBMclemlRF2',
)
cav = bakery.decode_caveat(tp_key, encrypted_cav)
- self.assertEquals(cav, bakery.ThirdPartyCaveatInfo(
+ self.assertEqual(cav, bakery.ThirdPartyCaveatInfo(
condition='third party condition',
first_party_public_key=fp_key.public_key,
third_party_key_pair=tp_key,
@@ -190,7 +190,7 @@ class TestCodec(TestCase):
bakery.encode_uvarint(test[0], data)
for v in test[1]:
expected.append(v)
- self.assertEquals(data, expected)
+ self.assertEqual(data, expected)
val = codec.decode_uvarint(bytes(data))
- self.assertEquals(test[0], val[0])
- self.assertEquals(len(test[1]), val[1])
+ self.assertEqual(test[0], val[0])
+ self.assertEqual(len(test[1]), val[1])
diff --git a/macaroonbakery/tests/test_macaroon.py b/macaroonbakery/tests/test_macaroon.py
index bcbbf80..ab0cbe0 100644
--- a/macaroonbakery/tests/test_macaroon.py
+++ b/macaroonbakery/tests/test_macaroon.py
@@ -19,17 +19,17 @@ class TestMacaroon(TestCase):
'here',
bakery.LATEST_VERSION)
self.assertIsNotNone(m)
- self.assertEquals(m._macaroon.identifier, b'some id')
- self.assertEquals(m._macaroon.location, 'here')
- self.assertEquals(m.version, bakery.LATEST_VERSION)
+ self.assertEqual(m._macaroon.identifier, b'some id')
+ self.assertEqual(m._macaroon.location, 'here')
+ self.assertEqual(m.version, bakery.LATEST_VERSION)
def test_add_first_party_caveat(self):
m = bakery.Macaroon('rootkey', 'some id', 'here',
bakery.LATEST_VERSION)
m.add_caveat(checkers.Caveat('test_condition'))
caveats = m.first_party_caveats()
- self.assertEquals(len(caveats), 1)
- self.assertEquals(caveats[0].caveat_id, b'test_condition')
+ self.assertEqual(len(caveats), 1)
+ self.assertEqual(caveats[0].caveat_id, b'test_condition')
def test_add_third_party_caveat(self):
locator = bakery.ThirdPartyStore()
diff --git a/macaroonbakery/tests/test_namespace.py b/macaroonbakery/tests/test_namespace.py
index 8a821e5..11d8795 100644
--- a/macaroonbakery/tests/test_namespace.py
+++ b/macaroonbakery/tests/test_namespace.py
@@ -24,12 +24,12 @@ class TestNamespace(TestCase):
for test in tests:
ns = checkers.Namespace(test[1])
data = ns.serialize_text()
- self.assertEquals(data, test[2])
- self.assertEquals(str(ns), test[2].decode('utf-8'))
+ self.assertEqual(data, test[2])
+ self.assertEqual(str(ns), test[2].decode('utf-8'))
# Check that it can be deserialize to the same thing:
ns1 = checkers.deserialize_namespace(data)
- self.assertEquals(ns1, ns)
+ self.assertEqual(ns1, ns)
# TODO(rogpeppe) add resolve tests
@@ -37,16 +37,16 @@ class TestNamespace(TestCase):
ns = checkers.Namespace(None)
ns.register('testns', 't')
prefix = ns.resolve('testns')
- self.assertEquals(prefix, 't')
+ self.assertEqual(prefix, 't')
ns.register('other', 'o')
prefix = ns.resolve('other')
- self.assertEquals(prefix, 'o')
+ self.assertEqual(prefix, 'o')
# If we re-register the same URL, it does nothing.
ns.register('other', 'p')
prefix = ns.resolve('other')
- self.assertEquals(prefix, 'o')
+ self.assertEqual(prefix, 'o')
def test_register_bad_uri(self):
ns = checkers.Namespace(None)
diff --git a/macaroonbakery/tests/test_oven.py b/macaroonbakery/tests/test_oven.py
index 3c29767..a06fbf5 100644
--- a/macaroonbakery/tests/test_oven.py
+++ b/macaroonbakery/tests/test_oven.py
@@ -45,9 +45,9 @@ class TestOven(TestCase):
for about, ops, expected in canonical_ops_tests:
new_ops = copy.copy(ops)
canonical_ops = bakery.canonical_ops(new_ops)
- self.assertEquals(canonical_ops, expected)
+ self.assertEqual(canonical_ops, expected)
# Verify that the original array isn't changed.
- self.assertEquals(new_ops, ops)
+ self.assertEqual(new_ops, ops)
def test_multiple_ops(self):
test_oven = bakery.Oven(
@@ -58,8 +58,8 @@ class TestOven(TestCase):
m = test_oven.macaroon(bakery.LATEST_VERSION, AGES,
None, ops)
got_ops, conds = test_oven.macaroon_ops([m.macaroon])
- self.assertEquals(len(conds), 1) # time-before caveat.
- self.assertEquals(bakery.canonical_ops(got_ops), ops)
+ self.assertEqual(len(conds), 1) # time-before caveat.
+ self.assertEqual(bakery.canonical_ops(got_ops), ops)
def test_multiple_ops_in_id(self):
test_oven = bakery.Oven()
@@ -69,8 +69,8 @@ class TestOven(TestCase):
m = test_oven.macaroon(bakery.LATEST_VERSION, AGES,
None, ops)
got_ops, conds = test_oven.macaroon_ops([m.macaroon])
- self.assertEquals(len(conds), 1) # time-before caveat.
- self.assertEquals(bakery.canonical_ops(got_ops), ops)
+ self.assertEqual(len(conds), 1) # time-before caveat.
+ self.assertEqual(bakery.canonical_ops(got_ops), ops)
def test_multiple_ops_in_id_with_version1(self):
test_oven = bakery.Oven()
@@ -79,8 +79,8 @@ class TestOven(TestCase):
bakery.Op('two', 'read')]
m = test_oven.macaroon(bakery.VERSION_1, AGES, None, ops)
got_ops, conds = test_oven.macaroon_ops([m.macaroon])
- self.assertEquals(len(conds), 1) # time-before caveat.
- self.assertEquals(bakery.canonical_ops(got_ops), ops)
+ self.assertEqual(len(conds), 1) # time-before caveat.
+ self.assertEqual(bakery.canonical_ops(got_ops), ops)
def test_huge_number_of_ops_gives_small_macaroon(self):
test_oven = bakery.Oven(
@@ -93,9 +93,9 @@ class TestOven(TestCase):
m = test_oven.macaroon(bakery.LATEST_VERSION, AGES,
None, ops)
got_ops, conds = test_oven.macaroon_ops([m.macaroon])
- self.assertEquals(len(conds), 1) # time-before caveat.
- self.assertEquals(bakery.canonical_ops(got_ops),
- bakery.canonical_ops(ops))
+ self.assertEqual(len(conds), 1) # time-before caveat.
+ self.assertEqual(bakery.canonical_ops(got_ops),
+ bakery.canonical_ops(ops))
data = m.serialize_json()
self.assertLess(len(data), 300)
@@ -111,8 +111,8 @@ class TestOven(TestCase):
m = test_oven.macaroon(bakery.LATEST_VERSION, AGES,
None, ops)
got_ops, conds = test_oven.macaroon_ops([m.macaroon])
- self.assertEquals(bakery.canonical_ops(got_ops),
- bakery.canonical_ops(ops))
+ self.assertEqual(bakery.canonical_ops(got_ops),
+ bakery.canonical_ops(ops))
# Make another macaroon containing the same ops in a different order.
ops = [bakery.Op('one', 'write'),
@@ -121,4 +121,4 @@ class TestOven(TestCase):
bakery.Op('two', 'read')]
test_oven.macaroon(bakery.LATEST_VERSION, AGES, None,
ops)
- self.assertEquals(len(st._store), 1)
+ self.assertEqual(len(st._store), 1)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 21:37:54 +0000