Skip to content

Commit 93dfbf1

Browse files
committed
fix(sdk/go): re-read edge token on every request
Closes #4515 Signed-off-by: Eric Curtin <[email protected]>
1 parent c4688aa commit 93dfbf1

3 files changed

Lines changed: 22 additions & 52 deletions

File tree

‎sdk/go/openshell/v1/gateway/gateway.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func resolveAuthProvider(cfg *Config) (types.AuthProvider, error) {
166166
// Token loading is deferred to GetRequestMetadata so that
167167
// NewClient succeeds even when the token file is missing.
168168
// The error surfaces on first authentication attempt (FR-007).
169-
return &lazyEdgeAuth{loader: &edgeTokenLoader{dir: cfg.Dir}}, nil
169+
return &lazyEdgeAuth{dir: cfg.Dir}, nil
170170

171171
case AuthModeOIDC:
172172
src := newDiskTokenSource(cfg.Dir)

‎sdk/go/openshell/v1/gateway/token.go‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"os"
1111
"path/filepath"
1212
"strings"
13-
"sync"
1413
"time"
1514

1615
"golang.org/x/oauth2"
@@ -28,32 +27,6 @@ const (
2827
oidcTokenFile = "oidc_token.json"
2928
)
3029

31-
// edgeTokenLoader provides lazy, thread-safe loading of the edge token
32-
// from disk. Successful loads are cached; failures are retried so a token
33-
// created after client construction can be picked up without a restart.
34-
type edgeTokenLoader struct {
35-
dir string
36-
mu sync.Mutex
37-
token string
38-
}
39-
40-
// load returns the edge token string, reading it from disk on the first
41-
// call. It tries edge_token first, falling back to cf_token for legacy
42-
// compatibility. Only a successful result is cached.
43-
func (l *edgeTokenLoader) load() (string, error) {
44-
l.mu.Lock()
45-
defer l.mu.Unlock()
46-
if l.token != "" {
47-
return l.token, nil
48-
}
49-
token, err := readEdgeToken(l.dir)
50-
if err != nil {
51-
return "", err
52-
}
53-
l.token = token
54-
return token, nil
55-
}
56-
5730
// readEdgeToken reads the edge token from the given directory. It tries
5831
// edge_token first, then cf_token as a legacy fallback. The file content
5932
// is trimmed of surrounding whitespace.
@@ -158,14 +131,14 @@ func (d *diskTokenSource) Token() (*oauth2.Token, error) {
158131
// NewClient succeeds even when the token file is missing on disk (FR-007).
159132
// The error surfaces on the first authentication attempt.
160133
type lazyEdgeAuth struct {
161-
loader *edgeTokenLoader
134+
dir string
162135
}
163136

164-
// GetRequestMetadata loads the edge token lazily and returns it as a
165-
// Bearer authorization header. The first load is cached by the
166-
// underlying edgeTokenLoader.
137+
// GetRequestMetadata reads the edge token from disk on every call and
138+
// returns it as a Bearer authorization header. Reading each time picks up
139+
// tokens rewritten by the CLI without a process restart.
167140
func (a *lazyEdgeAuth) GetRequestMetadata(_ context.Context, _ ...string) (map[string]string, error) {
168-
token, err := a.loader.load()
141+
token, err := readEdgeToken(a.dir)
169142
if err != nil {
170143
return nil, err
171144
}

‎sdk/go/openshell/v1/gateway/token_test.go‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package gateway
55

66
import (
7+
"context"
78
"os"
89
"path/filepath"
910
"testing"
@@ -83,41 +84,37 @@ func TestReadEdgeToken_EmptyFallbackFile(t *testing.T) {
8384
assert.Contains(t, err.Error(), "empty")
8485
}
8586

86-
func TestEdgeTokenLoader_Lazy(t *testing.T) {
87+
func TestLazyEdgeAuth_ReloadsRewrittenToken(t *testing.T) {
8788
dir := t.TempDir()
88-
writeFile(t, dir, edgeTokenFile, "lazy-token")
89+
writeFile(t, dir, edgeTokenFile, "old-token")
8990

90-
loader := &edgeTokenLoader{dir: dir}
91+
auth := &lazyEdgeAuth{dir: dir}
9192

92-
// First call reads from disk.
93-
token1, err := loader.load()
93+
md, err := auth.GetRequestMetadata(context.Background())
9494
require.NoError(t, err)
95-
assert.Equal(t, "lazy-token", token1)
95+
assert.Equal(t, "Bearer old-token", md["authorization"])
9696

97-
// Remove the file. Second call should return cached value.
98-
require.NoError(t, os.Remove(filepath.Join(dir, edgeTokenFile)))
97+
writeFile(t, dir, edgeTokenFile, "new-token")
9998

100-
token2, err := loader.load()
99+
md, err = auth.GetRequestMetadata(context.Background())
101100
require.NoError(t, err)
102-
assert.Equal(t, "lazy-token", token2, "should return cached token")
101+
assert.Equal(t, "Bearer new-token", md["authorization"])
103102
}
104103

105-
func TestEdgeTokenLoader_LazyError(t *testing.T) {
104+
func TestLazyEdgeAuth_PicksUpLateToken(t *testing.T) {
106105
dir := t.TempDir()
107106
// No token files exist.
108107

109-
loader := &edgeTokenLoader{dir: dir}
108+
auth := &lazyEdgeAuth{dir: dir}
110109

111-
// First call fails.
112-
_, err1 := loader.load()
113-
require.Error(t, err1)
110+
_, err := auth.GetRequestMetadata(context.Background())
111+
require.ErrorIs(t, err, ErrTokenLoad)
114112

115-
// Write the file now. A transient load failure must not be cached.
116113
writeFile(t, dir, edgeTokenFile, "late-token")
117114

118-
token, err2 := loader.load()
119-
require.NoError(t, err2)
120-
assert.Equal(t, "late-token", token)
115+
md, err := auth.GetRequestMetadata(context.Background())
116+
require.NoError(t, err)
117+
assert.Equal(t, "Bearer late-token", md["authorization"])
121118
}
122119

123120
// --- T015: diskTokenSource tests ---

0 commit comments

Comments
 (0)