Skip to content
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

Jump to bottom

Decouple access tokens from devices #112

Merged
merged 79 commits into from
May 16, 2023
Merged

Decouple access tokens from devices #112

merged 79 commits into from
May 16, 2023

Conversation

DMRobertson
Copy link
Contributor

This includes

  • the one-off database migration
  • changes to read from the new database schema
  • the beginnings of support for refreshing access tokens.

Closes #89.

David Robertson added 30 commits April 27, 2023 19:07
Rename Storage to DevicesTable
c4a2984
Introduce a sync2.Storage struct
b91dbae
Introduce tokens table
e71d954
setupConnection: lookup tokens, not devices
e670812
More work on fetching tokens from DB
4f62e7a
Introduce PollerID
181cfba
Get pollers to lookup tokens
adb3ba3
Make ConnID hold a UserID
ca8a2d7
Tokens table fixes
76663e5
Cleanup devices table
db32a58
Delete tokens on expiry, to force /whoami lookup
c1b1de5
Test tweaks
38aa6b0
Logging tweaks
0609cc5
Run CI when not targetting main
ac0586e
Make tests use unique device IDs for now
1aed063 
Before we migrate the v3 tables over too
Remove extra log var in sync2
fb833d7
Tweak logging
ce6cafc
Tweak tests
5404893
Tweak GetTokenAndSince impl formatting
650c91e
Insert device and token atomically
5c9afec
Warn if the token we want to delete doesn't exist
14cf838
TokenWithSince -> TokenForPoller
bf8007d 
Not super thrilled with this name
Merge pull request #90 from matrix-org/dmr/tokens-table
0adaf75 
OIDC: track tokens separately to devices
Update the to-device table
e1bc972
Update txns table
b428ede
Fix indentation
109aae2
Merge pull request #95 from matrix-org/dmr/v3-tables
47f1e78 
OIDC: update sync3 tables
Skeleton of the migration
a9ed309
Pull out decrypt to free function
0f90e70
Migration logic
20a8861
David Robertson and others added 25 commits May 12, 2023 12:23
Fix startup detection logic
716e03a
Improve logging
9c41d58
Merge pull request #98 from matrix-org/dmr/migration
18ed4c8 
Migrate existing data to new schema on startup
test that doesn't work >:(
1070f0d
Prototype integration test
692341e
rename test
558f14a
Ensure hlog logs appear in integration tests
57b6d38
WIP tests
3e8f270
Bunch of comments
06b7d91
Delete from pendingPolls when tokens expire
77c4a87
Tweak logging
0d7edab
Update (and fix) test
da46e40
Revert "test that doesn't work >:("
a1da451 
This reverts commit 1070f0d.
V3Pub -> EnsurePoller
e9f1566
@kegsay
Guard r/w to CheckRequest with a mutex
11895cb
Simplify test
e78a93a
consistently use OnExpiredToken
1cf2653
Typo fix
c04fd02
Don't error on non-alice tokens
99f5206
Fixup comments
5503b9d
Use different device names for each test
9982ab2
Also test using new token before old expires
193e711 
Works while the old one is still active
Remove confused comment
7a45bde
Merge pull request #106 from matrix-org/dmr/oidc-tests
468129b 
Ensure poller restarts with new access token after the old one expires
Merge branch 'main' into dmr/oidc
14a3370
@DMRobertson DMRobertson marked this pull request as ready for review May 16, 2023 12:21
@DMRobertson DMRobertson merged commit c89819f into main May 16, 2023
@DMRobertson DMRobertson deleted the dmr/oidc branch May 30, 2023 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Decouple access token tracking from device tracking
2 participants
@DMRobertson @kegsay