feat(ds-fr): Update to latest version and enable admins group

machines/compute01/ds-fr/default.nix

@@ -51,6 +51,8 @@ in {
       DEMANDE_INSCRIPTION_ADMIN_PAGE_URL = "https://demarches.dgnum.eu/commencer/demande-d-inscription-demarches-normaliennes";
       DOC_URL = "https://docs.dgnum.eu/s/demarches-normaliennes";
 
+      ADMINS_GROUP_ENABLED = "enabled";
+
       # Customization
       # HEADER_LOGO_SRC = "logo_ens_psl_couleur.png";
       # HEADER_LOGO_ALT = "Par la Recherche, pour la Recherche";

machines/compute01/ds-fr/package/dgnum.nix

@@ -3,36 +3,20 @@ _:
 builtins.map (id:
   builtins.fetchurl
   "https://git.dgnum.eu/DGNum/demarches-normaliennes/commit/${id}.patch") [
-    # remplacement l'arrache de quelques logos vers versions DGNum
+    "1b6b0b50a1409fd2e2e5436305f01ee3a8981b58"
-    "587f0cb4b6bd8f26c47419be565222b3555fd4aa"
+    "aa9b3f496f43354b6be23bd705af007c123de14b"
-    # ajout des NDD usuels ENS et DGNum pour autoriser les changements d'adresse mail
+    "7c3022757766b04e6b7267417527b3043589dec3"
-    "0e96c2c3f1496b69d4c5aa7879c53aa033ed7478"
+    "a13589fd759d0e37a063429c669cc892c472ab6e"
-    # correction des svg des logos DGNum et DN
+    "4383cfd3461889adac56e4d8bf105d35b37f7be4"
-    "374afdee034099768c0b43efe13aa75a4f01a559"
+    "783f1ed23b4ae8b150d121eaa7ba0533756d2071"
-    # remplacement Marianne - pour l'instant à l'arrache uniquement, logo sera repris et affiné plus tard
+    "d61f12223b16b46a369e938a166900a3c444b012"
-    "dea971bef0ebf72aa7aa646b5fec82e64476fbda"
+    "590474130fed63074092c4273781fac27512ccef"
-    # modifs Mariannes
+    "2ae30924fe6ede0a70f4381055a33cb1b28b2f3a"
-    "4f8217c95de20ca56b00ec92b31803205f4759f3"
+    "8ed3e06e90d5d614b703253acb2ebf6435e2d281"
-    # commenter quelques bouts de code inutiles dans l'usage DGNum de DS
+    "67dfffc3387649e8141b4e79c8f94d3abb237ef1"
-    "50940df24021f92c8618c054c259c2a29e600a0d"
+    "22edf5e2fb30f9dcdc61f69d1d59a81e0adc85e9"
-    # Update logo-ds.svg and delete commented lines
+    "9957049894d63a1e61d51ea8ecb9b49f4b3cc296"
-    "175dd1c3e4e83992852f8ee8a57a2524df69aa65"
+    "2b7ce11bd2ead96fdda5e4dbd1171b7c5d4d140d"
-    # correction logo DN pour pages d'erreur
+    "286a789c539274b117604664bbd69a6172680eda"
-    "ff3ce779f0913025515e6a040b29feab03d248c9"
+    "6c39ac708e6abbb395218ab092f74f234535727f"
-    # normalianisation de DN, texte
-    "0cca4f50a4ada858f2f6ea6eef18c9e27087760f"
-    # modifs sur le fichier en anglais
-    "ae8cc24d39c97be747919e6b6d186cafdbde47f4"
-    # Use our logo in the header
-    "2298d7245a6af75541f5a86ac21c727cbb5dfa3b"
-    # Add the logo-wide under a new name
-    "fb756a8f2d6bfa422fe21723a3fc35372b216494"
-    # modifs diverses vers version DN
-    "04600237ada8d8d97570d8b0e76c9949a282a835"
-    # feat: Update footer
-    "e6453837f9509c52b8e45aac0e78837bced73380"
-    # feat: Remove mentions of faq.demarches-simplifiees.fr
-    "ec7a3812aa05995cb02d51932ef6293d0e923fdc"
-    # feat: Replace documentation link
-    "0285d766d300b7fe8f014ffbf6b14b004a137dbd"
   ]

machines/compute01/ds-fr/package/meta.nix

@@ -1,5 +1,5 @@
 {
-	version = "2023-12-11-01";
+	version = "2023-12-13-01";
-	src-hash = "sha256-ynRsEdZEWUA1pVFi8aa6dzRKBGfkaAMiHEyWHFvQeBQ=";
+	src-hash = "sha256-yFICI1cKwe+0JyL5Qkl+rh4tgCxbwWY5URdnnrjEsRw=";
 	deps-hash = "sha256-uTePIPqyb+nON9MXAkNELzEu8xFXIa+DQTMFWyOJuSY=";
 }

machines/compute01/ds-fr/package/rubyEnv/Gemfile

@@ -32,6 +32,7 @@ gem 'discard'
 gem 'dotenv-rails', require: 'dotenv/rails-now' # dotenv should always be loaded before rails
 gem 'dry-monads'
 gem 'elastic-apm'
+gem 'faraday-jwt'
 gem 'flipper'
 gem 'flipper-active_record'
 gem 'flipper-ui'

machines/compute01/ds-fr/package/rubyEnv/Gemfile.lock

@@ -116,6 +116,7 @@ GEM
     axlsx_styler (1.1.0)
       activesupport (>= 3.1)
       caxlsx (>= 2.0.2)
+    base64 (0.2.0)
     bcrypt (3.1.19)
     benchmark-ips (2.12.0)
     better_html (1.0.16)
@@ -126,7 +127,7 @@ GEM
       html_tokenizer (~> 0.0.6)
       parser (>= 2.4)
       smart_properties
-    bindata (2.4.10)
+    bindata (2.4.15)
     bindex (0.8.1)
     bootsnap (1.9.3)
       msgpack (~> 1.0)
@@ -174,7 +175,7 @@ GEM
     css_parser (1.9.0)
       addressable
     daemons (1.3.1)
-    date (3.3.3)
+    date (3.3.4)
     deep_cloneable (3.2.0)
       activerecord (>= 3.1.0, < 8)
     delayed_cron_job (0.7.4)
@@ -237,6 +238,16 @@ GEM
     excon (0.102.0)
     factory_bot (6.1.0)
       activesupport (>= 5.0.0)
+    faraday (2.7.12)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-jwt (0.1.0)
+      faraday (~> 2.0)
+      json-jwt (~> 1.16)
+    faraday-net_http (3.0.2)
     ffi (1.16.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -325,7 +336,6 @@ GEM
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http_accept_language (2.1.1)
-    httpclient (2.8.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.0.9)
@@ -354,10 +364,12 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.5.1)
-    json-jwt (1.13.0)
+    json-jwt (1.16.3)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
+      faraday (~> 2.0)
+      faraday-follow_redirects
     json_schemer (0.2.17)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
@@ -433,14 +445,14 @@ GEM
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    net-imap (0.3.7)
+    net-imap (0.4.7)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.9)
@@ -448,16 +460,19 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     open4 (1.3.4)
-    openid_connect (1.3.0)
+    openid_connect (2.2.0)
       activemodel
       attr_required (>= 1.0.0)
