session: use clock for times

And be consistent with UTC conversions.

Author: ellemouton

session/interface.go

@@ -73,9 +73,10 @@ type Session struct {
 
 // buildSession creates a new session with the given user-defined parameters.
 func buildSession(id ID, localPrivKey *btcec.PrivateKey, label string, typ Type,
-	expiry time.Time, serverAddr string, devServer bool, perms []bakery.Op,
-	caveats []macaroon.Caveat, featureConfig FeaturesConfig,
-	privacy bool, linkedGroupID *ID, flags PrivacyFlags) (*Session, error) {
+	created, expiry time.Time, serverAddr string, devServer bool,
+	perms []bakery.Op, caveats []macaroon.Caveat,
+	featureConfig FeaturesConfig, privacy bool, linkedGroupID *ID,
+	flags PrivacyFlags) (*Session, error) {
 
 	_, pairingSecret, err := mailbox.NewPassphraseEntropy()
 	if err != nil {
@@ -98,8 +99,8 @@ func buildSession(id ID, localPrivKey *btcec.PrivateKey, label string, typ Type,
 		Label:             label,
 		State:             StateCreated,
 		Type:              typ,
-		Expiry:            expiry,
-		CreatedAt:         time.Now(),
+		Expiry:            expiry.UTC(),
+		CreatedAt:         created.UTC(),
 		ServerAddr:        serverAddr,
 		DevServer:         devServer,
 		MacaroonRootKey:   macRootKey,

session/kvdb_store.go

@@ -194,8 +194,9 @@ func (db *BoltStore) NewSession(id ID, localPrivKey *btcec.PrivateKey,
 	flags PrivacyFlags) (*Session, error) {
 
 	return buildSession(
-		id, localPrivKey, label, typ, expiry, serverAddr, devServer,
-		perms, caveats, featureConfig, privacy, linkedGroupID, flags,
+		id, localPrivKey, label, typ, db.clock.Now(), expiry,
+		serverAddr, devServer, perms, caveats, featureConfig, privacy,
+		linkedGroupID, flags,
 	)
 }
 
@@ -424,7 +425,7 @@ func (db *BoltStore) RevokeSession(key *btcec.PublicKey) error {
 		}
 
 		session.State = StateRevoked
-		session.RevokedAt = time.Now()
+		session.RevokedAt = db.clock.Now().UTC()
 
 		var buf bytes.Buffer
 		if err := SerializeSession(&buf, session); err != nil {

session/store_test.go

@@ -290,6 +290,7 @@ func newSession(t *testing.T, db Store, label string,
 
 	session, err := buildSession(
 		id, priv, label, TypeMacaroonAdmin,
+		time.Now(),
 		time.Date(99999, 1, 1, 0, 0, 0, 0, time.UTC),
 		"foo.bar.baz:1234", true, nil, nil, nil, true, linkedGroupID,
 		[]PrivacyFlag{ClearPubkeys},

session/tlv.go

@@ -237,8 +237,8 @@ func DeserializeSession(r io.Reader) (*Session, error) {
 	session.Label = string(label)
 	session.State = State(state)
 	session.Type = Type(typ)
-	session.Expiry = time.Unix(int64(expiry), 0)
-	session.CreatedAt = time.Unix(int64(createdAt), 0)
+	session.Expiry = time.Unix(int64(expiry), 0).UTC()
+	session.CreatedAt = time.Unix(int64(createdAt), 0).UTC()
 	session.ServerAddr = string(serverAddr)
 	session.DevServer = devServer == 1
 	session.WithPrivacyMapper = privacy == 1
@@ -248,7 +248,7 @@ func DeserializeSession(r io.Reader) (*Session, error) {
 	}
 
 	if revokedAt != 0 {
-		session.RevokedAt = time.Unix(int64(revokedAt), 0)
+		session.RevokedAt = time.Unix(int64(revokedAt), 0).UTC()
 	}
 
 	if t, ok := parsedTypes[typeMacaroonRecipe]; ok && t == nil {

session/tlv_test.go

@@ -131,6 +131,7 @@ func TestSerializeDeserializeSession(t *testing.T) {
 
 			session, err := buildSession(
 				id, priv, test.name, test.sessType,
+				time.Now(),
 				time.Date(99999, 1, 1, 0, 0, 0, 0, time.UTC),
 				"foo.bar.baz:1234", true, test.perms,
 				test.caveats, test.featureConfig, true,
@@ -185,6 +186,7 @@ func TestGroupIDForOlderSessions(t *testing.T) {
 
 	session, err := buildSession(
 		id, priv, "test-session", TypeMacaroonAdmin,
+		time.Now(),
 		time.Date(99999, 1, 1, 0, 0, 0, 0, time.UTC),
 		"foo.bar.baz:1234", true, nil, nil, nil, false, nil,
 		PrivacyFlags{},
@@ -220,6 +222,7 @@ func TestGroupID(t *testing.T) {
 	// Create session 1 which is not linked to any previous session.
 	session1, err := buildSession(
 		id, priv, "test-session", TypeMacaroonAdmin,
+		time.Now(),
 		time.Date(99999, 1, 1, 0, 0, 0, 0, time.UTC),
 		"foo.bar.baz:1234", true, nil, nil, nil, false, nil,
 		PrivacyFlags{},
@@ -234,6 +237,7 @@ func TestGroupID(t *testing.T) {
 	require.NoError(t, err)
 	session2, err := buildSession(
 		id, priv, "test-session", TypeMacaroonAdmin,
+		time.Now(),
 		time.Date(99999, 1, 1, 0, 0, 0, 0, time.UTC),
 		"foo.bar.baz:1234", true, nil, nil, nil, false,
 		&session1.GroupID, PrivacyFlags{},