session: use clock for created at time

Author: ellemouton

session/store_test.go

@@ -16,17 +16,18 @@ var testTime = time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC)
 // store.
 func TestBasicSessionStore(t *testing.T) {
 	// Set up a new DB.
-	db, err := NewDB(t.TempDir(), "test.db", clock.NewTestClock(testTime))
+	clock := clock.NewTestClock(testTime)
+	db, err := NewDB(t.TempDir(), "test.db", clock)
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		_ = db.Close()
 	})
 
 	// Create a few sessions.
-	s1 := newSession(t, db, "session 1", nil)
-	s2 := newSession(t, db, "session 2", nil)
-	s3 := newSession(t, db, "session 3", nil)
-	s4 := newSession(t, db, "session 4", nil)
+	s1 := newSession(t, db, clock, "session 1", nil)
+	s2 := newSession(t, db, clock, "session 2", nil)
+	s3 := newSession(t, db, clock, "session 3", nil)
+	s4 := newSession(t, db, clock, "session 4", nil)
 
 	// Persist session 1. This should now succeed.
 	require.NoError(t, db.CreateSession(s1))
@@ -92,17 +93,18 @@ func TestBasicSessionStore(t *testing.T) {
 // TestLinkingSessions tests that session linking works as expected.
 func TestLinkingSessions(t *testing.T) {
 	// Set up a new DB.
-	db, err := NewDB(t.TempDir(), "test.db", clock.NewTestClock(testTime))
+	clock := clock.NewTestClock(testTime)
+	db, err := NewDB(t.TempDir(), "test.db", clock)
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		_ = db.Close()
 	})
 
 	// Create a new session with no previous link.
-	s1 := newSession(t, db, "session 1", nil)
+	s1 := newSession(t, db, clock, "session 1", nil)
 
 	// Create another session and link it to the first.
-	s2 := newSession(t, db, "session 2", &s1.GroupID)
+	s2 := newSession(t, db, clock, "session 2", &s1.GroupID)
 
 	// Try to persist the second session and assert that it fails due to the
 	// linked session not existing in the DB yet.
@@ -128,7 +130,8 @@ func TestLinkingSessions(t *testing.T) {
 // of the GetGroupID and GetSessionIDs methods.
 func TestLinkedSessions(t *testing.T) {
 	// Set up a new DB.
-	db, err := NewDB(t.TempDir(), "test.db", clock.NewTestClock(testTime))
+	clock := clock.NewTestClock(testTime)
+	db, err := NewDB(t.TempDir(), "test.db", clock)
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		_ = db.Close()
@@ -138,9 +141,9 @@ func TestLinkedSessions(t *testing.T) {
 	// after are all linked to the prior one. All these sessions belong to
 	// the same group. The group ID is equivalent to the session ID of the
 	// first session.
-	s1 := newSession(t, db, "session 1", nil)
-	s2 := newSession(t, db, "session 2", &s1.GroupID)
-	s3 := newSession(t, db, "session 3", &s2.GroupID)
+	s1 := newSession(t, db, clock, "session 1", nil)
+	s2 := newSession(t, db, clock, "session 2", &s1.GroupID)
+	s3 := newSession(t, db, clock, "session 3", &s2.GroupID)
 
 	// Persist the sessions.
 	require.NoError(t, db.CreateSession(s1))
@@ -166,8 +169,8 @@ func TestLinkedSessions(t *testing.T) {
 
 	// To ensure that different groups don't interfere with each other,
 	// let's add another set of linked sessions not linked to the first.
-	s4 := newSession(t, db, "session 4", nil)
-	s5 := newSession(t, db, "session 5", &s4.GroupID)
+	s4 := newSession(t, db, clock, "session 4", nil)
+	s5 := newSession(t, db, clock, "session 5", &s4.GroupID)
 
 	require.NotEqual(t, s4.GroupID, s1.GroupID)
 
@@ -195,7 +198,8 @@ func TestLinkedSessions(t *testing.T) {
 // method correctly checks if each session in a group passes a predicate.
 func TestCheckSessionGroupPredicate(t *testing.T) {
 	// Set up a new DB.
-	db, err := NewDB(t.TempDir(), "test.db", clock.NewTestClock(testTime))
+	clock := clock.NewTestClock(testTime)
+	db, err := NewDB(t.TempDir(), "test.db", clock)
 	require.NoError(t, err)
 	t.Cleanup(func() {
 		_ = db.Close()
@@ -205,7 +209,7 @@ func TestCheckSessionGroupPredicate(t *testing.T) {
 	// function is checked correctly.
 
 	// Add a new session to the DB.
-	s1 := newSession(t, db, "label 1", nil)
+	s1 := newSession(t, db, clock, "label 1", nil)
 	require.NoError(t, db.CreateSession(s1))
 
 	// Check that the group passes against an appropriate predicate.
@@ -230,7 +234,7 @@ func TestCheckSessionGroupPredicate(t *testing.T) {
 	require.NoError(t, db.RevokeSession(s1.LocalPublicKey))
 
 	// Add a new session to the same group as the first one.
-	s2 := newSession(t, db, "label 2", &s1.GroupID)
+	s2 := newSession(t, db, clock, "label 2", &s1.GroupID)
 	require.NoError(t, db.CreateSession(s2))
 
 	// Check that the group passes against an appropriate predicate.
@@ -252,7 +256,7 @@ func TestCheckSessionGroupPredicate(t *testing.T) {
 	require.False(t, ok)
 
 	// Add a new session that is not linked to the first one.
-	s3 := newSession(t, db, "completely different", nil)
+	s3 := newSession(t, db, clock, "completely different", nil)
 	require.NoError(t, db.CreateSession(s3))
 
 	// Ensure that the first group is unaffected.
@@ -282,15 +286,15 @@ func TestCheckSessionGroupPredicate(t *testing.T) {
 	require.True(t, ok)
 }
 
-func newSession(t *testing.T, db Store, label string,
+func newSession(t *testing.T, db Store, clock clock.Clock, label string,
 	linkedGroupID *ID) *Session {
 
 	id, priv, err := db.GetUnusedIDAndKeyPair()
 	require.NoError(t, err)
 
 	session, err := buildSession(
 		id, priv, label, TypeMacaroonAdmin,
-		time.Now(),
+		clock.Now(),
 		time.Date(99999, 1, 1, 0, 0, 0, 0, time.UTC),
 		"foo.bar.baz:1234", true, nil, nil, nil, true, linkedGroupID,
 		[]PrivacyFlag{ClearPubkeys},