-      json-jwt (>= 1.5.0)
+      faraday (~> 2.0)
-      rack-oauth2 (>= 1.6.1)
+      faraday-follow_redirects
-      swd (>= 1.0.0)
+      json-jwt (>= 1.16)
+      net-smtp
+      rack-oauth2 (~> 2.2)
+      swd (~> 2.0)
       tzinfo
       validate_email
       validate_url
-      webfinger (>= 1.0.1)
+      webfinger (~> 2.0)
     orm_adapter (0.5.0)
     parallel (1.23.0)
     parsby (1.1.1)
@@ -491,7 +506,7 @@ GEM
       pry (>= 0.13, < 0.15)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puma (6.3.1)
       nio4r (~> 2.0)
     pundit (2.2.0)
@@ -503,10 +518,11 @@ GEM
       rack (>= 1.0, < 3)
     rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
-    rack-oauth2 (1.19.0)
+    rack-oauth2 (2.2.0)
       activesupport
       attr_required
-      httpclient
+      faraday (~> 2.0)
+      faraday-follow_redirects
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
     rack-protection (3.0.5)
@@ -723,10 +739,11 @@ GEM
     stackprof (0.2.21)
     strong_migrations (0.8.0)
       activerecord (>= 5.2)
-    swd (1.3.0)
+    swd (2.0.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     sysexits (1.2.0)
     temple (0.8.2)
     terminal-table (3.0.2)
@@ -735,7 +752,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.11)
     timecop (0.9.4)
