Skip to content

Add id column on tokens and sessions #8137

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.

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

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Conversation

david-crespo
Copy link
Contributor

@david-crespo david-crespo commented May 12, 2025

Closes #8139

WIP. Everything compiles and existing tests work, but we are not yet testing retrieval by ID and we need to think about authz checks on the datastore functions for retrieving tokens and sessions by token string.

This PR would be a lot shorter if not for the fact that the token column was the primary key on both tables, so adding the id requires a bunch of migration steps to change the primary key. There were also a lot of changes to code and tests around making things ID-centric instead of token-centric.

  • SQL migrations for adding id col and changing primary key to that
  • Add TypedUuid to session and token DB models
  • Update authz_resource! and lookup_resource! calls for new primary key
  • Update Session trait methods to use id instead of token
  • Update app and datastore session and token methods to use ID instead of token
  • Update two distinct but nearly identical FakeSession implementations (one for unit tests, one for integration tests) to a) track sessions in a Vec instead of a HashMap with token keys
  • Figure out authz situation in new fetch session/token by token string methods

@@ -957,7 +957,7 @@ authz_resource! {
authz_resource! {
name = "DeviceAccessToken",
parent = "Fleet",
primary_key = String, // token
primary_key = { uuid_kind = AccessTokenKind },
roles_allowed = false,
polar_snippet = FleetChild,
Copy link
Contributor Author

@david-crespo david-crespo May 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm realizing FleetChild will probably have to change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add ID columns to tokens and sessions
1 participant