summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--po/fr.po117
-rw-r--r--po/webid-oidc.pot115
-rw-r--r--src/scm/webid-oidc/program.scm37
-rw-r--r--src/scm/webid-oidc/resource-server.scm47
4 files changed, 179 insertions, 137 deletions
diff --git a/po/fr.po b/po/fr.po
index 4b64d50..b4207a6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: webid-oidc 0.0.0\n"
"Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-07-03 11:07+0200\n"
-"PO-Revision-Date: 2021-07-03 11:08+0200\n"
+"POT-Creation-Date: 2021-07-06 10:37+0200\n"
+"PO-Revision-Date: 2021-07-06 10:39+0200\n"
"Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n"
"Language-Team: French <vivien@planete-kraus.eu>\n"
"Language: fr\n"
@@ -981,21 +981,21 @@ msgstr ""
msgid "~a: authentication failure: ~a\n"
msgstr "~a : échec d’authentificationn : ~a\n"
-#: src/scm/webid-oidc/resource-server.scm:254
+#: src/scm/webid-oidc/resource-server.scm:261
#, scheme-format
msgid "Warning: ~a\n"
msgstr "Avertissement : ~a\n"
#: src/scm/webid-oidc/hello-world.scm:48 src/scm/webid-oidc/example-app.scm:116
-#: src/scm/webid-oidc/program.scm:139
+#: src/scm/webid-oidc/program.scm:156
msgid "command-line|version"
msgstr "version"
-#: src/scm/webid-oidc/hello-world.scm:50 src/scm/webid-oidc/program.scm:141
+#: src/scm/webid-oidc/hello-world.scm:50 src/scm/webid-oidc/program.scm:158
msgid "command-line|complete-corresponding-source"
msgstr "code-source-correspondant-complet"
-#: src/scm/webid-oidc/hello-world.scm:52 src/scm/webid-oidc/program.scm:143
+#: src/scm/webid-oidc/hello-world.scm:52 src/scm/webid-oidc/program.scm:160
msgid "command-line|help"
msgstr "aide"
@@ -1003,11 +1003,11 @@ msgstr "aide"
msgid "command-line|port"
msgstr "port"
-#: src/scm/webid-oidc/hello-world.scm:56 src/scm/webid-oidc/program.scm:173
+#: src/scm/webid-oidc/hello-world.scm:56 src/scm/webid-oidc/program.scm:190
msgid "command-line|log-file"
msgstr "fichier-journal"
-#: src/scm/webid-oidc/hello-world.scm:58 src/scm/webid-oidc/program.scm:175
+#: src/scm/webid-oidc/hello-world.scm:58 src/scm/webid-oidc/program.scm:192
msgid "command-line|error-file"
msgstr "fichier-erreur"
@@ -1066,12 +1066,12 @@ msgstr ""
" redirige la sortie d’erreur du programme vers ce fichier.\n"
#: src/scm/webid-oidc/hello-world.scm:103
-#: src/scm/webid-oidc/example-app.scm:159 src/scm/webid-oidc/program.scm:429
+#: src/scm/webid-oidc/example-app.scm:159 src/scm/webid-oidc/program.scm:446
#, scheme-format
msgid "~a version ~a\n"
msgstr "~a version ~a\n"
-#: src/scm/webid-oidc/hello-world.scm:112 src/scm/webid-oidc/program.scm:437
+#: src/scm/webid-oidc/hello-world.scm:112 src/scm/webid-oidc/program.scm:454
msgid ""
"You are legally required to link to the complete corresponding source code.\n"
msgstr ""
@@ -1247,68 +1247,73 @@ msgstr ""
"La locale du client ~s ne peut pas être approchée par la locale système ~s "
"(parce que ~a), on utilise C.\n"
-#: src/scm/webid-oidc/program.scm:112
+#: src/scm/webid-oidc/program.scm:120
+#, scheme-format
+msgid "~a: ~a (~a): ~s ~a ~s ~a\n"
+msgstr "~a : ~a (~a) : ~s ~a ~s ~a\n"
+
+#: src/scm/webid-oidc/program.scm:129
#, scheme-format
msgid "~a: ~a: ~s ~a ~s ~a\n"
msgstr "~a : ~a : ~s ~a ~s ~a\n"
-#: src/scm/webid-oidc/program.scm:145
+#: src/scm/webid-oidc/program.scm:162
msgid "command-line|server|port"
msgstr "port"
-#: src/scm/webid-oidc/program.scm:147
+#: src/scm/webid-oidc/program.scm:164
msgid "command-line|server|server-name"
msgstr "nom-du-serveur"
-#: src/scm/webid-oidc/program.scm:149
+#: src/scm/webid-oidc/program.scm:166
msgid "command-line|server|reverse-proxy|backend-uri"
msgstr "uri-arrière-plan"
-#: src/scm/webid-oidc/program.scm:151
+#: src/scm/webid-oidc/program.scm:168
msgid "command-line|server|reverse-proxy|header"
msgstr "en-tête"
-#: src/scm/webid-oidc/program.scm:153
+#: src/scm/webid-oidc/program.scm:170
msgid "command-line|server|issuer|key-file"
msgstr "fichier-clé"
-#: src/scm/webid-oidc/program.scm:155
+#: src/scm/webid-oidc/program.scm:172
msgid "command-line|server|issuer|subject"
msgstr "sujet"
-#: src/scm/webid-oidc/program.scm:157
+#: src/scm/webid-oidc/program.scm:174
msgid "command-line|server|issuer|encrypted-password"
msgstr "mot-de-passe-chiffré"
-#: src/scm/webid-oidc/program.scm:159
+#: src/scm/webid-oidc/program.scm:176
msgid "command-line|server|issuer|jwks-uri"
msgstr "uri-jwks"
-#: src/scm/webid-oidc/program.scm:161
+#: src/scm/webid-oidc/program.scm:178
msgid "command-line|server|issuer|authorization-endpoint-uri"
msgstr "uri-terminal-autorisation"
-#: src/scm/webid-oidc/program.scm:163
+#: src/scm/webid-oidc/program.scm:180
msgid "command-line|server|issuer|token-endpoint-uri"
msgstr "uri-terminal-jeton"
-#: src/scm/webid-oidc/program.scm:165
+#: src/scm/webid-oidc/program.scm:182
msgid "command-line|server|client-id"
msgstr "id-client"
-#: src/scm/webid-oidc/program.scm:167
+#: src/scm/webid-oidc/program.scm:184
msgid "command-line|server|redirect-uri"
msgstr "uri-redirection"
-#: src/scm/webid-oidc/program.scm:169
+#: src/scm/webid-oidc/program.scm:186
msgid "command-line|server|client-name"
msgstr "nom-client"
-#: src/scm/webid-oidc/program.scm:171
+#: src/scm/webid-oidc/program.scm:188
msgid "command-line|server|client-uri"
msgstr "uri-client"
-#: src/scm/webid-oidc/program.scm:200
+#: src/scm/webid-oidc/program.scm:217
#, scheme-format
msgid ""
"Usage: ~a COMMAND [OPTIONS]...\n"
@@ -1620,57 +1625,57 @@ msgstr ""
"Si vous trouvez une erreur dans le programme, envoyez-en un rapport à\n"
"~a.\n"
-#: src/scm/webid-oidc/program.scm:350 src/scm/webid-oidc/program.scm:408
-#: src/scm/webid-oidc/program.scm:511
+#: src/scm/webid-oidc/program.scm:367 src/scm/webid-oidc/program.scm:425
+#: src/scm/webid-oidc/program.scm:528
msgid "command-line|command|reverse-proxy"
msgstr "proxy-inversé"
-#: src/scm/webid-oidc/program.scm:351 src/scm/webid-oidc/program.scm:415
-#: src/scm/webid-oidc/program.scm:533
+#: src/scm/webid-oidc/program.scm:368 src/scm/webid-oidc/program.scm:432
+#: src/scm/webid-oidc/program.scm:550
msgid "command-line|command|identity-provider"
msgstr "fournisseur-identité"
-#: src/scm/webid-oidc/program.scm:352 src/scm/webid-oidc/program.scm:422
-#: src/scm/webid-oidc/program.scm:577
+#: src/scm/webid-oidc/program.scm:369 src/scm/webid-oidc/program.scm:439
+#: src/scm/webid-oidc/program.scm:594
msgid "command-line|command|client-service"
msgstr "service-client"
-#: src/scm/webid-oidc/program.scm:353 src/scm/webid-oidc/program.scm:606
+#: src/scm/webid-oidc/program.scm:370 src/scm/webid-oidc/program.scm:623
msgid "command-line|command|server"
msgstr "serveur"
-#: src/scm/webid-oidc/program.scm:389 src/scm/webid-oidc/program.scm:393
-#: src/scm/webid-oidc/program.scm:397 src/scm/webid-oidc/program.scm:401
+#: src/scm/webid-oidc/program.scm:406 src/scm/webid-oidc/program.scm:410
+#: src/scm/webid-oidc/program.scm:414 src/scm/webid-oidc/program.scm:418
#, scheme-format
msgid "an environment variable| It is currently set to ~s."
msgstr " Elle vaut actuellement ~s."
-#: src/scm/webid-oidc/program.scm:391 src/scm/webid-oidc/program.scm:395
-#: src/scm/webid-oidc/program.scm:399 src/scm/webid-oidc/program.scm:403
+#: src/scm/webid-oidc/program.scm:408 src/scm/webid-oidc/program.scm:412
+#: src/scm/webid-oidc/program.scm:416 src/scm/webid-oidc/program.scm:420
msgid "an environment variable| It is currently unset."
msgstr " Elle n’est actuellement pas définie."
-#: src/scm/webid-oidc/program.scm:444
+#: src/scm/webid-oidc/program.scm:461
#, scheme-format
msgid "The --~a argument must be a number, not ~s.\n"
msgstr "L’argument de --~a doit être un nombre, pas ~s.\n"
-#: src/scm/webid-oidc/program.scm:450
+#: src/scm/webid-oidc/program.scm:467
#, scheme-format
msgid "The --~a argument must be an integer, not ~s.\n"
msgstr "L’argument de --~a doit être un entier, pas ~s.\n"
-#: src/scm/webid-oidc/program.scm:456
+#: src/scm/webid-oidc/program.scm:473
#, scheme-format
msgid "The --~a argument must be positive, ~s is invalid.\n"
msgstr "L’argument de --~a doit être positif, ~s est invalide.\n"
-#: src/scm/webid-oidc/program.scm:461
+#: src/scm/webid-oidc/program.scm:478
#, scheme-format
msgid "The --~a argument must be less than 65536, ~s is invalid.\n"
msgstr "L’argument de --~a doit être inférieur à 65536, ~s est invalide.\n"
-#: src/scm/webid-oidc/program.scm:503
+#: src/scm/webid-oidc/program.scm:520
#, scheme-format
msgid ""
"Usage: ~a COMMAND [OPTIONS]...\n"
@@ -1679,18 +1684,18 @@ msgstr ""
"Utilisation : ~a COMMANDE [OPTIONS]...\n"
"Voir --~a (-h).\n"
-#: src/scm/webid-oidc/program.scm:514 src/scm/webid-oidc/program.scm:536
-#: src/scm/webid-oidc/program.scm:608
+#: src/scm/webid-oidc/program.scm:531 src/scm/webid-oidc/program.scm:553
+#: src/scm/webid-oidc/program.scm:625
#, scheme-format
msgid "You must pass --~a to set the server name.\n"
msgstr "Vous devez passer --~a pour définir le nom du serveur.\n"
-#: src/scm/webid-oidc/program.scm:518
+#: src/scm/webid-oidc/program.scm:535
#, scheme-format
msgid "You must pass --~a to set the backend URI.\n"
msgstr "Vous devez passer --~a pour définir l'URI du service d’arrière-plan.\n"
-#: src/scm/webid-oidc/program.scm:540 src/scm/webid-oidc/program.scm:612
+#: src/scm/webid-oidc/program.scm:557 src/scm/webid-oidc/program.scm:629
#, scheme-format
msgid ""
"You must pass --~a to set the file where to store the identity provider "
@@ -1699,59 +1704,59 @@ msgstr ""
"Vous devez passer --~a pour définir le nom du fichier pour sauvegarder\n"
"la clé du fournisseur d’identité.\n"
-#: src/scm/webid-oidc/program.scm:544 src/scm/webid-oidc/program.scm:616
+#: src/scm/webid-oidc/program.scm:561 src/scm/webid-oidc/program.scm:633
#, scheme-format
msgid "You must pass --~a to set the subject of the identity provider.\n"
msgstr ""
"Vous devez passer --~a pour définir le sujet du fournisseur d’identité.\n"
-#: src/scm/webid-oidc/program.scm:548 src/scm/webid-oidc/program.scm:620
+#: src/scm/webid-oidc/program.scm:565 src/scm/webid-oidc/program.scm:637
#, scheme-format
msgid "You must pass --~a to set the subject’s encrypted password.\n"
msgstr ""
"Vous devez passer --~a pour définir le mot de passe chiffré du sujet.\n"
-#: src/scm/webid-oidc/program.scm:552 src/scm/webid-oidc/program.scm:624
+#: src/scm/webid-oidc/program.scm:569 src/scm/webid-oidc/program.scm:641
#, scheme-format
msgid "You must pass --~a to set the JWKS URI.\n"
msgstr "Vous devez passer --~a pour définir l'URI du JWKS.\n"
-#: src/scm/webid-oidc/program.scm:556 src/scm/webid-oidc/program.scm:628
+#: src/scm/webid-oidc/program.scm:573 src/scm/webid-oidc/program.scm:645
#, scheme-format
msgid "You must pass --~a to set the authorization endpoint URI.\n"
msgstr ""
"Vous devez passer --~a pour définir l'URI du terminal d'autorisation.\n"
-#: src/scm/webid-oidc/program.scm:560 src/scm/webid-oidc/program.scm:632
+#: src/scm/webid-oidc/program.scm:577 src/scm/webid-oidc/program.scm:649
#, scheme-format
msgid "You must pass --~a to set the token endpoint URI.\n"
msgstr "Vous devez passer --~a pour définir l'URI du terminal de jeton.\n"
-#: src/scm/webid-oidc/program.scm:580
+#: src/scm/webid-oidc/program.scm:597
#, scheme-format
msgid "You must pass --~a to set the application web ID.\n"
msgstr ""
"Vous devez passer --~a pour définir l'identifiant web de l’application.\n"
-#: src/scm/webid-oidc/program.scm:584
+#: src/scm/webid-oidc/program.scm:601
#, scheme-format
msgid "You must pass --~a to set the redirection URI.\n"
msgstr "Vous devez passer --~a pour définir l'URI de redirection.\n"
-#: src/scm/webid-oidc/program.scm:588
+#: src/scm/webid-oidc/program.scm:605
#, scheme-format
msgid "You must pass --~a to set the informative client name.\n"
msgstr ""
"Vous devez passer --~a pour donner un nom pour l’application à titre "
"informatif.\n"
-#: src/scm/webid-oidc/program.scm:592
+#: src/scm/webid-oidc/program.scm:609
#, scheme-format
msgid "You must pass --~a to set the informative client URI.\n"
msgstr ""
"Vous devez passer --~a pour définir l'URI du client, à titre informatif.\n"
-#: src/scm/webid-oidc/program.scm:679
+#: src/scm/webid-oidc/program.scm:696
#, scheme-format
msgid "Unknown command ~s\n"
msgstr "Commande inconnue ~s\n"
diff --git a/po/webid-oidc.pot b/po/webid-oidc.pot
index 1090ce1..e7d7daa 100644
--- a/po/webid-oidc.pot
+++ b/po/webid-oidc.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: webid-oidc SNAPSHOT\n"
"Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-07-03 11:07+0200\n"
+"POT-Creation-Date: 2021-07-06 10:37+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -939,21 +939,21 @@ msgstr ""
msgid "~a: authentication failure: ~a\n"
msgstr ""
-#: src/scm/webid-oidc/resource-server.scm:254
+#: src/scm/webid-oidc/resource-server.scm:261
#, scheme-format
msgid "Warning: ~a\n"
msgstr ""
#: src/scm/webid-oidc/hello-world.scm:48 src/scm/webid-oidc/example-app.scm:116
-#: src/scm/webid-oidc/program.scm:139
+#: src/scm/webid-oidc/program.scm:156
msgid "command-line|version"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:50 src/scm/webid-oidc/program.scm:141
+#: src/scm/webid-oidc/hello-world.scm:50 src/scm/webid-oidc/program.scm:158
msgid "command-line|complete-corresponding-source"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:52 src/scm/webid-oidc/program.scm:143
+#: src/scm/webid-oidc/hello-world.scm:52 src/scm/webid-oidc/program.scm:160
msgid "command-line|help"
msgstr ""
@@ -961,11 +961,11 @@ msgstr ""
msgid "command-line|port"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:56 src/scm/webid-oidc/program.scm:173
+#: src/scm/webid-oidc/hello-world.scm:56 src/scm/webid-oidc/program.scm:190
msgid "command-line|log-file"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:58 src/scm/webid-oidc/program.scm:175
+#: src/scm/webid-oidc/hello-world.scm:58 src/scm/webid-oidc/program.scm:192
msgid "command-line|error-file"
msgstr ""
@@ -999,12 +999,12 @@ msgid ""
msgstr ""
#: src/scm/webid-oidc/hello-world.scm:103
-#: src/scm/webid-oidc/example-app.scm:159 src/scm/webid-oidc/program.scm:429
+#: src/scm/webid-oidc/example-app.scm:159 src/scm/webid-oidc/program.scm:446
#, scheme-format
msgid "~a version ~a\n"
msgstr ""
-#: src/scm/webid-oidc/hello-world.scm:112 src/scm/webid-oidc/program.scm:437
+#: src/scm/webid-oidc/hello-world.scm:112 src/scm/webid-oidc/program.scm:454
msgid ""
"You are legally required to link to the complete corresponding source code.\n"
msgstr ""
@@ -1135,68 +1135,73 @@ msgid ""
"using C.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:112
+#: src/scm/webid-oidc/program.scm:120
+#, scheme-format
+msgid "~a: ~a (~a): ~s ~a ~s ~a\n"
+msgstr ""
+
+#: src/scm/webid-oidc/program.scm:129
#, scheme-format
msgid "~a: ~a: ~s ~a ~s ~a\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:145
+#: src/scm/webid-oidc/program.scm:162
msgid "command-line|server|port"
msgstr ""
-#: src/scm/webid-oidc/program.scm:147
+#: src/scm/webid-oidc/program.scm:164
msgid "command-line|server|server-name"
msgstr ""
-#: src/scm/webid-oidc/program.scm:149
+#: src/scm/webid-oidc/program.scm:166
msgid "command-line|server|reverse-proxy|backend-uri"
msgstr ""
-#: src/scm/webid-oidc/program.scm:151
+#: src/scm/webid-oidc/program.scm:168
msgid "command-line|server|reverse-proxy|header"
msgstr ""
-#: src/scm/webid-oidc/program.scm:153
+#: src/scm/webid-oidc/program.scm:170
msgid "command-line|server|issuer|key-file"
msgstr ""
-#: src/scm/webid-oidc/program.scm:155
+#: src/scm/webid-oidc/program.scm:172
msgid "command-line|server|issuer|subject"
msgstr ""
-#: src/scm/webid-oidc/program.scm:157
+#: src/scm/webid-oidc/program.scm:174
msgid "command-line|server|issuer|encrypted-password"
msgstr ""
-#: src/scm/webid-oidc/program.scm:159
+#: src/scm/webid-oidc/program.scm:176
msgid "command-line|server|issuer|jwks-uri"
msgstr ""
-#: src/scm/webid-oidc/program.scm:161
+#: src/scm/webid-oidc/program.scm:178
msgid "command-line|server|issuer|authorization-endpoint-uri"
msgstr ""
-#: src/scm/webid-oidc/program.scm:163
+#: src/scm/webid-oidc/program.scm:180
msgid "command-line|server|issuer|token-endpoint-uri"
msgstr ""
-#: src/scm/webid-oidc/program.scm:165
+#: src/scm/webid-oidc/program.scm:182
msgid "command-line|server|client-id"
msgstr ""
-#: src/scm/webid-oidc/program.scm:167
+#: src/scm/webid-oidc/program.scm:184
msgid "command-line|server|redirect-uri"
msgstr ""
-#: src/scm/webid-oidc/program.scm:169
+#: src/scm/webid-oidc/program.scm:186
msgid "command-line|server|client-name"
msgstr ""
-#: src/scm/webid-oidc/program.scm:171
+#: src/scm/webid-oidc/program.scm:188
msgid "command-line|server|client-uri"
msgstr ""
-#: src/scm/webid-oidc/program.scm:200
+#: src/scm/webid-oidc/program.scm:217
#, scheme-format
msgid ""
"Usage: ~a COMMAND [OPTIONS]...\n"
@@ -1351,127 +1356,127 @@ msgid ""
"If you find a bug, then please send a report to ~a.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:350 src/scm/webid-oidc/program.scm:408
-#: src/scm/webid-oidc/program.scm:511
+#: src/scm/webid-oidc/program.scm:367 src/scm/webid-oidc/program.scm:425
+#: src/scm/webid-oidc/program.scm:528
msgid "command-line|command|reverse-proxy"
msgstr ""
-#: src/scm/webid-oidc/program.scm:351 src/scm/webid-oidc/program.scm:415
-#: src/scm/webid-oidc/program.scm:533
+#: src/scm/webid-oidc/program.scm:368 src/scm/webid-oidc/program.scm:432
+#: src/scm/webid-oidc/program.scm:550
msgid "command-line|command|identity-provider"
msgstr ""
-#: src/scm/webid-oidc/program.scm:352 src/scm/webid-oidc/program.scm:422
-#: src/scm/webid-oidc/program.scm:577
+#: src/scm/webid-oidc/program.scm:369 src/scm/webid-oidc/program.scm:439
+#: src/scm/webid-oidc/program.scm:594
msgid "command-line|command|client-service"
msgstr ""
-#: src/scm/webid-oidc/program.scm:353 src/scm/webid-oidc/program.scm:606
+#: src/scm/webid-oidc/program.scm:370 src/scm/webid-oidc/program.scm:623
msgid "command-line|command|server"
msgstr ""
-#: src/scm/webid-oidc/program.scm:389 src/scm/webid-oidc/program.scm:393
-#: src/scm/webid-oidc/program.scm:397 src/scm/webid-oidc/program.scm:401
+#: src/scm/webid-oidc/program.scm:406 src/scm/webid-oidc/program.scm:410
+#: src/scm/webid-oidc/program.scm:414 src/scm/webid-oidc/program.scm:418
#, scheme-format
msgid "an environment variable| It is currently set to ~s."
msgstr ""
-#: src/scm/webid-oidc/program.scm:391 src/scm/webid-oidc/program.scm:395
-#: src/scm/webid-oidc/program.scm:399 src/scm/webid-oidc/program.scm:403
+#: src/scm/webid-oidc/program.scm:408 src/scm/webid-oidc/program.scm:412
+#: src/scm/webid-oidc/program.scm:416 src/scm/webid-oidc/program.scm:420
msgid "an environment variable| It is currently unset."
msgstr ""
-#: src/scm/webid-oidc/program.scm:444
+#: src/scm/webid-oidc/program.scm:461
#, scheme-format
msgid "The --~a argument must be a number, not ~s.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:450
+#: src/scm/webid-oidc/program.scm:467
#, scheme-format
msgid "The --~a argument must be an integer, not ~s.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:456
+#: src/scm/webid-oidc/program.scm:473
#, scheme-format
msgid "The --~a argument must be positive, ~s is invalid.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:461
+#: src/scm/webid-oidc/program.scm:478
#, scheme-format
msgid "The --~a argument must be less than 65536, ~s is invalid.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:503
+#: src/scm/webid-oidc/program.scm:520
#, scheme-format
msgid ""
"Usage: ~a COMMAND [OPTIONS]...\n"
"See --~a (-h).\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:514 src/scm/webid-oidc/program.scm:536
-#: src/scm/webid-oidc/program.scm:608
+#: src/scm/webid-oidc/program.scm:531 src/scm/webid-oidc/program.scm:553
+#: src/scm/webid-oidc/program.scm:625
#, scheme-format
msgid "You must pass --~a to set the server name.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:518
+#: src/scm/webid-oidc/program.scm:535
#, scheme-format
msgid "You must pass --~a to set the backend URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:540 src/scm/webid-oidc/program.scm:612
+#: src/scm/webid-oidc/program.scm:557 src/scm/webid-oidc/program.scm:629
#, scheme-format
msgid ""
"You must pass --~a to set the file where to store the identity provider "
"key.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:544 src/scm/webid-oidc/program.scm:616
+#: src/scm/webid-oidc/program.scm:561 src/scm/webid-oidc/program.scm:633
#, scheme-format
msgid "You must pass --~a to set the subject of the identity provider.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:548 src/scm/webid-oidc/program.scm:620
+#: src/scm/webid-oidc/program.scm:565 src/scm/webid-oidc/program.scm:637
#, scheme-format
msgid "You must pass --~a to set the subject’s encrypted password.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:552 src/scm/webid-oidc/program.scm:624
+#: src/scm/webid-oidc/program.scm:569 src/scm/webid-oidc/program.scm:641
#, scheme-format
msgid "You must pass --~a to set the JWKS URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:556 src/scm/webid-oidc/program.scm:628
+#: src/scm/webid-oidc/program.scm:573 src/scm/webid-oidc/program.scm:645
#, scheme-format
msgid "You must pass --~a to set the authorization endpoint URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:560 src/scm/webid-oidc/program.scm:632
+#: src/scm/webid-oidc/program.scm:577 src/scm/webid-oidc/program.scm:649
#, scheme-format
msgid "You must pass --~a to set the token endpoint URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:580
+#: src/scm/webid-oidc/program.scm:597
#, scheme-format
msgid "You must pass --~a to set the application web ID.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:584
+#: src/scm/webid-oidc/program.scm:601
#, scheme-format
msgid "You must pass --~a to set the redirection URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:588
+#: src/scm/webid-oidc/program.scm:605
#, scheme-format
msgid "You must pass --~a to set the informative client name.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:592
+#: src/scm/webid-oidc/program.scm:609
#, scheme-format
msgid "You must pass --~a to set the informative client URI.\n"
msgstr ""
-#: src/scm/webid-oidc/program.scm:679
+#: src/scm/webid-oidc/program.scm:696
#, scheme-format
msgid "Unknown command ~s\n"
msgstr ""
diff --git a/src/scm/webid-oidc/program.scm b/src/scm/webid-oidc/program.scm
index f083700..50f0da4 100644
--- a/src/scm/webid-oidc/program.scm
+++ b/src/scm/webid-oidc/program.scm
@@ -100,22 +100,39 @@
((record-accessor &unknown-client-locale 'c-locale) error)
(error->str error)))
(lambda ()
- (receive (response response-body)
- (handler request request-body)
+ (receive (response response-body user)
+ (call-with-values
+ (lambda ()
+ (handler request request-body))
+ (case-lambda
+ ((response response-body)
+ (values response response-body #f))
+ ((response response-body user)
+ (values response response-body user))))
(let ((logging-port
(let ((response-code (response-code response)))
(if (>= response-code 400)
;; That’s an error
(current-error-port)
(current-output-port)))))
- (format logging-port
- (G_ "~a: ~a: ~s ~a ~s ~a\n")
- (date->string (time-utc->date (current-time)))
- (request-ip-address request)
- (request-method request)
- (uri-path (request-uri request))
- (response-code response)
- (response-reason-phrase response)))
+ (if user
+ (format logging-port
+ (G_ "~a: ~a (~a): ~s ~a ~s ~a\n")
+ (date->string (time-utc->date (current-time)))
+ (uri->string user)
+ (request-ip-address request)
+ (request-method request)
+ (uri-path (request-uri request))
+ (response-code response)
+ (response-reason-phrase response))
+ (format logging-port
+ (G_ "~a: ~a: ~s ~a ~s ~a\n")
+ (date->string (time-utc->date (current-time)))
+ (request-ip-address request)
+ (request-method request)
+ (uri-path (request-uri request))
+ (response-code response)
+ (response-reason-phrase response))))
(return
(build-response
#:version (response-version response)
diff --git a/src/scm/webid-oidc/resource-server.scm b/src/scm/webid-oidc/resource-server.scm
index 9257a43..a8e88f5 100644
--- a/src/scm/webid-oidc/resource-server.scm
+++ b/src/scm/webid-oidc/resource-server.scm
@@ -120,12 +120,13 @@
(lambda ()
(f return))))))
-(define (serve-get return path if-match if-none-match content-type content etag headers)
+(define (serve-get return path if-match if-none-match content-type content etag headers user)
(define (respond-normal)
(return
(build-response
#:headers headers)
- content))
+ content
+ user))
(if if-match
;; If the precondition failed, then we should respond with 412
(with-exception-handler
@@ -136,7 +137,8 @@
(build-response
#:code 412
#:reason-phrase "Precondition Failed")
- #f))
+ #f
+ user))
(lambda ()
(check-precondition path if-match if-none-match etag)
(respond-normal)))
@@ -151,7 +153,8 @@
#:code 304
#:reason-phrase "Not Modified"
#:headers headers)
- #f))
+ #f
+ user))
(lambda ()
(when if-none-match
(check-precondition path if-match if-none-match etag))
@@ -207,7 +210,8 @@
negociated-content
(car (assq-ref headers 'etag))
(cons `(content-type ,negociated-content-type)
- other-headers))))))
+ other-headers)
+ user)))))
((PUT)
(return
(build-response
@@ -220,7 +224,8 @@
request-body
#:http-get http-get)
. #f))))
- ""))
+ ""
+ user))
((POST)
(let ((types
(map car
@@ -239,7 +244,8 @@
(request-content-type request)
request-body
#:http-get http-get))))
- "")))
+ ""
+ user)))
((DELETE)
(delete server-uri owner user
(uri-path (request-uri request))
@@ -248,7 +254,8 @@
#:http-get http-get)
(return
(build-response)
- "")))))
+ ""
+ user)))))
(lambda (return error)
(if (cannot-fetch-group? error)
(format (current-error-port) (G_ "Warning: ~a\n")
@@ -267,7 +274,8 @@
#:host (uri-host server-uri)
#:port (uri-port server-uri)
#:path (uri-slash-semantics-error-expected-path error)))))
- #f))
+ #f
+ user))
((or (path-not-found? error)
(auxiliary-resource-absent? error)
(forbidden? error))
@@ -275,17 +283,20 @@
;; That’s a forbidden
(return
(build-response #:code 403 #:reason-phrase "Forbidden")
- #f)
+ #f
+ user)
(return
(build-response #:code 401 #:reason-phrase "Unauthorized"
#:headers `((www-authenticate . ((DPoP)))))
- #f)))
+ #f
+ user)))
((or (cannot-delete-root? error))
(return
(build-response
#:code 405
#:reason-phrase "Method Not Allowed")
- #f))
+ #f
+ user))
((or (container-not-empty? error)
(incorrect-containment-triples? error)
(path-is-auxiliary? error))
@@ -293,24 +304,28 @@
(build-response
#:code 409
#:reason-phrase "Conflict")
- #f))
+ #f
+ user))
((unsupported-media-type? error)
(return
(build-response
#:code 415
#:reason-phrase "Unsupported Media Type")
- #f))
+ #f
+ user))
((precondition-failed? error)
(return
(build-response
#:code 412
#:reason-phrase "Precondition Failed")
- #f))
+ #f
+ user))
((not-acceptable? error)
(return
(build-response
#:code 406
#:reason-phrase "Not Acceptable")
- #f))
+ #f
+ user))
(else
(raise-exception error)))))))))
generated by cgit v1.2.3 (git 2.44.0) at 2024-06-03 04:05:58 +0000