-    timeout (0.4.0)
+    timeout (0.4.1)
     ttfunk (1.7.0)
     turbo-rails (1.3.2)
       actionpack (>= 6.0.0)
@@ -754,7 +771,7 @@ GEM
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
-    validate_url (1.0.13)
+    validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
     vcr (6.1.0)
@@ -780,9 +797,10 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webfinger (1.2.0)
+    webfinger (2.1.2)
       activesupport
-      httpclient (>= 2.4)
+      faraday (~> 2.0)
+      faraday-follow_redirects
     webmock (3.11.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -849,6 +867,7 @@ DEPENDENCIES
   dry-monads
   elastic-apm
   factory_bot
+  faraday-jwt
   flipper
   flipper-active_record
   flipper-ui

machines/compute01/ds-fr/package/rubyEnv/gemset.nix

@@ -312,6 +312,16 @@
     };
     version = "1.1.0";
   };
+  base64 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
   bcrypt = {
     groups = ["default"];
     platforms = [];
@@ -348,10 +358,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr";
+      sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5";
       type = "gem";
     };
-    version = "2.4.10";
+    version = "2.4.15";
   };
   bindex = {
     groups = ["default" "development"];
@@ -627,10 +637,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
+      sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp";
       type = "gem";
     };
-    version = "3.3.3";
+    version = "3.3.4";
   };
   deep_cloneable = {
     dependencies = ["activerecord"];
@@ -911,6 +921,49 @@
     };
     version = "6.1.0";
   };
+  faraday = {
+    dependencies = ["base64" "faraday-net_http" "ruby2_keywords"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d";
+      type = "gem";
+    };
+    version = "2.7.12";
+  };
+  faraday-follow_redirects = {
+    dependencies = ["faraday"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  faraday-jwt = {
+    dependencies = ["faraday" "json-jwt"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yqd9529f1g77prcfzf14ri5kdnr32yzymh55wc7cjr6ybblhk1p";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  faraday-net_http = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8";
+      type = "gem";
+    };
+    version = "3.0.2";
+  };
   ffi = {
     groups = ["default" "development"];
     platforms = [];
@@ -1271,16 +1324,6 @@
     };
     version = "2.1.1";
   };
-  httpclient = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
-      type = "gem";
-    };
-    version = "2.8.3";
-  };
   i18n = {
     dependencies = ["concurrent-ruby"];
     groups = ["default" "development" "test"];
@@ -1388,15 +1431,15 @@
     version = "2.5.1";
   };
   json-jwt = {
-    dependencies = ["activesupport" "aes_key_wrap" "bindata"];
+    dependencies = ["activesupport" "aes_key_wrap" "bindata" "faraday" "faraday-follow_redirects"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr";
+      sha256 = "1nb5c0dlwi4ps5z46hg9zdah8cmqm3fcdxxqi9185b8ki4j73jai";
       type = "gem";
     };
-    version = "1.13.0";
+    version = "1.16.3";
   };
   json_schemer = {
     dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"];
@@ -1741,10 +1784,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3";
+      sha256 = "0541lfqaz46h8s3fks11vsd1iqzmgjjw3c0jp9agg92zblwj0axs";
       type = "gem";
     };
