diff --git a/authentik/providers/saml/migrations/0001_initial.py b/authentik/providers/saml/migrations/0001_initial.py index e78eef07d..a8cb964fc 100644 --- a/authentik/providers/saml/migrations/0001_initial.py +++ b/authentik/providers/saml/migrations/0001_initial.py @@ -110,14 +110,14 @@ class Migration(migrations.Migration): "require_signing", models.BooleanField( default=False, - help_text="Require Requests to be signed by an X509 Certificate. Must match the Certificate selected in `Singing Keypair`.", + help_text="Require Requests to be signed by an X509 Certificate. Must match the Certificate selected in `Signing Keypair`.", ), ), ( "signing_kp", models.ForeignKey( default=None, - help_text="Singing is enabled upon selection of a Key Pair.", + help_text="Signing is enabled upon selection of a Key Pair.", null=True, on_delete=django.db.models.deletion.SET_NULL, to="authentik_crypto.CertificateKeyPair", diff --git a/authentik/providers/saml/migrations/0001_squashed_0005_remove_samlprovider_processor_path.py b/authentik/providers/saml/migrations/0001_squashed_0005_remove_samlprovider_processor_path.py index 0277567c6..463d59dc0 100644 --- a/authentik/providers/saml/migrations/0001_squashed_0005_remove_samlprovider_processor_path.py +++ b/authentik/providers/saml/migrations/0001_squashed_0005_remove_samlprovider_processor_path.py @@ -114,14 +114,14 @@ class Migration(migrations.Migration): "require_signing", models.BooleanField( default=False, - help_text="Require Requests to be signed by an X509 Certificate. Must match the Certificate selected in `Singing Keypair`.", + help_text="Require Requests to be signed by an X509 Certificate. Must match the Certificate selected in `Signing Keypair`.", ), ), ( "signing_kp", models.ForeignKey( default=None, - help_text="Singing is enabled upon selection of a Key Pair.", + help_text="Signing is enabled upon selection of a Key Pair.", null=True, on_delete=django.db.models.deletion.SET_NULL, to="authentik_crypto.certificatekeypair", diff --git a/authentik/providers/saml/processors/metadata.py b/authentik/providers/saml/processors/metadata.py index a296f46fc..8a97e5f22 100644 --- a/authentik/providers/saml/processors/metadata.py +++ b/authentik/providers/saml/processors/metadata.py @@ -36,7 +36,7 @@ class MetadataProcessor: self.xml_id = get_random_id() def get_signing_key_descriptor(self) -> Optional[Element]: - """Get Singing KeyDescriptor, if enabled for the provider""" + """Get Signing KeyDescriptor, if enabled for the provider""" if not self.provider.signing_kp: return None key_descriptor = Element(f"{{{NS_SAML_METADATA}}}KeyDescriptor") diff --git a/authentik/providers/saml/tests/test_metadata.py b/authentik/providers/saml/tests/test_metadata.py index 165004372..6f6531de6 100644 --- a/authentik/providers/saml/tests/test_metadata.py +++ b/authentik/providers/saml/tests/test_metadata.py @@ -68,7 +68,7 @@ class TestServiceProviderMetadataParser(TestCase): self.flow = create_test_flow() def test_simple(self): - """Test simple metadata without Singing""" + """Test simple metadata without Signing""" metadata = ServiceProviderMetadataParser().parse(METADATA_SIMPLE) provider = metadata.to_provider("test", self.flow) self.assertEqual(provider.acs_url, "http://localhost:8080/saml/acs") diff --git a/authentik/sources/saml/migrations/0001_squashed_0009_auto_20210301_0949.py b/authentik/sources/saml/migrations/0001_squashed_0009_auto_20210301_0949.py index 8489fbf7a..bf081e03f 100644 --- a/authentik/sources/saml/migrations/0001_squashed_0009_auto_20210301_0949.py +++ b/authentik/sources/saml/migrations/0001_squashed_0009_auto_20210301_0949.py @@ -104,7 +104,7 @@ class Migration(migrations.Migration): null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to="authentik_crypto.certificatekeypair", - verbose_name="Singing Keypair", + verbose_name="Signing Keypair", ), ), ( diff --git a/authentik/sources/saml/migrations/0003_auto_20200624_1957.py b/authentik/sources/saml/migrations/0003_auto_20200624_1957.py index cf0db37a8..c3f83d5b6 100644 --- a/authentik/sources/saml/migrations/0003_auto_20200624_1957.py +++ b/authentik/sources/saml/migrations/0003_auto_20200624_1957.py @@ -45,7 +45,7 @@ class Migration(migrations.Migration): help_text="Certificate Key Pair of the IdP which Assertion's Signature is validated against.", on_delete=django.db.models.deletion.PROTECT, to="authentik_crypto.CertificateKeyPair", - verbose_name="Singing Keypair", + verbose_name="Signing Keypair", ), ), migrations.AlterField( diff --git a/authentik/sources/saml/migrations/0007_auto_20201112_1055.py b/authentik/sources/saml/migrations/0007_auto_20201112_1055.py index d1b7d91a7..0f3ca1a40 100644 --- a/authentik/sources/saml/migrations/0007_auto_20201112_1055.py +++ b/authentik/sources/saml/migrations/0007_auto_20201112_1055.py @@ -45,7 +45,7 @@ class Migration(migrations.Migration): null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to="authentik_crypto.certificatekeypair", - verbose_name="Singing Keypair", + verbose_name="Signing Keypair", ), ), ] diff --git a/authentik/sources/saml/models.py b/authentik/sources/saml/models.py index bd7087173..412766757 100644 --- a/authentik/sources/saml/models.py +++ b/authentik/sources/saml/models.py @@ -116,7 +116,7 @@ class SAMLSource(Source): default=None, blank=True, null=True, - verbose_name=_("Singing Keypair"), + verbose_name=_("Signing Keypair"), help_text=_( "Keypair which is used to sign outgoing requests. Leave empty to disable signing." ), diff --git a/authentik/sources/saml/processors/metadata.py b/authentik/sources/saml/processors/metadata.py index 93f135b39..d5939931e 100644 --- a/authentik/sources/saml/processors/metadata.py +++ b/authentik/sources/saml/processors/metadata.py @@ -30,7 +30,7 @@ class MetadataProcessor: self.http_request = request def get_signing_key_descriptor(self) -> Optional[Element]: - """Get Singing KeyDescriptor, if enabled for the source""" + """Get Signing KeyDescriptor, if enabled for the source""" if self.source.signing_kp: key_descriptor = Element(f"{{{NS_SAML_METADATA}}}KeyDescriptor") key_descriptor.attrib["use"] = "signing" diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 9718514ae..41535121c 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# # Translators: # Vrifox, 2021 # Lars Lehmann , 2021 # Johannes —/—, 2021 # flip yksflip, 2021 # Rhea Alleen, 2021 -# +# #, fuzzy msgid "" msgstr "" @@ -1274,7 +1274,7 @@ msgid "Delete temporary users after" msgstr "Temporäre Benutzer danach löschen" #: authentik/sources/saml/models.py:119 -msgid "Singing Keypair" +msgid "Signing Keypair" msgstr "Signierendes Schlüsselpaar" #: authentik/sources/saml/models.py:121 diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index c53824d0a..8da1a953e 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-23 18:09+0000\n" +"POT-Creation-Date: 2021-11-24 08:54+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,99 +39,99 @@ msgstr "" msgid "Create a SAML Provider by importing its Metadata." msgstr "" -#: authentik/core/models.py:70 +#: authentik/core/models.py:69 msgid "name" msgstr "" -#: authentik/core/models.py:72 +#: authentik/core/models.py:71 msgid "Users added to this group will be superusers." msgstr "" -#: authentik/core/models.py:130 +#: authentik/core/models.py:129 msgid "User's display name." msgstr "" -#: authentik/core/models.py:197 authentik/providers/oauth2/models.py:315 +#: authentik/core/models.py:196 authentik/providers/oauth2/models.py:315 msgid "User" msgstr "" -#: authentik/core/models.py:198 +#: authentik/core/models.py:197 msgid "Users" msgstr "" -#: authentik/core/models.py:209 +#: authentik/core/models.py:208 msgid "Flow used when authorizing this provider." msgstr "" -#: authentik/core/models.py:242 +#: authentik/core/models.py:241 msgid "Application's display Name." msgstr "" -#: authentik/core/models.py:243 +#: authentik/core/models.py:242 msgid "Internal application name, used in URLs." msgstr "" -#: authentik/core/models.py:290 +#: authentik/core/models.py:289 msgid "Application" msgstr "" -#: authentik/core/models.py:291 +#: authentik/core/models.py:290 msgid "Applications" msgstr "" -#: authentik/core/models.py:297 +#: authentik/core/models.py:296 msgid "Use the source-specific identifier" msgstr "" -#: authentik/core/models.py:305 +#: authentik/core/models.py:304 msgid "" "Use the user's email address, but deny enrollment when the email address " "already exists." msgstr "" -#: authentik/core/models.py:314 +#: authentik/core/models.py:313 msgid "" "Use the user's username, but deny enrollment when the username already " "exists." msgstr "" -#: authentik/core/models.py:321 +#: authentik/core/models.py:320 msgid "Source's display Name." msgstr "" -#: authentik/core/models.py:322 +#: authentik/core/models.py:321 msgid "Internal source name, used in URLs." msgstr "" -#: authentik/core/models.py:333 +#: authentik/core/models.py:332 msgid "Flow to use when authenticating existing users." msgstr "" -#: authentik/core/models.py:342 +#: authentik/core/models.py:341 msgid "Flow to use when enrolling new users." msgstr "" -#: authentik/core/models.py:474 +#: authentik/core/models.py:473 msgid "Token" msgstr "" -#: authentik/core/models.py:475 +#: authentik/core/models.py:474 msgid "Tokens" msgstr "" -#: authentik/core/models.py:518 +#: authentik/core/models.py:517 msgid "Property Mapping" msgstr "" -#: authentik/core/models.py:519 +#: authentik/core/models.py:518 msgid "Property Mappings" msgstr "" -#: authentik/core/models.py:555 +#: authentik/core/models.py:554 msgid "Authenticated Session" msgstr "" -#: authentik/core/models.py:556 +#: authentik/core/models.py:555 msgid "Authenticated Sessions" msgstr "" @@ -892,7 +892,7 @@ msgstr "" msgid "Keypair used to sign outgoing Responses going to the Service Provider." msgstr "" -#: authentik/providers/saml/models.py:150 +#: authentik/providers/saml/models.py:150 authentik/sources/saml/models.py:119 msgid "Signing Keypair" msgstr "" @@ -1196,10 +1196,6 @@ msgstr "" msgid "Delete temporary users after" msgstr "" -#: authentik/sources/saml/models.py:119 -msgid "Singing Keypair" -msgstr "" - #: authentik/sources/saml/models.py:121 msgid "" "Keypair which is used to sign outgoing requests. Leave empty to disable " diff --git a/schema.yml b/schema.yml index 265a29ac2..a4d1439b0 100644 --- a/schema.yml +++ b/schema.yml @@ -27816,7 +27816,7 @@ components: type: string format: uuid nullable: true - title: Singing Keypair + title: Signing Keypair description: Keypair which is used to sign outgoing requests. Leave empty to disable signing. digest_algorithm: @@ -29489,7 +29489,7 @@ components: type: string format: uuid nullable: true - title: Singing Keypair + title: Signing Keypair description: Keypair which is used to sign outgoing requests. Leave empty to disable signing. digest_algorithm: @@ -29578,7 +29578,7 @@ components: type: string format: uuid nullable: true - title: Singing Keypair + title: Signing Keypair description: Keypair which is used to sign outgoing requests. Leave empty to disable signing. digest_algorithm: