Merge branch 'main' into kerberos-source-reworked

locale/fr/LC_MESSAGES/django.po

@@ -6,20 +6,20 @@
 # Translators:
 # Bastien Germond, 2022
 # Phorcys, 2022
-# Titouan Petit, 2023
 # Kyllian Delaye-Maillot, 2023
 # Manuel Viens, 2023
 # Mordecai, 2023
 # Charles Leclerc, 2024
 # nerdinator <florian.dupret@gmail.com>, 2024
+# Titouan Petit, 2024
 # Marc Schmitt, 2024
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-10-15 00:08+0000\n"
+"POT-Creation-Date: 2024-10-18 00:09+0000\n"
 "PO-Revision-Date: 2022-09-26 16:47+0000\n"
 "Last-Translator: Marc Schmitt, 2024\n"
 "Language-Team: French (https://app.transifex.com/authentik/teams/119923/fr/)\n"
@@ -29,6 +29,10 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
+#: authentik/admin/models.py
+msgid "Version history"
+msgstr "Historique des versions"
+
 #: authentik/admin/tasks.py
 #, python-brace-format
 msgid "New version {version} available!"
@@ -1527,13 +1531,21 @@ msgstr "Configure comment le champ émetteur du jeton ID sera rempli."
 msgid "Signing Key"
 msgstr "Clé de signature"
 
+#: authentik/providers/oauth2/models.py
+msgid "Key used to sign the tokens."
+msgstr "Clé utilisée pour signer les jetons."
+
+#: authentik/providers/oauth2/models.py
+msgid "Encryption Key"
+msgstr "Clé de chiffrement"
+
 #: authentik/providers/oauth2/models.py
 msgid ""
-"Key used to sign the tokens. Only required when JWT Algorithm is set to "
-"RS256."
+"Key used to encrypt the tokens. When set, tokens will be encrypted and "
+"returned as JWEs."
 msgstr ""
-"Clé utilisée pour signer les jetons. Nécessaire uniquement lorsque "
-"l'algorithme JWT est réglé sur RS256."
+"Clé utilisée pour chiffrer les jetons. Si sélectionné, les jetons seront "
+"chiffrés et retournés sous forme de JWE."
 
 #: authentik/providers/oauth2/models.py
 msgid ""

tests/e2e/sources_oauth2_dex/dex.yaml

@@ -7,8 +7,8 @@ staticClients:
   - id: example-app
     name: Example App
     redirectURIs:
-      - {{ .Env.AK_REDIRECT_URL }}
-    secret: {{ .Env.AK_CLIENT_SECRET }}
+      - "{{ .Env.AK_REDIRECT_URL }}"
+    secret: "{{ .Env.AK_CLIENT_SECRET }}"
 staticPasswords:
   - email: admin@example.com
     # hash for 'password', for testing

tests/e2e/test_source_oauth_oauth2.py

@@ -13,7 +13,7 @@
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import User
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id, generate_key
+from authentik.lib.generators import generate_id
 from authentik.sources.oauth.models import OAuthSource
 from authentik.stages.identification.models import IdentificationStage
 from tests.e2e.utils import SeleniumTestCase, retry
@@ -23,7 +23,7 @@ class TestSourceOAuth2(SeleniumTestCase):
     """test OAuth Source flow"""
 
     def setUp(self):
