Skip to content

Canonicalize empty entitlement limit maps #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danifronter merged 1 commit into from
Aug 22, 2026
Merged

Canonicalize empty entitlement limit maps #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/EntitlementSnapshotContract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ public static function canonicalJson(array $snapshot): string
public static function canonicalPayload(array $snapshot): array
{
self::assertValid($snapshot);
$entitlements = $snapshot['entitlements'];
$limitMap = (array) ($entitlements['limits'] ?? []);
$entitlements['limits'] = $limitMap === [] ? (object) [] : $limitMap;

return [
'algorithm' => self::ALGORITHM,
'contract_version' => self::VERSION,
'entitlements' => self::canonicalize($snapshot['entitlements']),
'entitlements' => self::canonicalize($entitlements),
'expires_at' => (string) $snapshot['expires_at'],
'generated_at' => (string) $snapshot['generated_at'],
'issuer' => (string) $snapshot['issuer'],
Expand Down
17 changes: 17 additions & 0 deletions tests/EntitlementSnapshotContractTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,23 @@ public function test_missing_or_changed_authorization_fields_are_rejected(): voi
}
}

public function test_empty_limit_map_is_stable_across_json_object_decoding(): void
{
$wirePayload = $this->payload();
$wirePayload['entitlements']['limits'] = (object) [];
$decodedPayload = json_decode(
json_encode($wirePayload, JSON_THROW_ON_ERROR),
true,
512,
JSON_THROW_ON_ERROR,
);

$wireCanonical = EntitlementSnapshotContract::canonicalJson($wirePayload);

self::assertSame($wireCanonical, EntitlementSnapshotContract::canonicalJson($decodedPayload));
self::assertStringContainsString('"limits":{}', $wireCanonical);
}

public function test_expiry_must_be_after_generation(): void
{
$payload = $this->payload();
Expand Down
Loading