Skip to content

Commit bb19fa4

Browse files
committed
fix(clock-skew): exclude server processing time from skew correction
1 parent 7485eaa commit bb19fa4

5 files changed

Lines changed: 27 additions & 49 deletions

File tree

‎packages-internal/core/integ/clock-skew.integ.spec.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ describe("Clock Skew Integration Tests", () => {
169169
{
170170
sendMs: new Date("2026-01-01T00:00:00Z").getTime(),
171171
receiveMs: new Date("2026-01-01T00:00:02Z").getTime(),
172-
response: stsSuccessResponse("Thu, 01 Jan 2026 00:00:01 GMT"),
172+
response: stsSuccessResponse("Thu, 01 Jan 2026 00:00:02 GMT"),
173173
expectedSigningTime: toSigV4Date("2026-01-01T00:00:00Z"),
174174
},
175175
],
@@ -190,13 +190,13 @@ describe("Clock Skew Integration Tests", () => {
190190
{
191191
sendMs: new Date("2026-01-01T00:00:00Z").getTime(),
192192
receiveMs: new Date("2026-01-01T00:00:02Z").getTime(),
193-
response: stsErrorResponse("Thu, 01 Jan 2026 00:05:01 GMT", "RequestTimeTooSkewed"),
193+
response: stsErrorResponse("Thu, 01 Jan 2026 00:05:02 GMT", "RequestTimeTooSkewed"),
194194
expectedSigningTime: toSigV4Date("2026-01-01T00:00:00Z"),
195195
},
196196
{
197197
sendMs: new Date("2026-01-01T00:00:02Z").getTime(),
198198
receiveMs: new Date("2026-01-01T00:00:04Z").getTime(),
199-
response: stsSuccessResponse("Thu, 01 Jan 2026 00:05:03 GMT"),
199+
response: stsSuccessResponse("Thu, 01 Jan 2026 00:05:04 GMT"),
200200
expectedSigningTime: toSigV4Date("2026-01-01T00:05:02Z"),
201201
},
202202
],
@@ -215,7 +215,7 @@ describe("Clock Skew Integration Tests", () => {
215215
{
216216
sendMs: new Date("2026-01-01T00:01:00Z").getTime(),
217217
receiveMs: new Date("2026-01-01T00:01:02Z").getTime(),
218-
response: stsSuccessResponse("Thu, 01 Jan 2026 00:06:01 GMT"),
218+
response: stsSuccessResponse("Thu, 01 Jan 2026 00:06:02 GMT"),
219219
expectedSigningTime: toSigV4Date("2026-01-01T00:06:00Z"),
220220
},
221221
],
@@ -235,7 +235,7 @@ describe("Clock Skew Integration Tests", () => {
235235
{
236236
sendMs: new Date("2026-01-01T00:00:00Z").getTime(),
237237
receiveMs: new Date("2026-01-01T00:00:02Z").getTime(),
238-
response: stsErrorResponse("Thu, 01 Jan 2026 00:05:01 GMT", "RequestTimeTooSkewed"),
238+
response: stsErrorResponse("Thu, 01 Jan 2026 00:05:02 GMT", "RequestTimeTooSkewed"),
239239
expectedSigningTime: toSigV4Date("2026-01-01T00:00:00Z"),
240240
},
241241
],
@@ -282,7 +282,7 @@ describe("Clock Skew Integration Tests", () => {
282282
{
283283
sendMs: new Date("2026-01-01T00:17:00Z").getTime(),
284284
receiveMs: new Date("2026-01-01T00:17:02Z").getTime(),
285-
response: stsSuccessResponse("Thu, 01 Jan 2026 00:22:01 GMT"),
285+
response: stsSuccessResponse("Thu, 01 Jan 2026 00:22:02 GMT"),
286286
expectedSigningTime: toSigV4Date("2026-01-01T00:17:00Z"),
287287
},
288288
],
@@ -302,7 +302,7 @@ describe("Clock Skew Integration Tests", () => {
302302
{
303303
sendMs: new Date("2026-01-01T00:00:00Z").getTime(),
304304
receiveMs: new Date("2026-01-01T00:00:02Z").getTime(),
305-
response: stsSuccessResponse("Thu, 01 Jan 2026 00:00:01 GMT"),
305+
response: stsSuccessResponse("Thu, 01 Jan 2026 00:00:02 GMT"),
306306
expectedSigningTime: toSigV4Date("2026-01-01T00:05:00Z"), // 00:00:00 + 300s stale offset
307307
},
308308
],
@@ -325,7 +325,7 @@ describe("Clock Skew Integration Tests", () => {
325325
{
326326
sendMs: new Date("2026-01-01T00:00:00Z").getTime(),
327327
receiveMs: new Date("2026-01-01T00:00:02Z").getTime(),
328-
response: stsErrorResponse("Thu, 01 Jan 2026 00:02:01 GMT", "InvalidSignatureException", 400),
328+
response: stsErrorResponse("Thu, 01 Jan 2026 00:02:02 GMT", "InvalidSignatureException", 400),
329329
expectedSigningTime: toSigV4Date("2026-01-01T00:00:00Z"),
330330
},
331331
],
@@ -352,13 +352,13 @@ describe("Clock Skew Integration Tests", () => {
352352
{
353353
sendMs: new Date("2026-01-01T00:00:00Z").getTime(),
354354
receiveMs: new Date("2026-01-01T00:00:02Z").getTime(),
355-
response: stsErrorResponse("Thu, 01 Jan 2026 00:05:01 GMT", "InvalidSignatureException", 400),
355+
response: stsErrorResponse("Thu, 01 Jan 2026 00:05:02 GMT", "InvalidSignatureException", 400),
356356
expectedSigningTime: toSigV4Date("2026-01-01T00:00:00Z"),
357357
},
358358
{
359359
sendMs: new Date("2026-01-01T00:00:02Z").getTime(),
360360
receiveMs: new Date("2026-01-01T00:00:04Z").getTime(),
361-
response: stsSuccessResponse("Thu, 01 Jan 2026 00:05:03 GMT"),
361+
response: stsSuccessResponse("Thu, 01 Jan 2026 00:05:04 GMT"),
362362
expectedSigningTime: toSigV4Date("2026-01-01T00:05:02Z"),
363363
},
364364
],
@@ -424,7 +424,7 @@ describe("Clock Skew Integration Tests", () => {
424424
{
425425
sendMs: new Date("2026-01-01T16:51:10Z").getTime(),
426426
receiveMs: new Date("2026-01-01T16:51:12Z").getTime(),
427-
response: stsSuccessResponse("Thu, 01 Jan 2026 16:56:11 GMT"),
427+
response: stsSuccessResponse("Thu, 01 Jan 2026 16:56:12 GMT"),
428428
expectedSigningTime: toSigV4Date("2026-01-01T16:51:10Z"),
429429
},
430430
],
@@ -464,7 +464,7 @@ describe("Clock Skew Integration Tests", () => {
464464
{
465465
sendMs: new Date("2026-01-01T16:51:10Z").getTime(),
466466
receiveMs: new Date("2026-01-01T16:51:12Z").getTime(),
467-
response: stsSuccessResponse("Thu, 01 Jan 2026 16:51:11 GMT"),
467+
response: stsSuccessResponse("Thu, 01 Jan 2026 16:51:12 GMT"),
468468
expectedSigningTime: toSigV4Date("2026-01-01T16:51:10Z"),
469469
},
470470
],

‎packages-internal/core/src/submodules/httpAuthSchemes/aws_sdk/AwsSdkSigV4ASigner.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class AwsSdkSigV4ASigner extends AwsSdkSigV4Signer {
3434

3535
if (!noSkewCorrection) {
3636
signingProperties._preRequestSystemClockOffset = config.systemClockOffset;
37-
// Capture the raw send time (no skew applied) for the midpoint skew formula.
37+
// Capture the raw send time (no skew applied) for the request duration guard.
3838
signingProperties._requestSentAt = Date.now();
3939
}
4040

‎packages-internal/core/src/submodules/httpAuthSchemes/aws_sdk/AwsSdkSigV4Signer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export class AwsSdkSigV4Signer implements HttpSigner {
143143
if (!skipSkewSampling) {
144144
// Capture the clock offset before signing so errorHandler can detect concurrent corrections.
145145
signingProperties._preRequestSystemClockOffset = config.systemClockOffset;
146-
// Capture the raw send time (no skew applied) for the midpoint skew formula.
146+
// Capture the raw send time (no skew applied) for the request duration guard.
147147
signingProperties._requestSentAt = Date.now();
148148
}
149149

‎packages-internal/core/src/submodules/httpAuthSchemes/utils/getUpdatedSystemClockOffset.spec.ts‎

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,33 @@ describe(getUpdatedSystemClockOffset.name, () => {
1212
});
1313

1414
it("returns candidateSkew unconditionally (no threshold gating)", () => {
15-
// legacy path: serverTime - timeResponseReceived
1615
// Even when skew is small (below detection threshold), it's still returned.
1716
const T = mockClockTime.getTime();
1817
vi.spyOn(Date, "now").mockReturnValue(T);
1918
const serverTime = new Date(T + 1000); // 1 second ahead
2019
expect(getUpdatedSystemClockOffset(serverTime.toUTCString(), mockSystemClockOffset)).toEqual(1000);
2120
});
2221

23-
describe("legacy path (no timeRequestSent): returns serverTime - timeResponseReceived", () => {
22+
describe("returns serverTime - timeResponseReceived", () => {
2423
it.each([1000, 100000])("difference: %d", (difference) => {
2524
const T = mockClockTime.getTime();
2625
vi.spyOn(Date, "now").mockReturnValue(T);
2726
const updatedClockTime = new Date(T + difference);
2827
expect(getUpdatedSystemClockOffset(updatedClockTime.toString(), mockSystemClockOffset)).toEqual(difference);
2928
});
30-
});
3129

32-
describe("midpoint path (with timeRequestSent): returns serverTime - midpoint", () => {
33-
it("computes candidateSkew using NTP midpoint formula", () => {
34-
// T = timeRequestSent, timeResponseReceived = T + 2000 (2s round trip)
35-
// serverTime = T + 1000 (server time at midpoint of round trip = zero drift)
36-
// midpoint = (T + T+2000) / 2 = T+1000
37-
// candidateSkew = (T+1000) - (T+1000) = 0
30+
it("includes response latency", () => {
3831
const T = mockClockTime.getTime();
3932
vi.spyOn(Date, "now").mockReturnValue(T + 2000);
4033
const serverTime = new Date(T + 1000);
41-
expect(getUpdatedSystemClockOffset(serverTime.toUTCString(), mockSystemClockOffset, T)).toEqual(0);
34+
expect(getUpdatedSystemClockOffset(serverTime.toUTCString(), mockSystemClockOffset, T)).toEqual(-1000);
4235
});
4336

44-
it("computes positive candidateSkew when server is ahead of midpoint", () => {
45-
// T = timeRequestSent, timeResponseReceived = T + 2000
46-
// serverTime = T + 300000 (5 minutes ahead)
47-
// midpoint = (T + T+2000) / 2 = T+1000
48-
// candidateSkew = (T+300000) - (T+1000) = 299000
37+
it("does not include server processing time", () => {
4938
const T = mockClockTime.getTime();
50-
vi.spyOn(Date, "now").mockReturnValue(T + 2000);
51-
const serverTime = new Date(T + 300000);
52-
expect(getUpdatedSystemClockOffset(serverTime.toUTCString(), mockSystemClockOffset, T)).toEqual(299000);
39+
const responseTime = T + 620_000;
40+
vi.spyOn(Date, "now").mockReturnValue(responseTime);
41+
expect(getUpdatedSystemClockOffset(new Date(responseTime).toUTCString(), mockSystemClockOffset, T)).toEqual(0);
5342
});
5443
});
5544

@@ -82,16 +71,14 @@ describe(getUpdatedSystemClockOffset.name, () => {
8271

8372
it("updates offset when elapsed is exactly 15 minutes (boundary: not discarded)", () => {
8473
// elapsed = 900000, NOT > 900000 so NOT discarded
85-
// serverTime = T + 1000000, midpoint = T+450000
86-
// candidateSkew = (T+1000000) - (T+450000) = 550000
74+
// candidateSkew = (T+1000000) - (T+900000) = 100000
8775
const T = mockClockTime.getTime();
8876
vi.spyOn(Date, "now").mockReturnValue(T + 900_000);
8977
const serverTime = new Date(T + 1_000_000);
90-
expect(getUpdatedSystemClockOffset(serverTime.toUTCString(), mockSystemClockOffset, T)).toEqual(550000);
78+
expect(getUpdatedSystemClockOffset(serverTime.toUTCString(), mockSystemClockOffset, T)).toEqual(100000);
9179
});
9280

9381
it("does not apply elapsed guard when timeRequestSent is absent", () => {
94-
// legacy callers: no timeRequestSent, elapsed guard must not fire
9582
// candidateSkew = serverTime - timeResponseReceived = (T+300000) - T = 300000
9683
const T = mockClockTime.getTime();
9784
vi.spyOn(Date, "now").mockReturnValue(T);

‎packages-internal/core/src/submodules/httpAuthSchemes/utils/getUpdatedSystemClockOffset.ts‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
/**
22
* Computes an updated system clock offset from a server Date header.
33
*
4-
* When `timeRequestSent` is provided, uses the midpoint formula:
5-
* elapsed = timeResponseReceived - timeRequestSent
6-
* midpoint = (timeRequestSent + timeResponseReceived) / 2
7-
* candidateSkew = serverTime - midpoint
8-
*
9-
* When `timeRequestSent` is absent (legacy callers), falls back to:
10-
* candidateSkew = serverTime - timeResponseReceived
4+
* The candidate skew is the difference between the server time and the client
5+
* time when the response is received:
6+
* candidateSkew = serverTime - timeResponseReceived
117
*
128
* The candidate is discarded if:
139
* - An Age header is present
@@ -42,10 +38,5 @@ export const getUpdatedSystemClockOffset = (
4238
return currentSystemClockOffset;
4339
}
4440

45-
const candidateSkew =
46-
timeRequestSent !== undefined
47-
? serverTime - (timeRequestSent + timeResponseReceived) / 2
48-
: serverTime - timeResponseReceived;
49-
50-
return candidateSkew;
41+
return serverTime - timeResponseReceived;
5142
};

0 commit comments

Comments
 (0)
⌂ 换网址