-    version = "0.3.7";
+    version = "0.4.7";
   };
   net-pop = {
     dependencies = ["net-protocol"];
@@ -1763,10 +1806,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91";
+      sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa";
       type = "gem";
     };
-    version = "0.2.1";
+    version = "0.2.2";
   };
   net-smtp = {
     dependencies = ["net-protocol"];
@@ -1774,10 +1817,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x";
+      sha256 = "1rx3758w0bmbr21s2nsc6llflsrnp50fwdnly3ixra4v53gbhzid";
       type = "gem";
     };
-    version = "0.3.3";
+    version = "0.4.0";
   };
   netrc = {
     groups = ["default"];
@@ -1821,15 +1864,15 @@
     version = "1.3.4";
   };
   openid_connect = {
-    dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"];
+    dependencies = ["activemodel" "attr_required" "faraday" "faraday-follow_redirects" "json-jwt" "net-smtp" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w474bz3s1hqhilvrddr33l2nkyikypaczp3808w0345jr88b5m7";
+      sha256 = "1j19w1vw762skcykysqz6zv077b3qa3qbs5x7aywh4p53dicgd25";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "2.2.0";
   };
   orm_adapter = {
     groups = ["default"];
@@ -2005,10 +2048,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k";
+      sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
       type = "gem";
     };
-    version = "5.0.3";
+    version = "5.0.4";
   };
   puma = {
     dependencies = ["nio4r"];
@@ -2085,15 +2128,15 @@
     version = "3.0.0";
   };
   rack-oauth2 = {
-    dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"];
+    dependencies = ["activesupport" "attr_required" "faraday" "faraday-follow_redirects" "json-jwt" "rack"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw";
+      sha256 = "0dq7yxj5hi3nvvafk6b77hcw9b8mxijynrlgx6nb0a8b6n86fgx0";
       type = "gem";
     };
-    version = "1.19.0";
+    version = "2.2.0";
   };
   rack-protection = {
     dependencies = ["rack"];
@@ -2903,15 +2946,15 @@
     version = "0.8.0";
   };
   swd = {
-    dependencies = ["activesupport" "attr_required" "httpclient"];
+    dependencies = ["activesupport" "attr_required" "faraday" "faraday-follow_redirects"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12b3q2sw42nnilfb51nlqdv07f31vdv2j595kd99asnkw4cjlf5w";
+      sha256 = "0sr1vz64kcxq148vnhp5jq8bzmhplhlc19zbihw76ya7nkh02qpa";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "2.0.2";
   };
   sysexits = {
     groups = ["default" "development"];
@@ -2989,10 +3032,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd";
+      sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.4.1";
   };
   ttfunk = {
     groups = ["default"];
@@ -3105,10 +3148,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bwj34rz7961rrl545f006m2jdz1nrc0m72gfqmnb41xwsvpagbk";
+      sha256 = "0lblym140w5n88ijyfgcvkxvpfj8m6z00rxxf2ckmmhk0x61dzkj";
       type = "gem";
     };
-    version = "1.0.13";
+    version = "1.0.15";
   };
   vcr = {
     groups = ["test"];
@@ -3187,15 +3230,15 @@
     version = "4.1.0";
   };
   webfinger = {
-    dependencies = ["activesupport" "httpclient"];
+    dependencies = ["activesupport" "faraday" "faraday-follow_redirects"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18jj50b44a471ig7hw1ax90wxaaz40acmrf6cm7m2iyshlffy53q";
+      sha256 = "0z31li2iss9r9pxslmmqa76kixlfl4q58ss9lkds7ci7yck9fm6j";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "2.1.2";
   };
   webmock = {
     dependencies = ["addressable" "crack" "hashdiff"];

machines/compute01/k-radius/module.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, sources, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   inherit (lib) mkEnableOption mkIf mkOption types;