Skip to content

Commit d823872

Browse files
rdubignyrdubigny
committed
Revert "🚑 Avoid core to crash when proxy fails"
**Problem** Since enabling Node proxying, we’ve encountered a Node.js bug that causes the application to crash when an HTTP request is made to an invalid discovery URL. See the Node.js PR: nodejs/node#60699 To work around this issue and preserve the previous behavior, we restored the `global-agent` library to prevent the application from crashing. **Proposal** Remove the usage of `global-agent` and use the patched version of Node.js. **Prerequisites** * Restore the previous environment variables in all environments (see: proconnect-gouv/infra-legacy#120).
1 parent 7c600a1 commit d823872

10 files changed

Lines changed: 14 additions & 94 deletions

File tree

‎admin/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG NODE_VERSION=24.11.0
1+
ARG NODE_VERSION=24.13.1
22
ARG NODE_IMAGE=node:${NODE_VERSION}-alpine
33

44
FROM ${NODE_IMAGE} AS dev

‎admin/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@
115115
"typescript": "^5.9.3"
116116
},
117117
"engines": {
118-
"node": "24.11.0"
118+
"node": "24.13.1"
119119
}
120120
}

‎back/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG NODE_VERSION=24.11.0
1+
ARG NODE_VERSION=24.13.1
22
ARG NODE_IMAGE=node:${NODE_VERSION}-alpine
33

44
FROM ${NODE_IMAGE} AS dev_dependencies

