support multiple access tokens

users can now generate five access tokens

Author: Varunram

database/common.go

@@ -151,10 +151,18 @@ func ValidateAccessToken(name string, accessToken string) (User, error) {
 		if !user.Conf {
 			continue
 		}
-		if user.Username == name && user.AccessToken == accessToken &&
-			utils.Unix()-user.AccessTokenTimeout < consts.AccessTokenLife {
-			return user, nil
+		if user.Username == name {
+			dummy = user
+			break
 		}
 	}
+
+	timeNow := utils.Unix()
+	for storedToken, timeout := range dummy.AccessToken {
+		if storedToken == accessToken && timeNow-timeout < consts.AccessTokenLife {
+			return dummy, nil
+		}
+	}
+
 	return dummy, errors.New("could not find user with requested credentials")
 }

database/user.go

@@ -83,9 +83,7 @@ type User struct {
 	// AnchorKYC contains KYC information required by AnchorUSD
 	AnchorKYC AnchorKYCHelper
 	// AccessToken is the access token that will be used for authenticating RPC requests made to the server
-	AccessToken string
-	// AccessTokenTimeout is the unix time at which the accessToken was generated
-	AccessTokenTimeout int64
+	AccessToken map[string]int64
 	// Mailbox is a mailbox where admins can send you messages or updated on your invested / interested projects
 	Mailbox []MailboxHelper
 	// Legal is a bool which is set when the user accepts the terms and conditions
@@ -594,20 +592,45 @@ func (a *User) ImportSeed(encryptedSeed []byte, pubkey string, seedpwd string) e
 
 // GenAccessToken generates a new access token for the user
 func (a *User) GenAccessToken() (string, error) {
-	a.AccessToken = utils.GetRandomString(consts.AccessTokenLength)
-	a.AccessTokenTimeout = utils.Unix()
+	timeNow := utils.Unix()
+	if len(a.AccessToken) == 0 {
+		a.AccessToken = make(map[string]int64)
+	} else {
+		// delete expired tokens
+		for token, timeout := range a.AccessToken {
+			if timeNow-timeout >= consts.AccessTokenLife {
+				delete(a.AccessToken, token)
+			}
+		}
+
+		if len(a.AccessToken) == 5 { // all 5 tokens are valid, delete oldest token
+			min := int64(0)
+			minToken := ""
+			for token, timeout := range a.AccessToken {
+				if timeout > min {
+					min = timeout
+					minToken = token
+				}
+			}
+			delete(a.AccessToken, minToken) // delete the oldest token
+		}
+	}
+
+	token := utils.GetRandomString(consts.AccessTokenLength)
+	a.AccessToken[token] = timeNow
 
 	err := a.Save()
 	if err != nil {
 		return "", errors.Wrap(err, "could not save user to database")
 	}
-	return a.AccessToken, nil
+	return token, nil
 }
 
 // AllLogout invalidates the user access token
 func (a *User) AllLogout() error {
-	a.AccessToken = utils.GetRandomString(consts.AccessTokenLength)
-	a.AccessTokenTimeout = utils.Unix()
+	for token := range a.AccessToken {
+		delete(a.AccessToken, token)
+	}
 	return a.Save()
 }
 

go.mod

@@ -3,7 +3,7 @@ module github.com/YaleOpenLab/openx
 go 1.13
 
 require (
-	github.com/Varunram/essentials v1.0.3
+	github.com/Varunram/essentials v1.0.4
 	github.com/bithyve/research v0.0.0-20191102090848-d238806b60bf
 	github.com/boltdb/bolt v1.3.1
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
@@ -25,8 +25,8 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.7.0
-	github.com/stellar/go v0.0.0-20200527155254-4b6180abef10
+	github.com/stellar/go v0.0.0-20200528062442-f08b35a3f034
 	github.com/stellar/go-xdr v0.0.0-20200331223602-71a1e6d555f2 // indirect
 	github.com/stretchr/objx v0.2.0 // indirect
-	gopkg.in/ini.v1 v1.56.0 // indirect
+	gopkg.in/ini.v1 v1.57.0 // indirect
 )

go.sum

@@ -34,8 +34,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/Varunram/essentials v1.0.3 h1:yvtIktxyyFLem7DlPVEialdhhEQTNOClYU8/hLIc2EU=
-github.com/Varunram/essentials v1.0.3/go.mod h1:zMk9fBDl4caEScH5ldr0qkWKRgdLMnVx9Noiz33PISs=
+github.com/Varunram/essentials v1.0.4 h1:vozDqHxIx1/+SwrqNgau38BFHbmuXl/RdhXktRaMACA=
+github.com/Varunram/essentials v1.0.4/go.mod h1:zMk9fBDl4caEScH5ldr0qkWKRgdLMnVx9Noiz33PISs=
 github.com/VictoriaMetrics/fastcache v1.5.7/go.mod h1:ptDBkNMQI4RtmVo8VS/XwRY6RoTu1dAWCbrk+6WsEM8=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f h1:zvClvFQwU++UpIUBGC8YmDlfhUrweEy1R1Fj1gu5iIM=
@@ -496,8 +496,8 @@ github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZL
 github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw=
 github.com/steakknife/hamming v0.0.0-20180906055917-c99c65617cd3/go.mod h1:hpGUWaI9xL8pRQCTXQgocU38Qw1g0Us7n5PxxTwTCYU=
 github.com/stellar/go v0.0.0-20200515153832-820becd8083b/go.mod h1:kfZjGLxoc7P6QAk7BOrXL1qVk7gJV3+OSk4FCf0dXsM=
-github.com/stellar/go v0.0.0-20200527155254-4b6180abef10 h1:oMka3ywMJQHCsZe8NtLdYe5CLWBSyS6POhUYe0ICoBM=
-github.com/stellar/go v0.0.0-20200527155254-4b6180abef10/go.mod h1:Q4JDgZhGw7Ytu1924PzNkwr2GsLptrzAjwC/icuXnLU=
+github.com/stellar/go v0.0.0-20200528062442-f08b35a3f034 h1:YbQySRDlm+qU2+khzooq+bCEteADDprTrqh2YMNehqI=
+github.com/stellar/go v0.0.0-20200528062442-f08b35a3f034/go.mod h1:Q4JDgZhGw7Ytu1924PzNkwr2GsLptrzAjwC/icuXnLU=
 github.com/stellar/go-xdr v0.0.0-20180917104419-0bc96f33a18e h1:n/hfey8pO+RYMoGXyvyzuw5pdO8IFDoyAL/g5OiCesY=
 github.com/stellar/go-xdr v0.0.0-20180917104419-0bc96f33a18e/go.mod h1:gpOLVzy6TVYTQ3LvHSN9RJC700FkhFCpSE82u37aNRM=
 github.com/stellar/go-xdr v0.0.0-20200331223602-71a1e6d555f2 h1:K9H+A+eWe8ZlnpNha+pXbEK+jtIluQp/2dKxkK8k7OE=
@@ -703,8 +703,8 @@ gopkg.in/gavv/httpexpect.v1 v1.0.0-20170111145843-40724cf1e4a0/go.mod h1:WtiW9ZA
 gopkg.in/gorp.v1 v1.7.1/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
 gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.56.0 h1:DPMeDvGTM54DXbPkVIZsp19fp/I2K7zwA/itHYHKo8Y=
-gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww=
+gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200316214253-d7b0ff38cac9/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=

test.go

@@ -104,8 +104,8 @@ func main() {
 		admin.Index = 1
 		admin.Username = "admin"
 		admin.Pwhash = utils.SHA3hash("password")
-		admin.AccessToken = "pmkjMEnyeUpdTyhdHElkBExEKeLIlYft"
-		admin.AccessTokenTimeout = utils.Unix() + 1000000
+		admin.AccessToken = make(map[string]int64)
+		admin.AccessToken["pmkjMEnyeUpdTyhdHElkBExEKeLIlYft"] = utils.Unix() + 10000000000
 		admin.Admin = true
 		admin.Conf = true
 		err = admin.Save()