@autional/shared 0.1.0-rc.69 → 0.1.0-rc.70
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -10,7 +10,10 @@ const { mockPost } = vi.hoisted(() => ({ mockPost: vi.fn() }));
|
|
|
10
10
|
vi.mock('../../api/client', () => ({ apiClient: { post: mockPost, get: vi.fn() } }));
|
|
11
11
|
vi.mock('../store', () => ({ loginWithTokens: vi.fn() }));
|
|
12
12
|
vi.mock('../service', () => ({ AuthService: { updateCurrentTenant: vi.fn() } }));
|
|
13
|
-
vi.mock('../oauth-client-id-store', () => ({
|
|
13
|
+
vi.mock('../oauth-client-id-store', () => ({
|
|
14
|
+
persistOAuthClientId: vi.fn(),
|
|
15
|
+
getPersistedOAuthClientId: () => '',
|
|
16
|
+
}));
|
|
14
17
|
vi.mock('../auth-trace', () => ({ traceRedirect: vi.fn() }));
|
|
15
18
|
vi.mock('../../config', () => ({ getPortalUrl: () => 'https://auth.example.com' }));
|
|
16
19
|
|
|
@@ -20,7 +20,10 @@ const { mockPost, mockGet, mockLoginWithTokens, mockUpdateCurrentTenant, mockPer
|
|
|
20
20
|
vi.mock('../../api/client', () => ({ apiClient: { post: mockPost, get: mockGet } }));
|
|
21
21
|
vi.mock('../store', () => ({ loginWithTokens: mockLoginWithTokens }));
|
|
22
22
|
vi.mock('../service', () => ({ AuthService: { updateCurrentTenant: mockUpdateCurrentTenant } }));
|
|
23
|
-
vi.mock('../oauth-client-id-store', () => ({
|
|
23
|
+
vi.mock('../oauth-client-id-store', () => ({
|
|
24
|
+
persistOAuthClientId: mockPersistCid,
|
|
25
|
+
getPersistedOAuthClientId: () => '',
|
|
26
|
+
}));
|
|
24
27
|
vi.mock('../auth-trace', () => ({ traceRedirect: mockTrace }));
|
|
25
28
|
vi.mock('../../config', () => ({ getPortalUrl: () => 'https://auth.example.com' }));
|
|
26
29
|
|
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
// @vitest-environment jsdom
|
|
2
|
+
// ============================================================
|
|
3
|
+
// F-008 回归锁:OAuth 交棒(state + PKCE verifier)跨浏览上下文兜底
|
|
4
|
+
//
|
|
5
|
+
// 症状:交棒只写 sessionStorage → 回调页落在**另一个浏览上下文**(PWA standalone 被系统
|
|
6
|
+
// 浏览器接管 / 新标签 / 安卓 Custom Tab)时 sessionStorage 为空 ⇒ `oauth.state_mismatch`,
|
|
7
|
+
// 回调页不换码。修法:同时写 localStorage 兜底(≤5min TTL、origin 绑定、读后双删)。
|
|
8
|
+
// 本文件锁死:兜底能救回登录,但**不放松** CSRF 比对(不匹配照样抛 state_mismatch)。
|
|
9
|
+
// ============================================================
|
|
10
|
+
|
|
11
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
12
|
+
|
|
13
|
+
const {
|
|
14
|
+
mockPost,
|
|
15
|
+
mockGet,
|
|
16
|
+
mockLoginWithTokens,
|
|
17
|
+
mockUpdateCurrentTenant,
|
|
18
|
+
mockPersistCid,
|
|
19
|
+
mockTrace,
|
|
20
|
+
mockGeneratePKCE,
|
|
21
|
+
} = vi.hoisted(() => ({
|
|
22
|
+
mockPost: vi.fn(),
|
|
23
|
+
mockGet: vi.fn(),
|
|
24
|
+
mockLoginWithTokens: vi.fn(),
|
|
25
|
+
mockUpdateCurrentTenant: vi.fn(),
|
|
26
|
+
mockPersistCid: vi.fn(),
|
|
27
|
+
mockTrace: vi.fn(),
|
|
28
|
+
mockGeneratePKCE: vi.fn(() => Promise.resolve({ verifier: 'verifier-1', challenge: 'challenge-1' })),
|
|
29
|
+
}));
|
|
30
|
+
|
|
31
|
+
vi.mock('../../api/client', () => ({ apiClient: { post: mockPost, get: mockGet } }));
|
|
32
|
+
vi.mock('../store', () => ({ loginWithTokens: mockLoginWithTokens }));
|
|
33
|
+
vi.mock('../service', () => ({ AuthService: { updateCurrentTenant: mockUpdateCurrentTenant } }));
|
|
34
|
+
vi.mock('../oauth-client-id-store', () => ({
|
|
35
|
+
persistOAuthClientId: mockPersistCid,
|
|
36
|
+
// 发起时已落 localStorage(跨上下文时 sessionStorage 里没有 client_id)
|
|
37
|
+
getPersistedOAuthClientId: () => 'cid-1',
|
|
38
|
+
}));
|
|
39
|
+
vi.mock('../auth-trace', () => ({ traceRedirect: mockTrace }));
|
|
40
|
+
vi.mock('../pkce', () => ({ generatePKCE: () => mockGeneratePKCE() }));
|
|
41
|
+
vi.mock('../../config', () => ({ getPortalUrl: () => 'https://auth.example.com' }));
|
|
42
|
+
|
|
43
|
+
import { initiateOAuthLogin, handleOAuthCallback, OAuthCallbackError } from '../oauth-login';
|
|
44
|
+
|
|
45
|
+
const HANDOFF_KEY = 'oauth_handoff';
|
|
46
|
+
const ORIGIN = window.location.origin;
|
|
47
|
+
const TTL_MS = 5 * 60 * 1000;
|
|
48
|
+
|
|
49
|
+
function jwt(payload: Record<string, unknown>): string {
|
|
50
|
+
return `h.${btoa(JSON.stringify(payload))}.s`;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
type StoredRecord = {
|
|
54
|
+
v?: number;
|
|
55
|
+
state?: string;
|
|
56
|
+
verifier?: string;
|
|
57
|
+
origin?: string;
|
|
58
|
+
exp?: number;
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
function readRecord(): StoredRecord | null {
|
|
62
|
+
const raw = localStorage.getItem(HANDOFF_KEY);
|
|
63
|
+
return raw ? (JSON.parse(raw) as StoredRecord) : null;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function writeRecord(rec: StoredRecord): void {
|
|
67
|
+
localStorage.setItem(HANDOFF_KEY, JSON.stringify(rec));
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function useCallbackUrl(params: { code?: string; state?: unknown }): void {
|
|
71
|
+
const q = new URLSearchParams();
|
|
72
|
+
if (params.code) q.set('code', params.code);
|
|
73
|
+
if (params.state !== undefined) q.set('state', JSON.stringify(params.state));
|
|
74
|
+
window.history.replaceState({}, '', `/?${q.toString()}`);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
async function codeOf(promise: Promise<unknown>): Promise<string> {
|
|
78
|
+
try {
|
|
79
|
+
await promise;
|
|
80
|
+
throw new Error('expected rejection');
|
|
81
|
+
} catch (e) {
|
|
82
|
+
expect(e).toBeInstanceOf(OAuthCallbackError);
|
|
83
|
+
return (e as OAuthCallbackError).code;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function tokenBody(): URLSearchParams {
|
|
88
|
+
expect(mockPost).toHaveBeenCalledTimes(1);
|
|
89
|
+
return new URLSearchParams(String(mockPost.mock.calls[0][1]));
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
beforeEach(() => {
|
|
93
|
+
vi.clearAllMocks();
|
|
94
|
+
sessionStorage.clear();
|
|
95
|
+
localStorage.clear();
|
|
96
|
+
window.history.replaceState({}, '', '/');
|
|
97
|
+
mockPost.mockResolvedValue({
|
|
98
|
+
data: { access_token: jwt({ sub: 'u-1', email: 'u@example.com' }), refresh_token: 'rt-1' },
|
|
99
|
+
});
|
|
100
|
+
mockGet.mockResolvedValue({ data: {} });
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
describe('F-008 交棒写入(sessionStorage 快路径 + localStorage 兜底)', () => {
|
|
104
|
+
it('发起时同时写两处:sessionStorage 保留 string,localStorage 记录带 exp(≤5min)+origin,无 token', async () => {
|
|
105
|
+
await initiateOAuthLogin('cid-1', 'https://user.example.com/x');
|
|
106
|
+
|
|
107
|
+
const csrf = sessionStorage.getItem('oauth_state');
|
|
108
|
+
expect(csrf).toBeTruthy();
|
|
109
|
+
expect(sessionStorage.getItem('oauth_pkce_verifier')).toBe('verifier-1');
|
|
110
|
+
|
|
111
|
+
const rec = readRecord();
|
|
112
|
+
expect(rec?.v).toBe(1);
|
|
113
|
+
expect(rec?.state).toBe(csrf);
|
|
114
|
+
expect(rec?.verifier).toBe('verifier-1');
|
|
115
|
+
expect(rec?.origin).toBe(ORIGIN);
|
|
116
|
+
// TTL ≤ 5 分钟(留 1s 余量吸收执行耗时)
|
|
117
|
+
expect(Number(rec?.exp) - Date.now()).toBeLessThanOrEqual(TTL_MS);
|
|
118
|
+
expect(Number(rec?.exp) - Date.now()).toBeGreaterThan(TTL_MS - 5000);
|
|
119
|
+
// 值里不得含任何令牌字段
|
|
120
|
+
expect(Object.keys(rec ?? {}).sort()).toEqual(['exp', 'origin', 'state', 'v', 'verifier']);
|
|
121
|
+
expect(JSON.stringify(rec)).not.toMatch(/token|access_token|refresh_token/i);
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
describe('F-008 交棒读取(回调页)', () => {
|
|
126
|
+
it('同上下文:仅 sessionStorage 有值 → 兑换成功(既有行为不变)', async () => {
|
|
127
|
+
sessionStorage.setItem('oauth_state', 'csrf-A');
|
|
128
|
+
sessionStorage.setItem('oauth_pkce_verifier', 'verifier-1');
|
|
129
|
+
sessionStorage.setItem('oauth_client_id', 'cid-1');
|
|
130
|
+
useCallbackUrl({ code: 'c1', state: { csrf: 'csrf-A', redirect: '/dash' } });
|
|
131
|
+
|
|
132
|
+
await handleOAuthCallback();
|
|
133
|
+
|
|
134
|
+
const body = tokenBody();
|
|
135
|
+
expect(body.get('code_verifier')).toBe('verifier-1');
|
|
136
|
+
expect(body.get('client_id')).toBe('cid-1');
|
|
137
|
+
expect(mockLoginWithTokens).toHaveBeenCalledTimes(1);
|
|
138
|
+
expect(mockTrace.mock.calls.at(-1)?.[0]).toBe('/dash');
|
|
139
|
+
});
|
|
140
|
+
|
|
141
|
+
it('跨浏览上下文:sessionStorage 为空、localStorage 兜底未过期 → 兑换成功', async () => {
|
|
142
|
+
// 先在本上下文发起(两处都写),再清掉 sessionStorage 模拟「另一个浏览上下文」
|
|
143
|
+
await initiateOAuthLogin('cid-1', 'https://user.example.com/x');
|
|
144
|
+
const csrf = String(readRecord()?.state);
|
|
145
|
+
sessionStorage.clear();
|
|
146
|
+
|
|
147
|
+
useCallbackUrl({ code: 'c1', state: { csrf } });
|
|
148
|
+
await handleOAuthCallback();
|
|
149
|
+
|
|
150
|
+
const body = tokenBody();
|
|
151
|
+
expect(body.get('code_verifier')).toBe('verifier-1');
|
|
152
|
+
// client_id 跨上下文来自 localStorage 持久值(发起时 persistOAuthClientId)
|
|
153
|
+
expect(body.get('client_id')).toBe('cid-1');
|
|
154
|
+
expect(mockLoginWithTokens).toHaveBeenCalledTimes(1);
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
it('兜底命中后两处都被清除(防重放)', async () => {
|
|
158
|
+
writeRecord({ v: 1, state: 'csrf-A', verifier: 'verifier-1', origin: ORIGIN, exp: Date.now() + TTL_MS });
|
|
159
|
+
useCallbackUrl({ code: 'c1', state: { csrf: 'csrf-A' } });
|
|
160
|
+
|
|
161
|
+
await handleOAuthCallback();
|
|
162
|
+
|
|
163
|
+
expect(sessionStorage.getItem('oauth_state')).toBeNull();
|
|
164
|
+
expect(sessionStorage.getItem('oauth_pkce_verifier')).toBeNull();
|
|
165
|
+
expect(localStorage.getItem(HANDOFF_KEY)).toBeNull();
|
|
166
|
+
|
|
167
|
+
// 二次兑换(同一 state 再来一次)→ 已无交棒可用,按不匹配拒绝
|
|
168
|
+
mockPost.mockClear();
|
|
169
|
+
useCallbackUrl({ code: 'c2', state: { csrf: 'csrf-A' } });
|
|
170
|
+
expect(await codeOf(handleOAuthCallback())).toBe('oauth.state_mismatch');
|
|
171
|
+
expect(mockPost).not.toHaveBeenCalled();
|
|
172
|
+
});
|
|
173
|
+
|
|
174
|
+
it('localStorage 记录已过期 → oauth.state_mismatch(不放行)', async () => {
|
|
175
|
+
writeRecord({
|
|
176
|
+
v: 1,
|
|
177
|
+
state: 'csrf-A',
|
|
178
|
+
verifier: 'verifier-1',
|
|
179
|
+
origin: ORIGIN,
|
|
180
|
+
exp: Date.now() - 1000,
|
|
181
|
+
});
|
|
182
|
+
useCallbackUrl({ code: 'c1', state: { csrf: 'csrf-A' } });
|
|
183
|
+
|
|
184
|
+
expect(await codeOf(handleOAuthCallback())).toBe('oauth.state_mismatch');
|
|
185
|
+
expect(mockPost).not.toHaveBeenCalled();
|
|
186
|
+
});
|
|
187
|
+
|
|
188
|
+
it('origin 不匹配 → 不认(oauth.state_mismatch),且不动别人的记录', async () => {
|
|
189
|
+
writeRecord({
|
|
190
|
+
v: 1,
|
|
191
|
+
state: 'csrf-A',
|
|
192
|
+
verifier: 'verifier-1',
|
|
193
|
+
origin: 'https://other.example.com',
|
|
194
|
+
exp: Date.now() + TTL_MS,
|
|
195
|
+
});
|
|
196
|
+
useCallbackUrl({ code: 'c1', state: { csrf: 'csrf-A' } });
|
|
197
|
+
|
|
198
|
+
expect(await codeOf(handleOAuthCallback())).toBe('oauth.state_mismatch');
|
|
199
|
+
expect(mockPost).not.toHaveBeenCalled();
|
|
200
|
+
expect(readRecord()?.origin).toBe('https://other.example.com');
|
|
201
|
+
});
|
|
202
|
+
|
|
203
|
+
it('兜底记录有效但回调 state 不匹配 → 仍抛 oauth.state_mismatch(CSRF 未放松)', async () => {
|
|
204
|
+
writeRecord({ v: 1, state: 'csrf-A', verifier: 'verifier-1', origin: ORIGIN, exp: Date.now() + TTL_MS });
|
|
205
|
+
useCallbackUrl({ code: 'c1', state: { csrf: 'csrf-B' } });
|
|
206
|
+
|
|
207
|
+
expect(await codeOf(handleOAuthCallback())).toBe('oauth.state_mismatch');
|
|
208
|
+
expect(mockPost).not.toHaveBeenCalled();
|
|
209
|
+
});
|
|
210
|
+
});
|
package/src/auth/oauth-login.ts
CHANGED
|
@@ -13,7 +13,7 @@ import { loginWithTokens } from './store';
|
|
|
13
13
|
import { AuthService } from './service';
|
|
14
14
|
import { generatePKCE } from './pkce';
|
|
15
15
|
import { getPortalUrl } from '../config';
|
|
16
|
-
import { persistOAuthClientId } from './oauth-client-id-store';
|
|
16
|
+
import { getPersistedOAuthClientId, persistOAuthClientId } from './oauth-client-id-store';
|
|
17
17
|
import { traceRedirect } from './auth-trace';
|
|
18
18
|
import { decodeJwtPayload } from './jwt-payload';
|
|
19
19
|
import type { User } from '../types';
|
|
@@ -32,6 +32,152 @@ const SK = {
|
|
|
32
32
|
CID: 'oauth_client_id',
|
|
33
33
|
};
|
|
34
34
|
|
|
35
|
+
// ============================================================
|
|
36
|
+
// F-008:OAuth 交棒(state + PKCE verifier)跨浏览上下文兜底
|
|
37
|
+
//
|
|
38
|
+
// 只写 sessionStorage 时,回调页一旦落在**另一个浏览上下文**就必然读到空值 ⇒
|
|
39
|
+
// `oauth.state_mismatch`(回调页不换码、停在错误页)。触发场景都是推送深链的常见形态:
|
|
40
|
+
// - PWA standalone(桌面/安卓 TWA)被系统浏览器打开
|
|
41
|
+
// - 登录链接在**新标签**打开(target=_blank / 系统「在浏览器中打开」)
|
|
42
|
+
// - 安卓 Custom Tab / iOS SFSafariViewController(独立 sessionStorage)
|
|
43
|
+
// sessionStorage 是 per-context 的,localStorage 才是同源跨上下文共享的。
|
|
44
|
+
//
|
|
45
|
+
// 因此:**同时**写两处 —— sessionStorage(快路径,既有行为不变)、localStorage(兜底);
|
|
46
|
+
// 兜底记录自带 `exp`(≤5 分钟)与 `origin` 绑定,读取时校验;**命中即双删**(防重放:
|
|
47
|
+
// 一条交棒只允许兑换一次 code)。值里只有 state/verifier + 时间戳,**不含任何 token**。
|
|
48
|
+
//
|
|
49
|
+
// 安全语义不变:state 仍与回调参数强比对,不匹配照样抛 `oauth.state_mismatch`;
|
|
50
|
+
// 兜底只解决「读不到」,不解决「不匹配」——严格性没有放松。
|
|
51
|
+
// ============================================================
|
|
52
|
+
|
|
53
|
+
/** localStorage 兜底记录的键(与 sessionStorage 的 SK.STATE/SK.PKCE 分离,便于整体校验/清理) */
|
|
54
|
+
const HANDOFF_KEY = 'oauth_handoff';
|
|
55
|
+
/** 兜底有效期:5 分钟(跳去认证中心 → 输密码/短信 → 回跳的合理上限) */
|
|
56
|
+
const HANDOFF_TTL_MS = 5 * 60 * 1000;
|
|
57
|
+
|
|
58
|
+
interface OAuthHandoff {
|
|
59
|
+
state: string;
|
|
60
|
+
verifier: string;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
interface StoredHandoff extends OAuthHandoff {
|
|
64
|
+
/** 记录版本,未来改结构时可直接判定旧记录无效 */
|
|
65
|
+
v: 1;
|
|
66
|
+
/** 发起方 origin(同源跨上下文才认;防止同 origin 其它部署/子应用的残留被误用) */
|
|
67
|
+
origin: string;
|
|
68
|
+
/** 过期时间戳(ms) */
|
|
69
|
+
exp: number;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
function parseStoredHandoff(raw: string | null): StoredHandoff | null {
|
|
73
|
+
if (!raw) return null;
|
|
74
|
+
try {
|
|
75
|
+
const v = JSON.parse(raw) as Partial<StoredHandoff> | null;
|
|
76
|
+
if (!v || typeof v !== 'object') return null;
|
|
77
|
+
if (v.v !== 1) return null;
|
|
78
|
+
if (typeof v.state !== 'string' || typeof v.verifier !== 'string') return null;
|
|
79
|
+
if (typeof v.origin !== 'string' || typeof v.exp !== 'number') return null;
|
|
80
|
+
return { v: 1, state: v.state, verifier: v.verifier, origin: v.origin, exp: v.exp };
|
|
81
|
+
} catch {
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* 写入交棒:sessionStorage(快路径)+ localStorage(跨上下文兜底)。
|
|
88
|
+
* 存储不可用(隐私模式 / 配额满)时静默降级,绝不让登录流程抛错。
|
|
89
|
+
*/
|
|
90
|
+
function saveHandoff(origin: string, value: OAuthHandoff): void {
|
|
91
|
+
if (typeof window === 'undefined') return;
|
|
92
|
+
const state = value.state || '';
|
|
93
|
+
const verifier = value.verifier || '';
|
|
94
|
+
try {
|
|
95
|
+
if (state) sessionStorage.setItem(SK.STATE, state);
|
|
96
|
+
if (verifier) sessionStorage.setItem(SK.PKCE, verifier);
|
|
97
|
+
} catch {
|
|
98
|
+
/* ignore */
|
|
99
|
+
}
|
|
100
|
+
try {
|
|
101
|
+
const record: StoredHandoff = {
|
|
102
|
+
v: 1,
|
|
103
|
+
state,
|
|
104
|
+
verifier,
|
|
105
|
+
origin,
|
|
106
|
+
exp: Date.now() + HANDOFF_TTL_MS,
|
|
107
|
+
};
|
|
108
|
+
localStorage.setItem(HANDOFF_KEY, JSON.stringify(record));
|
|
109
|
+
} catch {
|
|
110
|
+
/* ignore */
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
/**
|
|
115
|
+
* 读取交棒:先 sessionStorage(同上下文),未命中再读 localStorage 兜底
|
|
116
|
+
* (校验 exp 未过期 + origin 匹配)。**命中即双删**(防重放)。
|
|
117
|
+
* 永不抛错;读不到时返回空串,交由调用方按既有逻辑抛 `state_mismatch` / `pkce_cleared`。
|
|
118
|
+
*/
|
|
119
|
+
function loadHandoff(origin: string): OAuthHandoff {
|
|
120
|
+
if (typeof window === 'undefined') return { state: '', verifier: '' };
|
|
121
|
+
|
|
122
|
+
let state = '';
|
|
123
|
+
let verifier = '';
|
|
124
|
+
try {
|
|
125
|
+
state = sessionStorage.getItem(SK.STATE) || '';
|
|
126
|
+
verifier = sessionStorage.getItem(SK.PKCE) || '';
|
|
127
|
+
} catch {
|
|
128
|
+
/* ignore */
|
|
129
|
+
}
|
|
130
|
+
if (state || verifier) {
|
|
131
|
+
clearHandoff(origin);
|
|
132
|
+
return { state, verifier };
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
let raw: string | null = null;
|
|
136
|
+
try {
|
|
137
|
+
raw = localStorage.getItem(HANDOFF_KEY);
|
|
138
|
+
} catch {
|
|
139
|
+
raw = null;
|
|
140
|
+
}
|
|
141
|
+
if (!raw) return { state: '', verifier: '' };
|
|
142
|
+
|
|
143
|
+
const rec = parseStoredHandoff(raw);
|
|
144
|
+
if (!rec) {
|
|
145
|
+
// 坏记录:直接清掉,避免每次回调都重复解析
|
|
146
|
+
clearHandoff(origin);
|
|
147
|
+
return { state: '', verifier: '' };
|
|
148
|
+
}
|
|
149
|
+
if (rec.origin !== origin) {
|
|
150
|
+
// 同源其它部署(多站点共用 localhost / 多 BASE_PATH)留下的交棒:不用也不动
|
|
151
|
+
return { state: '', verifier: '' };
|
|
152
|
+
}
|
|
153
|
+
if (Date.now() > rec.exp) {
|
|
154
|
+
clearHandoff(origin);
|
|
155
|
+
return { state: '', verifier: '' };
|
|
156
|
+
}
|
|
157
|
+
clearHandoff(origin);
|
|
158
|
+
return { state: rec.state, verifier: rec.verifier };
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/** 清除交棒:两处都删(state/verifier)。只清属于本 origin 的 localStorage 记录。 */
|
|
162
|
+
function clearHandoff(origin: string): void {
|
|
163
|
+
if (typeof window === 'undefined') return;
|
|
164
|
+
try {
|
|
165
|
+
sessionStorage.removeItem(SK.STATE);
|
|
166
|
+
sessionStorage.removeItem(SK.PKCE);
|
|
167
|
+
} catch {
|
|
168
|
+
/* ignore */
|
|
169
|
+
}
|
|
170
|
+
try {
|
|
171
|
+
const raw = localStorage.getItem(HANDOFF_KEY);
|
|
172
|
+
if (!raw) return;
|
|
173
|
+
const rec = parseStoredHandoff(raw);
|
|
174
|
+
// 解析失败 = 坏记录,一并清掉;origin 不符(别的部署的进行中交棒)则保留
|
|
175
|
+
if (!rec || rec.origin === origin) localStorage.removeItem(HANDOFF_KEY);
|
|
176
|
+
} catch {
|
|
177
|
+
/* ignore */
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
|
|
35
181
|
/**
|
|
36
182
|
* 第一方门户登录申请的 scope —— **单一真源**。
|
|
37
183
|
*
|
|
@@ -167,8 +313,8 @@ export function discardPendingOAuthLogin(): void {
|
|
|
167
313
|
clearTimeout(retryTimer);
|
|
168
314
|
retryTimer = null;
|
|
169
315
|
}
|
|
170
|
-
sessionStorage
|
|
171
|
-
|
|
316
|
+
// F-008:交棒可能在 sessionStorage(同上下文)或 localStorage(跨上下文兜底),两处都清
|
|
317
|
+
clearHandoff(window.location.origin);
|
|
172
318
|
sessionStorage.removeItem(SK.CID);
|
|
173
319
|
sessionStorage.removeItem(SK.INIT_TS);
|
|
174
320
|
}
|
|
@@ -274,6 +420,8 @@ export async function initiateOAuthLogin(
|
|
|
274
420
|
const cfg = getConfig();
|
|
275
421
|
const cid = clientId || cfg.clientId;
|
|
276
422
|
if (!cid) throw new Error('OAuth client_id is not available');
|
|
423
|
+
/** 交棒记录的 origin 绑定:回调页必须在同一 origin(跨浏览上下文但同源)才认 */
|
|
424
|
+
const handoffOrigin = window.location.origin;
|
|
277
425
|
|
|
278
426
|
// 申请 scope:调用方显式传入则用之(含额外 scope),否则沿用基础 scope(零波及其它站点)
|
|
279
427
|
const requestedScope = opts?.scope?.trim() || cfg.scope;
|
|
@@ -282,7 +430,9 @@ export async function initiateOAuthLogin(
|
|
|
282
430
|
const csrf = randomState();
|
|
283
431
|
const state = JSON.stringify({ csrf, redirect: target });
|
|
284
432
|
|
|
285
|
-
sessionStorage
|
|
433
|
+
// 交棒(state):sessionStorage 快路径 + localStorage 跨上下文兜底(F-008)。
|
|
434
|
+
// 此处先落 state;verifier 需等 generatePKCE,稍后补齐整条记录。
|
|
435
|
+
saveHandoff(handoffOrigin, { state: csrf, verifier: '' });
|
|
286
436
|
sessionStorage.setItem(SK.CID, cid);
|
|
287
437
|
// 交棒时落持久层:刷新/登出在 React 上下文外,拿不到 slug 解析结果(TASK-09 / D8)
|
|
288
438
|
persistOAuthClientId(cid);
|
|
@@ -300,7 +450,8 @@ export async function initiateOAuthLogin(
|
|
|
300
450
|
|
|
301
451
|
try {
|
|
302
452
|
const pkce = await generatePKCE();
|
|
303
|
-
|
|
453
|
+
// 补齐 verifier 后重写整条交棒(localStorage 兜底记录同时带上 verifier)
|
|
454
|
+
saveHandoff(handoffOrigin, { state: csrf, verifier: pkce.verifier });
|
|
304
455
|
const params = new URLSearchParams({
|
|
305
456
|
response_type: 'code',
|
|
306
457
|
client_id: cid,
|
|
@@ -348,9 +499,16 @@ export async function handleOAuthCallback(): Promise<void> {
|
|
|
348
499
|
const code = q.get('code');
|
|
349
500
|
if (!code) throw new OAuthCallbackError('oauth.missing_code', 'Missing authorization code');
|
|
350
501
|
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
502
|
+
// F-008:交棒读取走 helper —— 先 sessionStorage(同上下文快路径),未命中再读
|
|
503
|
+
// localStorage 兜底(跨浏览上下文:PWA standalone → 外部浏览器 / 新标签 / Custom Tab)。
|
|
504
|
+
// 命中即双删(防重放);读不到仍是空串 ⇒ 下面照旧抛 state_mismatch / pkce_cleared。
|
|
505
|
+
const cbOrigin = window.location.origin;
|
|
506
|
+
const handoff = loadHandoff(cbOrigin);
|
|
507
|
+
const storedState = handoff.state;
|
|
508
|
+
const verifier = handoff.verifier;
|
|
509
|
+
// client_id:sessionStorage 优先,localStorage 持久值兜底(跨上下文时 session 里没有;
|
|
510
|
+
// 发起时 persistOAuthClientId 已落库,不含任何凭据)
|
|
511
|
+
const cid = sessionStorage.getItem(SK.CID) || getPersistedOAuthClientId();
|
|
354
512
|
|
|
355
513
|
// State is always JSON: { csrf, redirect }
|
|
356
514
|
let oauthRedirectTarget: string | null = null;
|
|
@@ -404,8 +562,8 @@ export async function handleOAuthCallback(): Promise<void> {
|
|
|
404
562
|
|
|
405
563
|
// 用毕即焚(AUTH-08):兑换请求已消费 code_verifier/state/client_id,立即清除;
|
|
406
564
|
// 原清理点在 userinfo、/auth/me 多次 await 之后,明文 verifier 驻留窗口被无谓拉长。
|
|
407
|
-
|
|
408
|
-
|
|
565
|
+
// F-008:state/verifier 通常已在 loadHandoff 命中时双删,这里再清一次(幂等兜底)。
|
|
566
|
+
clearHandoff(cbOrigin);
|
|
409
567
|
sessionStorage.removeItem(SK.CID);
|
|
410
568
|
|
|
411
569
|
const t = res.data as any;
|