‎back/apps/core-fca-low/src/app.module.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { bootstrap } from 'global-agent';
2-
31
import { DynamicModule, Module } from '@nestjs/common';
42
import { APP_FILTER } from '@nestjs/core';
53
import { CqrsModule } from '@nestjs/cqrs';
@@ -50,12 +48,6 @@ import {
5048

5149
@Module({})
5250
export class AppModule {
53-
onModuleInit() {
54-
// Temporary workaround to prevent the app from crashing when the proxy returns an error.
55-
// This should be removed after upgrading oidc-client to version >6.
56-
void bootstrap();
57-
}
58-
5951
static forRoot(configService: ConfigService): DynamicModule {
6052
return {
6153
module: AppModule,

‎back/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
"ejs": "^3.1.10",
5757
"express": "^4.21.1",
5858
"express-session": "^1.18.2",
59-
"global-agent": "^3.0.0",
6059
"helmet": "^8.1.0",
6160
"ioredis": "^5.8.2",
6261
"jose-v2": "npm:jose@^2.0.5",
@@ -110,7 +109,7 @@
110109
"webpack-stats-plugin": "^1.1.3"
111110
},
112111
"engines": {
113-
"node": "24.11.0"
112+
"node": "24.13.1"
114113
},
115114
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
116115
}

‎back/yarn.lock‎

Lines changed: 2 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -2360,11 +2360,6 @@ body-parser@^2.2.2:
23602360
raw-body "^3.0.1"
23612361
type-is "^2.0.1"
23622362

2363-
boolean@^3.0.1:
2364-
version "3.2.0"
2365-
resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
2366-
integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
2367-
23682363
brace-expansion@^1.1.7:
23692364
version "1.1.11"
23702365
resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
@@ -3023,11 +3018,6 @@ detect-newline@^3.0.0:
30233018
resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz"
30243019
integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
30253020

3026-
detect-node@^2.0.4:
3027-
version "2.1.0"
3028-
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
3029-
integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
3030-
30313021
diff-sequences@^29.6.3:
30323022
version "29.6.3"
30333023
resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz"
@@ -3242,11 +3232,6 @@ es-to-primitive@^1.3.0:
32423232
is-date-object "^1.0.5"
32433233
is-symbol "^1.0.4"
32443234

3245-
es6-error@^4.1.1:
3246-
version "4.1.1"
3247-
resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
3248-
integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
3249-
32503235
esbuild@~0.27.0:
32513236
version "0.27.3"
32523237
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.27.3.tgz#5859ca8e70a3af956b26895ce4954d7e73bd27a8"
@@ -3960,18 +3945,6 @@ glob@^7.1.3, glob@^7.1.4:
39603945
once "^1.3.0"
39613946
path-is-absolute "^1.0.0"
39623947

3963-
global-agent@^3.0.0:
3964-
version "3.0.0"
3965-
resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
3966-
integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
3967-
dependencies:
3968-
boolean "^3.0.1"
3969-
es6-error "^4.1.1"
3970-
matcher "^3.0.0"
3971-
roarr "^2.15.3"
3972-
semver "^7.3.2"
3973-
serialize-error "^7.0.1"
3974-
39753948
globals@^11.1.0:
39763949
version "11.12.0"
39773950
resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
@@ -3984,7 +3957,7 @@ globals@^13.19.0:
39843957
dependencies:
39853958
type-fest "^0.20.2"
39863959

3987-
globalthis@^1.0.1, globalthis@^1.0.4:
3960+
globalthis@^1.0.4:
39883961
version "1.0.4"
39893962
resolved "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz"
39903963
integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
@@ -5105,11 +5078,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
51055078
resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
51065079
integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
51075080

5108-
json-stringify-safe@^5.0.1:
5109-
version "5.0.1"
5110-
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
5111-
integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
5112-
51135081
json5@^1.0.2:
51145082
version "1.0.2"
51155083
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
@@ -5379,13 +5347,6 @@ makeerror@1.0.12:
53795347
dependencies:
53805348
tmpl "1.0.5"
53815349

5382-
matcher@^3.0.0:
5383-
version "3.0.0"
5384-
resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"
5385-
integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==
5386-
dependencies:
5387-
escape-string-regexp "^4.0.0"
5388-
53895350
math-intrinsics@^1.1.0:
53905351
version "1.1.0"
53915352
resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
@@ -6571,18 +6532,6 @@ rimraf@^3.0.2:
65716532
dependencies:
65726533
glob "^7.1.3"
65736534

6574-
roarr@^2.15.3:
6575-
version "2.15.4"
6576-
resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
6577-
integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==
6578-
dependencies:
6579-
boolean "^3.0.1"
6580-
detect-node "^2.0.4"
6581-
globalthis "^1.0.1"
6582-
json-stringify-safe "^5.0.1"
6583-
semver-compare "^1.0.0"
6584-
sprintf-js "^1.1.2"
6585-
65866535
run-parallel@^1.1.9:
65876536
version "1.2.0"
65886537
resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
@@ -6666,17 +6615,12 @@ schema-utils@^4.3.0:
66666615
ajv-formats "^2.1.1"
66676616
ajv-keywords "^5.1.0"
66686617

6669-
semver-compare@^1.0.0:
6670-
version "1.0.0"
6671-
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
6672-
integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
6673-
66746618
semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
66756619
version "6.3.1"
66766620
resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
66776621
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
66786622

6679-
semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.7.3:
6623+
semver@^7.3.4, semver@^7.3.5, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.7.3:
66806624
version "7.7.3"
66816625
resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
66826626
integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
@@ -6700,13 +6644,6 @@ send@0.19.0:
67006644
range-parser "~1.2.1"
67016645
statuses "2.0.1"
67026646

6703-
serialize-error@^7.0.1:
6704-
version "7.0.1"
6705-
resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
6706-
integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==
6707-
dependencies:
6708-
type-fest "^0.13.1"
6709-
67106647
serialize-javascript@^6.0.2:
67116648
version "6.0.2"
67126649
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
@@ -6892,11 +6829,6 @@ split2@^4.0.0, split2@^4.1.0:
68926829
resolved "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz"
68936830
integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==
68946831

6895-
sprintf-js@^1.1.2:
6896-
version "1.1.3"
6897-
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
6898-
integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
6899-
69006832
sprintf-js@~1.0.2:
69016833
version "1.0.3"
69026834
resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
@@ -7350,11 +7282,6 @@ type-detect@4.0.8:
73507282
resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
73517283
integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
73527284

7353-
type-fest@^0.13.1:
7354-
version "0.13.1"
7355-
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
7356-
integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
7357-
73587285
type-fest@^0.20.2:
73597286
version "0.20.2"
73607287
resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"

‎docker/bash/commands/up.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
NODE_VERSION=v24.11.0
2+
NODE_VERSION=v24.13.1
33
export NODE_VERSION
44

55
DOCKER_COMPOSE="docker compose"

‎docker/compose/fca-low/.env/core-rie.env‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,6 @@ MAILER_FROM_NAME=NE PAS RÉPONDRE
7878
BLUEBIRD_LONG_STACK_TRACES=0
7979
BLUEBIRD_DEBUG=0
8080
## Proxy settings
81-
GLOBAL_AGENT_HTTP_PROXY=http://squid:3128
82-
GLOBAL_AGENT_HTTPS_PROXY=http://squid:3128
81+
NODE_USE_ENV_PROXY=1
82+
HTTP_PROXY=http://squid:3128
83+
HTTPS_PROXY=http://squid:3128

‎docker/compose/fca-low/.env/core.env‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,6 @@ MAILER_FROM_NAME=NE PAS RÉPONDRE
7878
BLUEBIRD_LONG_STACK_TRACES=0
7979
BLUEBIRD_DEBUG=0
8080
## Proxy settings
81-
GLOBAL_AGENT_HTTP_PROXY=http://squid:3128
82-
GLOBAL_AGENT_HTTPS_PROXY=http://squid:3128
81+
NODE_USE_ENV_PROXY=1
82+
HTTP_PROXY=http://squid:3128
83+
HTTPS_PROXY=http://squid:3128

‎quality/fca/cypress/integration/usager/connexion-fi.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Fonctionnalité: Connexion à un FI
5050
Et que je clique sur le bouton de connexion
5151
Alors je suis redirigé vers la page erreur technique
5252
Et le titre de la page d'erreur est "Accès impossible"
53-
Et le message d'erreur est "Client network socket disconnected before secure TLS connection was established"
53+
Et le message d'erreur est "Failed to establish tunnel"
5454
Et le code d'erreur est "Y020031"
5555

5656
@ignoreInteg01

0 commit comments

Comments
 (0)