Skip to content

fix(oauth): handle missing expires_in in OAuth token response (supersedes #3992) #4447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpspri merged 3 commits into from
Apr 26, 2026
Merged

fix(oauth): handle missing expires_in in OAuth token response (supersedes #3992) #4447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8029377
fix(oauth): handle missing expires_in in OAuth token response
Apr 14, 2026
e8176da
fix(oauth): tighten expires_in handling and prune dead config
jonpspri Apr 26, 2026
a611f35
fix(oauth): preserve TTL on refresh, age via updated_at, reject fract…
jonpspri Apr 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,6 @@ OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4317
# OAuth Configuration
# OAUTH_REQUEST_TIMEOUT=30
# OAUTH_MAX_RETRIES=3
# OAUTH_DEFAULT_TIMEOUT=3600

# OAuth Security Settings
# When MCP servers require OAuth authorization code flow,
Expand Down
86 changes: 43 additions & 43 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "(?x)( package-lock\\.json$ |Cargo\\.lock$ |uv\\.lock$ |go\\.sum$ |mcpgateway/sri_hashes\\.json$ )|^.secrets.baseline$",
"lines": null
},
"generated_at": "2026-04-26T13:45:17Z",
"generated_at": "2026-04-26T16:16:40Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -132,55 +132,55 @@
"hashed_secret": "ac371b6dcce28a86c90d12bc57d946a800eebf17",
"is_secret": false,
"is_verified": false,
"line_number": 1149,
"line_number": 1148,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "0b6ec68df700dec4dcd64babd0eda1edccddace1",
"is_secret": false,
"is_verified": false,
"line_number": 1154,
"line_number": 1153,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "4ad6f0082ee224001beb3ca5c3e81c8ceea5ed86",
"is_secret": false,
"is_verified": false,
"line_number": 1159,
"line_number": 1158,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "cb32747fcfb55eaa194c8cd8e4ba7d49ada08a94",
"is_secret": false,
"is_verified": false,
"line_number": 1165,
"line_number": 1164,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "6c178d51b13520496dbc767ed3d9d7aa5803ac72",
"is_secret": false,
"is_verified": false,
"line_number": 1177,
"line_number": 1176,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "ca45060a53fd8a255d1a83ee8d2f025283ccc66e",
"is_secret": false,
"is_verified": false,
"line_number": 1195,
"line_number": 1194,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "910fbf00f58e9bcb095ea26a75cc1d9a3355e671",
"is_secret": false,
"is_verified": false,
"line_number": 1256,
"line_number": 1255,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -546,15 +546,15 @@
"hashed_secret": "bc1a7c4dc707a3b61e2e9a345eec9e23674efa11",
"is_secret": false,
"is_verified": false,
"line_number": 1067,
"line_number": 1066,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "2df14e4719f299249cd9a97cf68cc87232a27cbb",
"is_secret": false,
"is_verified": false,
"line_number": 1374,
"line_number": 1373,
"type": "Hex High Entropy String",
"verified_result": null
}
Expand Down Expand Up @@ -618,63 +618,63 @@
"hashed_secret": "25ab86bed149ca6ca9c1c0d5db7c9a91388ddeab",
"is_secret": false,
"is_verified": false,
"line_number": 969,
"line_number": 968,
"type": "Basic Auth Credentials",
"verified_result": null
},
{
"hashed_secret": "d08f88df745fa7950b104e4a707a31cfce7b5841",
"is_secret": false,
"is_verified": false,
"line_number": 1072,
"line_number": 1071,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "7288edd0fc3ffcbe93a0cf06e3568e28521687bc",
"is_secret": false,
"is_verified": false,
"line_number": 1075,
"line_number": 1074,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "8674c9b302d20800e4ab3808f139704d8641a6e3",
"is_secret": false,
"is_verified": false,
"line_number": 1241,
"line_number": 1240,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "cff0d14e4337fa8bdb68dfa906f04b0df6fad72f",
"is_secret": false,
"is_verified": false,
"line_number": 1280,
"line_number": 1279,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "f865b53623b121fd34ee5426c792e5c33af8c227",
"is_secret": false,
"is_verified": false,
"line_number": 1329,
"line_number": 1328,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "acde39840735314af1300688b6c2324ea89770a3",
"is_secret": false,
"is_verified": false,
"line_number": 1424,
"line_number": 1423,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "fa9beb99e4029ad5a6615399e7bbae21356086b3",
"is_secret": false,
"is_verified": false,
"line_number": 1795,
"line_number": 1794,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -2348,39 +2348,39 @@
"hashed_secret": "4a0a2df96d4c9a13a282268cab33ac4b8cbb2c72",
"is_secret": false,
"is_verified": false,
"line_number": 196,
"line_number": 195,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "bc2f74c22f98f7b6ffbc2f67453dbfa99bce9a32",
"is_secret": false,
"is_verified": false,
"line_number": 477,
"line_number": 476,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "a2166e0b243f4e192e14000a6aa8f46cde6bfc20",
"is_secret": false,
"is_verified": false,
"line_number": 843,
"line_number": 842,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "fa9beb99e4029ad5a6615399e7bbae21356086b3",
"is_secret": false,
"is_verified": false,
"line_number": 1260,
"line_number": 1259,
"type": "Basic Auth Credentials",
"verified_result": null
},
{
"hashed_secret": "fa9beb99e4029ad5a6615399e7bbae21356086b3",
"is_secret": false,
"is_verified": false,
"line_number": 1264,
"line_number": 1263,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -2594,15 +2594,15 @@
"hashed_secret": "29b8dca3de5ff27bcf8bd3b622adf9970f29381c",
"is_secret": false,
"is_verified": false,
"line_number": 469,
"line_number": 468,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "d62bd0a3fef6be1bb3bb9078b323d87ac9f37f75",
"is_secret": false,
"is_verified": false,
"line_number": 572,
"line_number": 570,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -2612,31 +2612,31 @@
"hashed_secret": "e42972502db194ed2d6521cd5acf594dc1e1c503",
"is_secret": false,
"is_verified": false,
"line_number": 61,
"line_number": 60,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "cfac92b56e517a2186d60c9f812878a82a8c210c",
"is_secret": false,
"is_verified": false,
"line_number": 104,
"line_number": 103,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "2736fab291f04e69b62d490c3c09361f5b82461a",
"is_secret": false,
"is_verified": false,
"line_number": 135,
"line_number": 134,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "9b466094ec991a03cb95c489c19c4d75635f0ae5",
"is_secret": false,
"is_verified": false,
"line_number": 137,
"line_number": 136,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -4862,7 +4862,7 @@
"hashed_secret": "ff37a98a9963d347e9749a5c1b3936a4a245a6ff",
"is_secret": false,
"is_verified": false,
"line_number": 2414,
"line_number": 2413,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -8296,39 +8296,39 @@
"hashed_secret": "34e587c8f9ba011db386d719d66ffe3cfaea5447",
"is_secret": false,
"is_verified": false,
"line_number": 372,
"line_number": 421,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "a0f4ea7d91495df92bbac2e2149dfb850fe81396",
"is_secret": false,
"is_verified": false,
"line_number": 391,
"line_number": 440,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "920a25ef686c4f7ca6ad23dd109d3ad653161832",
"is_secret": false,
"is_verified": false,
"line_number": 640,
"line_number": 689,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "a62f2225bf70bfaccbc7f1ef2a397836717377de",
"is_secret": false,
"is_verified": false,
"line_number": 716,
"line_number": 765,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "355e7ab792a8403301eb0732bab9d2b3950ac048",
"is_secret": false,
"is_verified": false,
"line_number": 719,
"line_number": 768,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -8338,23 +8338,23 @@
"hashed_secret": "e582429052cdb908833560f6f7582d232de37c4d",
"is_secret": false,
"is_verified": false,
"line_number": 58,
"line_number": 62,
"type": "Base64 High Entropy String",
"verified_result": null
},
{
"hashed_secret": "fe1bae27cb7c1fb823f496f286e78f1d2ae87734",
"is_secret": false,
"is_verified": false,
"line_number": 352,
"line_number": 366,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "72cb70dbbafe97e5ea13ad88acd65d08389439b0",
"is_secret": false,
"is_verified": false,
"line_number": 475,
"line_number": 489,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -8542,15 +8542,15 @@
"hashed_secret": "920a25ef686c4f7ca6ad23dd109d3ad653161832",
"is_secret": false,
"is_verified": false,
"line_number": 292,
"line_number": 331,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "48004e013423b89217e65eca07df9574fcd092a6",
"is_secret": false,
"is_verified": false,
"line_number": 359,
"line_number": 441,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -9298,23 +9298,23 @@
"hashed_secret": "00942f4668670f34c5943cf52c7ef3139fe2b8d6",
"is_secret": false,
"is_verified": false,
"line_number": 1269,
"line_number": 1313,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "233243ef95e736679cb1d5664a4c71ba89c10664",
"is_secret": false,
"is_verified": false,
"line_number": 1461,
"line_number": 1505,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "72cb70dbbafe97e5ea13ad88acd65d08389439b0",
"is_secret": false,
"is_verified": false,
"line_number": 1929,
"line_number": 1973,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
Loading
Loading