sessions: strict state shifts #985
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ellemouton
force-pushed
the
stateShift
branch
2 times, most recently
from
fa0dcab to
f3b5393
Compare
ViktorTigerstrom
approved these changes
Feb 25, 2025
Comment on lines
+436
to
+443
| // Trying to shift the state from a terminal state back to StateCreated | ||
| // should also fail since this is not a legal state transition. | ||
| err = db.ShiftState(s1.ID, StateCreated) | ||
| require.ErrorContains(t, err, "illegal session state transition") |
There was a problem hiding this comment.
nit:
Would also be value in testing that shifting a StateReserved session to StateRevoked is not legal, as that's the concern in the comment that this PR is addressing :). Potentially also add coverage to show that StateInUse -> StateRevoked is legal.
There was a problem hiding this comment.
personally, i think we only need to test illegal state transitions once and not for every possible iteration
ellemouton
force-pushed
the
stateShift
branch
from
f3b5393 to
ec8d136
Compare
bitromortac
approved these changes
Feb 25, 2025
| @@ -360,7 +360,7 @@ func (s *sessionRpcServer) resumeSession(ctx context.Context, | |||
| log.Debugf("Not resuming session %x with expiry %s", | |||
| pubKeyBytes, sess.Expiry) | |||
|
|
|||
| err := s.cfg.db.ShiftState(sess.ID, session.StateRevoked) | |||
| err := s.cfg.db.ShiftState(sess.ID, session.StateExpired) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses this comment.
In this PR, we ensure all session state shifts are legal via a strict transition map. We then replace the
RevokeSession method with a new ShiftState method. Finally, for expired sessions, we use the Expired state
instead of the Revoked state.