diff --git a/integration/cluster.go b/integration/cluster.go index 11d44c96541..d881f813796 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -126,7 +126,8 @@ type ClusterConfig struct { DiscoveryURL string - AuthToken string + AuthToken string + AuthTokenTTL uint UseGRPC bool @@ -285,6 +286,7 @@ func (c *cluster) mustNewMember(t testing.TB) *member { memberConfig{ name: c.name(rand.Int()), authToken: c.cfg.AuthToken, + authTokenTTL: c.cfg.AuthTokenTTL, peerTLS: c.cfg.PeerTLS, clientTLS: c.cfg.ClientTLS, quotaBackendBytes: c.cfg.QuotaBackendBytes, @@ -579,6 +581,7 @@ type memberConfig struct { peerTLS *transport.TLSInfo clientTLS *transport.TLSInfo authToken string + authTokenTTL uint quotaBackendBytes int64 maxTxnOps uint maxRequestBytes uint @@ -665,6 +668,9 @@ func mustNewMember(t testing.TB, mcfg memberConfig) *member { if mcfg.authToken != "" { m.AuthToken = mcfg.authToken } + if mcfg.authTokenTTL != 0 { + m.TokenTTL = mcfg.authTokenTTL + } m.BcryptCost = uint(bcrypt.MinCost) // use min bcrypt cost to speedy up integration testing diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index 03c01ef6d7f..bccc77ed55a 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -471,3 +471,36 @@ func TestV3AuthRestartMember(t *testing.T) { _, err = c2.Put(context.TODO(), "foo", "bar2") testutil.AssertNil(t, err) } + +func TestV3AuthWatchAndTokenExpire(t *testing.T) { + defer testutil.AfterTest(t) + clus := NewClusterV3(t, &ClusterConfig{Size: 1, AuthTokenTTL: 3}) + defer clus.Terminate(t) + + ctx, cancel := context.WithTimeout(context.TODO(), 10*time.Second) + defer cancel() + + authSetupRoot(t, toGRPC(clus.Client(0)).Auth) + + c, cerr := clientv3.New(clientv3.Config{Endpoints: clus.Client(0).Endpoints(), Username: "root", Password: "123"}) + if cerr != nil { + t.Fatal(cerr) + } + defer c.Close() + + _, err := c.Put(ctx, "key", "val") + if err != nil { + t.Fatalf("Unexpected error from Put: %v", err) + } + + // The first watch gets a valid auth token through watcher.newWatcherGrpcStream() + // We should discard the first one by waiting TTL after the first watch. + wChan := c.Watch(ctx, "key", clientv3.WithRev(1)) + watchResponse := <-wChan + + time.Sleep(5 * time.Second) + + wChan = c.Watch(ctx, "key", clientv3.WithRev(1)) + watchResponse = <-wChan + testutil.AssertNil(t, watchResponse.Err()) +}