-        self.client_secret = generate_key()
+        self.client_secret = generate_id()
         self.slug = generate_id()
         super().setUp()
         self.run_container(

web/src/enterprise/rac/index.ts

@@ -86,8 +86,8 @@ export class RacInterface extends Interface {
     static domSize(): { width: number; height: number } {
         const size = document.body.getBoundingClientRect();
         return {
-            width: size.width * window.devicePixelRatio,
-            height: size.height * window.devicePixelRatio,
+            width: size.width,
+            height: size.height,
         };
     }
 
@@ -175,7 +175,6 @@ export class RacInterface extends Interface {
         const params = new URLSearchParams();
         params.set("screen_width", Math.floor(RacInterface.domSize().width).toString());
         params.set("screen_height", Math.floor(RacInterface.domSize().height).toString());
-        params.set("screen_dpi", (window.devicePixelRatio * 96).toString());
         this.client.connect(params.toString());
     }
 

web/xliff/fr.xlf

@@ -9123,9 +9123,11 @@ Les liaisons avec les groupes/utilisateurs sont vérifiées par rapport à l'uti
 </trans-unit>
 <trans-unit id="sc991a35f5e88d1d3">
   <source>Encryption Key</source>
+  <target>Clé de chiffrement</target>
 </trans-unit>
 <trans-unit id="s8a598f7aef81c3bc">
   <source>Key used to encrypt the tokens.</source>
+  <target>Clé utilisée pour chiffrer les jetons.</target>
 </trans-unit>
     </body>
   </file>

web/xliff/zh-Hans.xlf

@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+<?xml version="1.0"?><xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
   <file target-language="zh-Hans" source-language="en" original="lit-localize-inputs" datatype="plaintext">
     <body>
       <trans-unit id="s4caed5b7a7e5d89b">
@@ -596,9 +596,9 @@
 
       </trans-unit>
       <trans-unit id="saa0e2675da69651b">
-        <source>The URL &quot;<x id="0" equiv-text="${this.url}"/>&quot; was not found.</source>
-        <target>未找到 URL &quot;
-        <x id="0" equiv-text="${this.url}"/>&quot;。</target>
+        <source>The URL "<x id="0" equiv-text="${this.url}"/>" was not found.</source>
+        <target>未找到 URL "
+        <x id="0" equiv-text="${this.url}"/>"。</target>
 
       </trans-unit>
       <trans-unit id="s58cd9c2fe836d9c6">
@@ -1030,8 +1030,8 @@
 
       </trans-unit>
       <trans-unit id="sa8384c9c26731f83">
-        <source>To allow any redirect URI, set this value to &quot;.*&quot;. Be aware of the possible security implications this can have.</source>
-        <target>要允许任何重定向 URI，请将此值设置为 &quot;.*&quot;。请注意这可能带来的安全影响。</target>
+        <source>To allow any redirect URI, set this value to ".*". Be aware of the possible security implications this can have.</source>
+        <target>要允许任何重定向 URI，请将此值设置为 ".*"。请注意这可能带来的安全影响。</target>
 
       </trans-unit>
       <trans-unit id="s55787f4dfcdce52b">
@@ -1752,8 +1752,8 @@
 
       </trans-unit>
       <trans-unit id="sa90b7809586c35ce">
-        <source>Either input a full URL, a relative path, or use 'fa://fa-test' to use the Font Awesome icon &quot;fa-test&quot;.</source>
-        <target>输入完整 URL、相对路径，或者使用 'fa://fa-test' 来使用 Font Awesome 图标 &quot;fa-test&quot;。</target>
+        <source>Either input a full URL, a relative path, or use 'fa://fa-test' to use the Font Awesome icon "fa-test".</source>
+        <target>输入完整 URL、相对路径，或者使用 'fa://fa-test' 来使用 Font Awesome 图标 "fa-test"。</target>
 
       </trans-unit>
       <trans-unit id="s0410779cb47de312">
@@ -2916,8 +2916,8 @@ doesn't pass when either or both of the selected options are equal or above the
 
       </trans-unit>
       <trans-unit id="s76768bebabb7d543">
-        <source>Field which contains members of a group. Note that if using the &quot;memberUid&quot; field, the value is assumed to contain a relative distinguished name. e.g. 'memberUid=some-user' instead of 'memberUid=cn=some-user,ou=groups,...'</source>
-        <target>包含组成员的字段。请注意，如果使用 &quot;memberUid&quot; 字段，则假定该值包含相对可分辨名称。例如，'memberUid=some-user' 而不是 'memberUid=cn=some-user,ou=groups,...'</target>
+        <source>Field which contains members of a group. Note that if using the "memberUid" field, the value is assumed to contain a relative distinguished name. e.g. 'memberUid=some-user' instead of 'memberUid=cn=some-user,ou=groups,...'</source>
+        <target>包含组成员的字段。请注意，如果使用 "memberUid" 字段，则假定该值包含相对可分辨名称。例如，'memberUid=some-user' 而不是 'memberUid=cn=some-user,ou=groups,...'</target>
 
       </trans-unit>
       <trans-unit id="s026555347e589f0e">
@@ -3663,8 +3663,8 @@ doesn't pass when either or both of the selected options are equal or above the
 
       </trans-unit>
       <trans-unit id="s7b1fba26d245cb1c">
-        <source>When using an external logging solution for archiving, this can be set to &quot;minutes=5&quot;.</source>
-        <target>使用外部日志记录解决方案进行存档时，可以将其设置为 &quot;minutes=5&quot;。</target>
+        <source>When using an external logging solution for archiving, this can be set to "minutes=5".</source>
+        <target>使用外部日志记录解决方案进行存档时，可以将其设置为 "minutes=5"。</target>
 
       </trans-unit>
       <trans-unit id="s44536d20bb5c8257">
@@ -3840,10 +3840,10 @@ doesn't pass when either or both of the selected options are equal or above the
 
       </trans-unit>
       <trans-unit id="sa95a538bfbb86111">
-        <source>Are you sure you want to update <x id="0" equiv-text="${this.objectLabel}"/> &quot;<x id="1" equiv-text="${this.obj?.name}"/>&quot;?</source>
+        <source>Are you sure you want to update <x id="0" equiv-text="${this.objectLabel}"/> "<x id="1" equiv-text="${this.obj?.name}"/>"?</source>
         <target>您确定要更新
-        <x id="0" equiv-text="${this.objectLabel}"/>&quot;
-        <x id="1" equiv-text="${this.obj?.name}"/>&quot; 吗？</target>
+        <x id="0" equiv-text="${this.objectLabel}"/>"
+        <x id="1" equiv-text="${this.obj?.name}"/>" 吗？</target>
 
       </trans-unit>
       <trans-unit id="sc92d7cfb6ee1fec6">
@@ -4919,7 +4919,7 @@ doesn't pass when either or both of the selected options are equal or above the
 
       </trans-unit>
       <trans-unit id="sdf1d8edef27236f0">
-        <source>A &quot;roaming&quot; authenticator, like a YubiKey</source>
+        <source>A "roaming" authenticator, like a YubiKey</source>
         <target>像 YubiKey 这样的“漫游”身份验证器</target>
 
       </trans-unit>
@@ -5298,7 +5298,7 @@ doesn't pass when either or both of the selected options are equal or above the
 
       </trans-unit>
       <trans-unit id="s1608b2f94fa0dbd4">
-        <source>If set to a duration above 0, the user will have the option to choose to &quot;stay signed in&quot;, which will extend their session by the time specified here.</source>
+        <source>If set to a duration above 0, the user will have the option to choose to "stay signed in", which will extend their session by the time specified here.</source>
         <target>如果设置时长大于 0，用户可以选择“保持登录”选项，这将使用户的会话延长此处设置的时间。</target>
 
       </trans-unit>
@@ -7722,7 +7722,7 @@ Bindings to groups/users are checked against the user of the event.</source>
   <target>成功创建用户并添加到组 <x id="0" equiv-text="${this.group.name}"/></target>
 </trans-unit>
 <trans-unit id="s824e0943a7104668">
-  <source>This user will be added to the group &quot;<x id="0" equiv-text="${this.targetGroup.name}"/>&quot;.</source>
+  <source>This user will be added to the group "<x id="0" equiv-text="${this.targetGroup.name}"/>".</source>
   <target>此用户将会被添加到组 &amp;quot;<x id="0" equiv-text="${this.targetGroup.name}"/>&amp;quot;。</target>
 </trans-unit>
 <trans-unit id="s62e7f6ed7d9cb3ca">
@@ -9080,7 +9080,7 @@ Bindings to groups/users are checked against the user of the event.</source>
   <target>同步组</target>
 </trans-unit>
 <trans-unit id="s2d5f69929bb7221d">
-  <source><x id="0" equiv-text="${prompt.name}"/> (&quot;<x id="1" equiv-text="${prompt.fieldKey}"/>&quot;, of type <x id="2" equiv-text="${prompt.type}"/>)</source>
+  <source><x id="0" equiv-text="${prompt.name}"/> ("<x id="1" equiv-text="${prompt.fieldKey}"/>", of type <x id="2" equiv-text="${prompt.type}"/>)</source>
   <target><x id="0" equiv-text="${prompt.name}"/>（&amp;quot;<x id="1" equiv-text="${prompt.fieldKey}"/>&amp;quot;，类型为 <x id="2" equiv-text="${prompt.type}"/>）</target>
 </trans-unit>
 <trans-unit id="sa38c5a2731be3a46">
@@ -9133,4 +9133,4 @@ Bindings to groups/users are checked against the user of the event.</source>
 </trans-unit>
     </body>
   </file>
-</xliff>
+</xliff>

website/docs/security/security-hardening.md

@@ -14,7 +14,7 @@ However, for further hardening, it is possible to prevent any user (even super-u
 -   `/api/v3/propertymappings*`
 -   `/api/v3/managed/blueprints*`
 
-With these restrictions in place, expressions can only be edited using [Blueprints on the file system](https://docs.goauthentik.io/developer-docs/blueprints/#storage---file). Take care to restrict access to the file system itself.
+With these restrictions in place, expressions can only be edited using [Blueprints on the file system](../customize/blueprints/index.md#storage---file). Take care to restrict access to the file system itself.
 
 ### Blueprints
 
@@ -24,7 +24,7 @@ To prevent any user from creating/editing blueprints, block API requests to this
 
 -   `/api/v3/managed/blueprints*`
 
-With these restrictions in place, Blueprints can only be edited via [the file system](https://docs.goauthentik.io/developer-docs/blueprints/#storage---file).
+With these restrictions in place, Blueprints can only be edited via [the file system](../customize/blueprints/index.md#storage---file).
 
 ### CAPTCHA Stage
 
@@ -35,4 +35,4 @@ To prevent any user from creating/editing CAPTCHA stages block API requests to t
 -   `/api/v3/stages/captcha*`
 -   `/api/v3/managed/blueprints*`
 
-With these restrictions in place, CAPTCHA stages can only be edited using [Blueprints on the file system](https://docs.goauthentik.io/developer-docs/blueprints/#storage---file).
+With these restrictions in place, CAPTCHA stages can only be edited using [Blueprints on the file system](../customize/blueprints/index.md#storage---file).

website/netlify.toml

@@ -1000,7 +1000,7 @@
   force = true
 
 [[redirects]]
-  from = "/developer-docsapi/websocket"
+  from = "/developer-docs/api/websocket"
   to = "/docs/developer-docs/api/websocket"
   status = 302
   force = true
@@ -1011,6 +1011,12 @@
   status = 302
   force = true
 
+[[redirects]]
+  from = "/developer-docs/blueprints"
+  to = "/docs/customize/blueprints"
+  status = 302
+  force = true
+
 [[redirects]]
   from = "/developer-docs/docs/writing-documentation"
   to = "/docs/developer-docs/docs/writing-documentation"