From 96df3af10a2d9528855446985ecab72dab686661 Mon Sep 17 00:00:00 2001 From: Felipe Fumero Date: Thu, 12 Nov 2026 10:00:38 -0600 Subject: [PATCH 1/2] test(sdkharness): expect Unauthorized for legal-hold delete --- .sdkharness/tests/conformance/lock.legal_hold | 3 ++- ...+sdkharness-legal-hold-delete-refusal.infrastructure.md | 1 + test/unit/test_sdkharness_lock_refusal.py | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 changelog.d/+sdkharness-legal-hold-delete-refusal.infrastructure.md diff --git a/.sdkharness/tests/conformance/lock.legal_hold b/.sdkharness/tests/conformance/lock.legal_hold index d2009cff2..f3a56d1a7 100755 --- a/.sdkharness/tests/conformance/lock.legal_hold +++ b/.sdkharness/tests/conformance/lock.legal_hold @@ -268,7 +268,8 @@ def run(target: str) -> None: refused( 'delete while held', lambda: bucket.delete_file_version(uploaded.id_, OBJECT_NAME), - ('AccessDenied', 'RetentionWriteError', 'Conflict', 'BadRequest'), + # b2_delete_file_version error table: Object Lock refusal is 401 access_denied. + ('Unauthorized',), ) step( diff --git a/changelog.d/+sdkharness-legal-hold-delete-refusal.infrastructure.md b/changelog.d/+sdkharness-legal-hold-delete-refusal.infrastructure.md new file mode 100644 index 000000000..2bae53ff9 --- /dev/null +++ b/changelog.d/+sdkharness-legal-hold-delete-refusal.infrastructure.md @@ -0,0 +1 @@ +Make the sdkharness legal-hold delete check require the documented `Unauthorized` refusal. diff --git a/test/unit/test_sdkharness_lock_refusal.py b/test/unit/test_sdkharness_lock_refusal.py index 5c6ebf45f..7d3e47720 100644 --- a/test/unit/test_sdkharness_lock_refusal.py +++ b/test/unit/test_sdkharness_lock_refusal.py @@ -18,6 +18,7 @@ CONFORMANCE = Path(__file__).parents[2] / '.sdkharness' / 'tests' / 'conformance' LEAVES = ('lock.bypass_governance', 'lock.per_file_retention') EXPECTED = ('AccessDenied', 'RetentionWriteError', 'Conflict', 'BadRequest') +LEGAL_HOLD = 'lock.legal_hold' def load_leaf(name): @@ -111,3 +112,9 @@ def test_unauthorized_is_not_accepted_unless_asked(leaf): def test_the_leaf_asks_for_the_401_on_its_delete_without_bypass(leaf): source = (CONFORMANCE / leaf).read_text() assert 'access_denied_401=True' in source + + +def test_legal_hold_delete_requires_only_unauthorized(): + source = (CONFORMANCE / LEGAL_HOLD).read_text() + assert " ('Unauthorized',)," in source + assert 'FIDELITY.md F-139' not in source From 4728d66ea1970d8972d0d8b212fb32dc2df4d810 Mon Sep 17 00:00:00 2001 From: Felipe Fumero Date: Fri, 13 Nov 2026 09:04:54 -0600 Subject: [PATCH 2/2] test(sdkharness): retain legacy legal-hold refusals --- .sdkharness/tests/conformance/lock.legal_hold | 16 +++++++++-- ...egal-hold-delete-refusal.infrastructure.md | 2 +- test/unit/test_sdkharness_lock_refusal.py | 28 ++++++++++--------- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.sdkharness/tests/conformance/lock.legal_hold b/.sdkharness/tests/conformance/lock.legal_hold index f3a56d1a7..2a0a97b03 100755 --- a/.sdkharness/tests/conformance/lock.legal_hold +++ b/.sdkharness/tests/conformance/lock.legal_hold @@ -116,11 +116,13 @@ def step(name, action): raise Failure(name, name_of) from error -def refused(name, action, expected): +def refused(name, action, expected, *, access_denied_401=False): """Assert something is REFUSED, and record what refused it. `expected` is a tuple of exception class names. A different class -- or no exception at all -- is a Failure, because the refusal IS the claim here. + With `access_denied_401`, Unauthorized is also accepted, but only when its + code is `access_denied`; other authorization failures remain failures. """ try: action() @@ -130,6 +132,12 @@ def refused(name, action, expected): name_of = type(error).__name__ if name_of in expected: return name_of + if ( + access_denied_401 + and name_of == 'Unauthorized' + and getattr(error, 'code', None) == 'access_denied' + ): + return 'Unauthorized(access_denied)' raise Failure(name, f"refused with {name_of}, expected {'/'.join(expected)}") from error raise Failure(name, 'the call was permitted; the claim under test is that it is refused') @@ -268,8 +276,10 @@ def run(target: str) -> None: refused( 'delete while held', lambda: bucket.delete_file_version(uploaded.id_, OBJECT_NAME), - # b2_delete_file_version error table: Object Lock refusal is 401 access_denied. - ('Unauthorized',), + # b2_delete_file_version error table and b2-simulator FIDELITY.md F-139: + # real B2 uses 401 access_denied; retain older simulator refusal shapes. + ('AccessDenied', 'RetentionWriteError', 'Conflict', 'BadRequest'), + access_denied_401=True, ) step( diff --git a/changelog.d/+sdkharness-legal-hold-delete-refusal.infrastructure.md b/changelog.d/+sdkharness-legal-hold-delete-refusal.infrastructure.md index 2bae53ff9..a4b4a01b6 100644 --- a/changelog.d/+sdkharness-legal-hold-delete-refusal.infrastructure.md +++ b/changelog.d/+sdkharness-legal-hold-delete-refusal.infrastructure.md @@ -1 +1 @@ -Make the sdkharness legal-hold delete check require the documented `Unauthorized` refusal. +Make the sdkharness legal-hold delete check accept B2's `401 access_denied` response while retaining older simulator refusal shapes. diff --git a/test/unit/test_sdkharness_lock_refusal.py b/test/unit/test_sdkharness_lock_refusal.py index 7d3e47720..b78858205 100644 --- a/test/unit/test_sdkharness_lock_refusal.py +++ b/test/unit/test_sdkharness_lock_refusal.py @@ -16,9 +16,8 @@ import pytest CONFORMANCE = Path(__file__).parents[2] / '.sdkharness' / 'tests' / 'conformance' -LEAVES = ('lock.bypass_governance', 'lock.per_file_retention') +LEAVES = ('lock.bypass_governance', 'lock.per_file_retention', 'lock.legal_hold') EXPECTED = ('AccessDenied', 'RetentionWriteError', 'Conflict', 'BadRequest') -LEGAL_HOLD = 'lock.legal_hold' def load_leaf(name): @@ -65,14 +64,15 @@ def test_401_access_denied_counts_as_the_refusal(leaf): @pytest.mark.parametrize('leaf', LEAVES) -def test_the_old_refusal_classes_are_still_accepted(leaf): +@pytest.mark.parametrize('error_name', EXPECTED) +def test_the_old_refusal_classes_are_still_accepted(leaf, error_name): module = load_leaf(leaf) - AccessDenied = type('AccessDenied', (Exception,), {}) + refusal_class = type(error_name, (Exception,), {}) assert ( module.refused( - 'delete without bypass', raising(AccessDenied()), EXPECTED, access_denied_401=True + 'delete without bypass', raising(refusal_class()), EXPECTED, access_denied_401=True ) - == 'AccessDenied' + == error_name ) @@ -90,10 +90,18 @@ def test_an_allowed_operation_still_fails(leaf): InvalidAuthToken('expired_auth_token'), Unauthorized('bad_auth_token'), Unauthorized('email_not_verified'), + Unauthorized('unauthorized'), ServiceError('503'), KeyError('404'), ], - ids=['bad-token', 'other-401-code', 'unverified-email', '5xx', 'not-found'], + ids=[ + 'bad-token', + 'other-401-code', + 'unverified-email', + 'missing-capability', + '5xx', + 'not-found', + ], ) def test_an_unrelated_refusal_still_fails(leaf, error): module = load_leaf(leaf) @@ -112,9 +120,3 @@ def test_unauthorized_is_not_accepted_unless_asked(leaf): def test_the_leaf_asks_for_the_401_on_its_delete_without_bypass(leaf): source = (CONFORMANCE / leaf).read_text() assert 'access_denied_401=True' in source - - -def test_legal_hold_delete_requires_only_unauthorized(): - source = (CONFORMANCE / LEGAL_HOLD).read_text() - assert " ('Unauthorized',)," in source - assert 'FIDELITY.md F-139' not in source