Skip to content

Open-source LLM knowledge platform: turn raw documents into a queryable RAG, an autonomous reasoning agent, and a self-maintaining Wiki.

fix(mcp): keep OAuth token expiry independent of the process time zone (#4207)

Ochan Kwon8af7938aeddf
diff --git a/internal/application/repository/mcp_oauth.go b/internal/application/repository/mcp_oauth.go
index 8a68257f7..44f66d0c1 100644
--- a/internal/application/repository/mcp_oauth.go
+++ b/internal/application/repository/mcp_oauth.go
@@ -39,7 +39,7 @@ func (r *mcpOAuthRepository) GetClient(
}
func (r *mcpOAuthRepository) SaveClient(ctx context.Context, client *types.MCPOAuthClient) error {
- client.UpdatedAt = time.Now()
+ client.UpdatedAt = time.Now().UTC()
return r.db.WithContext(ctx).
Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "tenant_id"}, {Name: "service_id"}},
@@ -101,7 +101,12 @@ func (r *mcpOAuthRepository) SaveTokenForPrincipal(ctx context.Context, token *t
if token.UserID == "" {
token.UserID = (types.Principal{Type: token.PrincipalType, ID: token.PrincipalID}).StorageID()
}
- token.UpdatedAt = time.Now()
+ // Callers compute the expiry from the process clock, which may not be UTC.
+ // Normalize it so the value is also stored as the right instant while the
+ // columns are still naive TIMESTAMP, for example with AUTO_MIGRATE=false
+ // before migration 000118 is applied.
+ token.ExpiresAt = token.ExpiresAt.UTC()
+ token.UpdatedAt = time.Now().UTC()
return r.db.WithContext(ctx).
Clauses(clause.OnConflict{
Columns: []clause.Column{
diff --git a/internal/application/repository/mcp_oauth_test.go b/internal/application/repository/mcp_oauth_test.go
index cbada3168..425ec6640 100644
--- a/internal/application/repository/mcp_oauth_test.go
+++ b/internal/application/repository/mcp_oauth_test.go
@@ -122,3 +122,29 @@ func TestMCPOAuthRepositoryRefreshLeaseHasSingleOwner(t *testing.T) {
require.NoError(t, err)
require.True(t, second)
}
+
+func TestMCPOAuthRepositoryStoresTokenTimesInUTC(t *testing.T) {
+ repo := newMCPOAuthTestRepo(t)
+ ctx := context.Background()
+ // Expiries are computed from the process clock, which runs in the
+ // deployment's local zone rather than UTC.
+ local := time.FixedZone("UTC+9", 9*60*60)
+ expiresAt := time.Date(2026, 10, 12, 21, 3, 32, 0, local)
+ principal := types.Principal{Type: types.PrincipalAPIExternalUser, ID: "7:external-u1"}
+
+ require.NoError(t, repo.SaveTokenForPrincipal(ctx, &types.MCPOAuthToken{
+ TenantID: 7,
+ PrincipalType: principal.Type,
+ PrincipalID: principal.ID,
+ ServiceID: "svc1",
+ AccessToken: "token",
+ TokenType: "Bearer",
+ ExpiresAt: expiresAt,
+ }))
+
+ loaded, err := repo.GetTokenForPrincipal(ctx, 7, principal, "svc1")
+ require.NoError(t, err)
+ require.True(t, loaded.ExpiresAt.Equal(expiresAt), "expiry %s, want %s", loaded.ExpiresAt, expiresAt)
+ require.Equal(t, time.UTC, loaded.ExpiresAt.Location())
+ require.Equal(t, time.UTC, loaded.UpdatedAt.Location())
+}
diff --git a/internal/database/migration_postgres_mcp_oauth_test.go b/internal/database/migration_postgres_mcp_oauth_test.go
new file mode 100644
index 000000000..a1740a18b
--- /dev/null
+++ b/internal/database/migration_postgres_mcp_oauth_test.go
@@ -0,0 +1,76 @@
+package database
+
+import (
+ "context"
+ "os"
+ "strings"
+ "testing"
+ "time"
+
+ "github.com/Tencent/WeKnora/internal/application/repository"
+ "github.com/Tencent/WeKnora/internal/types"
+ "github.com/google/uuid"
+ "github.com/stretchr/testify/require"
+ "gorm.io/driver/postgres"
+ "gorm.io/gorm"
+)
+
+// TestPostgresMCPOAuthTimesKeepTheInstant runs the versioned migrations against
+// a real PostgreSQL; see TestPostgresMigrationsServeAgentHistory for how to
+// start one. The application reads through a TimeZone=UTC session while token
+// expiries come from the process clock, which runs in the deployment's local
+// zone. A naive TIMESTAMP column drops that offset on write and returns a
+// value shifted by it.
+func TestPostgresMCPOAuthTimesKeepTheInstant(t *testing.T) {
+ dsn := os.Getenv("WEKNORA_MIGRATION_TEST_POSTGRES_DSN")
+ if dsn == "" {
+ t.Skip("set WEKNORA_MIGRATION_TEST_POSTGRES_DSN to run PostgreSQL migration tests")
+ }
+ chdirAndRestore(t, sqliteRepoRoot(t))
+ require.NoError(t, RunMigrationsWithOptions(dsn, MigrationOptions{}))
+
+ sep := "?"
+ if strings.Contains(dsn, "?") {
+ sep = "&"
+ }
+ db, err := gorm.Open(postgres.Open(dsn+sep+"TimeZone=UTC"), &gorm.Config{})
+ require.NoError(t, err)
+ sqlDB, err := db.DB()
+ require.NoError(t, err)
+ t.Cleanup(func() { _ = sqlDB.Close() })
+
+ serviceID := uuid.NewString()
+ require.NoError(t, db.Exec(
+ "INSERT INTO mcp_services (id, tenant_id, name, transport_type) VALUES (?, 7, 'tz', 'sse')",
+ serviceID).Error)
+ t.Cleanup(func() { db.Exec("DELETE FROM mcp_services WHERE id = ?", serviceID) })
+
+ ctx := context.Background()
+ repo := repository.NewMCPOAuthRepository(db)
+ principal := types.Principal{Type: types.PrincipalAPIExternalUser, ID: "7:tz"}
+ local := time.FixedZone("UTC+9", 9*60*60)
+ expiresAt := time.Date(2026, 10, 12, 21, 3, 32, 0, local)
+
+ require.NoError(t, repo.SaveTokenForPrincipal(ctx, &types.MCPOAuthToken{
+ TenantID: 7,
+ PrincipalType: principal.Type,
+ PrincipalID: principal.ID,
+ ServiceID: serviceID,
+ AccessToken: "token",
+ TokenType: "Bearer",
+ ExpiresAt: expiresAt,
+ }))
+ loaded, err := repo.GetTokenForPrincipal(ctx, 7, principal, serviceID)
+ require.NoError(t, err)
+ require.True(t, loaded.ExpiresAt.Equal(expiresAt), "expiry %s, want %s", loaded.ExpiresAt, expiresAt)
+
+ // The column itself must keep the instant, so correctness does not rest on
+ // every writer normalizing to UTC first.
+ require.NoError(t, db.Exec(
+ "UPDATE mcp_oauth_tokens SET expires_at = ?, updated_at = ? WHERE service_id = ?",
+ expiresAt, expiresAt, serviceID).Error)
+ loaded, err = repo.GetTokenForPrincipal(ctx, 7, principal, serviceID)
+ require.NoError(t, err)
+ require.True(t, loaded.ExpiresAt.Equal(expiresAt), "expiry %s, want %s", loaded.ExpiresAt, expiresAt)
+ require.True(t, loaded.UpdatedAt.Equal(expiresAt), "updated_at %s, want %s", loaded.UpdatedAt, expiresAt)
+}
diff --git a/internal/mcp/oauth_lifecycle.go b/internal/mcp/oauth_lifecycle.go
index 06ddd71e6..0d50efb91 100644
--- a/internal/mcp/oauth_lifecycle.go
+++ b/internal/mcp/oauth_lifecycle.go
@@ -101,7 +101,9 @@ func tokenStatus(token *types.MCPOAuthToken, now time.Time) OAuthAuthorizationSt
}
status.RefreshAvailable = token.RefreshToken != ""
if !token.ExpiresAt.IsZero() {
- expiresAt := token.ExpiresAt
+ // The database driver returns timestamptz values in the process time
+ // zone; report UTC so the response does not vary by deployment.
+ expiresAt := token.ExpiresAt.UTC()
status.ExpiresAt = &expiresAt
}
if token.ExpiresAt.IsZero() || token.ExpiresAt.After(now) {
diff --git a/internal/mcp/oauth_lifecycle_test.go b/internal/mcp/oauth_lifecycle_test.go
index f44d8d9f7..c55404ce7 100644
--- a/internal/mcp/oauth_lifecycle_test.go
+++ b/internal/mcp/oauth_lifecycle_test.go
@@ -297,6 +297,14 @@ func TestTokenStatusDoesNotTreatExpiredRowAsAuthorized(t *testing.T) {
require.Equal(t, oauthStateReauthNeeded, status.State)
}
+func TestTokenStatusReportsExpiryInUTC(t *testing.T) {
+ expiresAt := time.Now().Add(time.Hour).In(time.FixedZone("UTC+9", 9*60*60))
+ status := tokenStatus(&types.MCPOAuthToken{AccessToken: "access", ExpiresAt: expiresAt}, time.Now())
+ require.NotNil(t, status.ExpiresAt)
+ require.True(t, status.ExpiresAt.Equal(expiresAt))
+ require.Equal(t, time.UTC, status.ExpiresAt.Location())
+}
+
func TestOAuthRuntimeDoesNotExpireNonRefreshableTokenEarly(t *testing.T) {
repo := newLockedOAuthRepo()
principal := types.Principal{Type: types.PrincipalWebUser, ID: "user-1"}
diff --git a/migrations/versioned/000118_mcp_oauth_timestamp_tz.down.sql b/migrations/versioned/000118_mcp_oauth_timestamp_tz.down.sql
new file mode 100644
index 000000000..101b932c0
--- /dev/null
+++ b/migrations/versioned/000118_mcp_oauth_timestamp_tz.down.sql
@@ -0,0 +1,23 @@
+DO $$ BEGIN RAISE NOTICE '[Migration 000118 down] Reverting MCP OAuth timestamps to timestamp...'; END $$;
+
+ALTER TABLE mcp_oauth_tokens
+ ALTER COLUMN expires_at TYPE TIMESTAMP WITHOUT TIME ZONE
+ USING expires_at AT TIME ZONE 'UTC';
+
+ALTER TABLE mcp_oauth_tokens
+ ALTER COLUMN created_at TYPE TIMESTAMP WITHOUT TIME ZONE
+ USING created_at AT TIME ZONE 'UTC';
+
+ALTER TABLE mcp_oauth_tokens
+ ALTER COLUMN updated_at TYPE TIMESTAMP WITHOUT TIME ZONE
+ USING updated_at AT TIME ZONE 'UTC';
+
+ALTER TABLE mcp_oauth_clients
+ ALTER COLUMN created_at TYPE TIMESTAMP WITHOUT TIME ZONE
+ USING created_at AT TIME ZONE 'UTC';
+
+ALTER TABLE mcp_oauth_clients
+ ALTER COLUMN updated_at TYPE TIMESTAMP WITHOUT TIME ZONE
+ USING updated_at AT TIME ZONE 'UTC';
+
+DO $$ BEGIN RAISE NOTICE '[Migration 000118 down] MCP OAuth timestamps reverted'; END $$;
diff --git a/migrations/versioned/000118_mcp_oauth_timestamp_tz.up.sql b/migrations/versioned/000118_mcp_oauth_timestamp_tz.up.sql
new file mode 100644
index 000000000..c7e234f7f
--- /dev/null
+++ b/migrations/versioned/000118_mcp_oauth_timestamp_tz.up.sql
@@ -0,0 +1,27 @@
+DO $$ BEGIN RAISE NOTICE '[Migration 000118] Converting MCP OAuth timestamps to timestamptz...'; END $$;
+
+-- Naive TIMESTAMP values were read through a GORM session with TimeZone=UTC.
+-- Treat existing literals as UTC when promoting to timestamptz. Rows written
+-- by a process outside UTC keep their shifted value until the token is
+-- authorized or refreshed again.
+ALTER TABLE mcp_oauth_tokens
+ ALTER COLUMN expires_at TYPE TIMESTAMP WITH TIME ZONE
+ USING expires_at AT TIME ZONE 'UTC';
+
+ALTER TABLE mcp_oauth_tokens
+ ALTER COLUMN created_at TYPE TIMESTAMP WITH TIME ZONE
+ USING created_at AT TIME ZONE 'UTC';
+
+ALTER TABLE mcp_oauth_tokens
+ ALTER COLUMN updated_at TYPE TIMESTAMP WITH TIME ZONE
+ USING updated_at AT TIME ZONE 'UTC';
+
+ALTER TABLE mcp_oauth_clients
+ ALTER COLUMN created_at TYPE TIMESTAMP WITH TIME ZONE
+ USING created_at AT TIME ZONE 'UTC';
+
+ALTER TABLE mcp_oauth_clients
+ ALTER COLUMN updated_at TYPE TIMESTAMP WITH TIME ZONE
+ USING updated_at AT TIME ZONE 'UTC';
+
+DO $$ BEGIN RAISE NOTICE '[Migration 000118] MCP OAuth timestamps converted'; END $$;