trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: fix typo'd signing pair name 

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-11-24 09:55:10 +01:00
parent b69aaf9417
commit 0b8cfd437b
12 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
authentik/providers/saml/migrations/0001_initial.py
View File

@ -110,14 +110,14 @@ class Migration(migrations.Migration):
"require_signing", "require_signing",
models.BooleanField( models.BooleanField(
default=False, 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", "signing_kp",
models.ForeignKey( models.ForeignKey(
default=None, 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, null=True,
on_delete=django.db.models.deletion.SET_NULL, on_delete=django.db.models.deletion.SET_NULL,
to="authentik_crypto.CertificateKeyPair", to="authentik_crypto.CertificateKeyPair",

4
authentik/providers/saml/migrations/0001_squashed_0005_remove_samlprovider_processor_path.py
View File

@ -114,14 +114,14 @@ class Migration(migrations.Migration):
"require_signing", "require_signing",
models.BooleanField( models.BooleanField(
default=False, 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", "signing_kp",
models.ForeignKey( models.ForeignKey(
default=None, 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, null=True,
on_delete=django.db.models.deletion.SET_NULL, on_delete=django.db.models.deletion.SET_NULL,
to="authentik_crypto.certificatekeypair", to="authentik_crypto.certificatekeypair",

2
authentik/providers/saml/processors/metadata.py
View File

@ -36,7 +36,7 @@ class MetadataProcessor:
self.xml_id = get_random_id() self.xml_id = get_random_id()
def get_signing_key_descriptor(self) -> Optional[Element]: 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: if not self.provider.signing_kp:
return None return None
key_descriptor = Element(f"{{{NS_SAML_METADATA}}}KeyDescriptor") key_descriptor = Element(f"{{{NS_SAML_METADATA}}}KeyDescriptor")

2
authentik/providers/saml/tests/test_metadata.py
View File

@ -68,7 +68,7 @@ class TestServiceProviderMetadataParser(TestCase):
self.flow = create_test_flow() self.flow = create_test_flow()
def test_simple(self): def test_simple(self):
"""Test simple metadata without Singing""" """Test simple metadata without Signing"""
metadata = ServiceProviderMetadataParser().parse(METADATA_SIMPLE) metadata = ServiceProviderMetadataParser().parse(METADATA_SIMPLE)
provider = metadata.to_provider("test", self.flow) provider = metadata.to_provider("test", self.flow)
self.assertEqual(provider.acs_url, "http://localhost:8080/saml/acs") self.assertEqual(provider.acs_url, "http://localhost:8080/saml/acs")

2
authentik/sources/saml/migrations/0001_squashed_0009_auto_20210301_0949.py
View File

@ -104,7 +104,7 @@ class Migration(migrations.Migration):
null=True, null=True,
on_delete=django.db.models.deletion.SET_DEFAULT, on_delete=django.db.models.deletion.SET_DEFAULT,
to="authentik_crypto.certificatekeypair", to="authentik_crypto.certificatekeypair",
verbose_name="Singing Keypair", verbose_name="Signing Keypair",
), ),
), ),
( (

2
authentik/sources/saml/migrations/0003_auto_20200624_1957.py
View File

@ -45,7 +45,7 @@ class Migration(migrations.Migration):
help_text="Certificate Key Pair of the IdP which Assertion's Signature is validated against.", help_text="Certificate Key Pair of the IdP which Assertion's Signature is validated against.",
on_delete=django.db.models.deletion.PROTECT, on_delete=django.db.models.deletion.PROTECT,
to="authentik_crypto.CertificateKeyPair", to="authentik_crypto.CertificateKeyPair",
verbose_name="Singing Keypair", verbose_name="Signing Keypair",
), ),
), ),
migrations.AlterField( migrations.AlterField(

2
authentik/sources/saml/migrations/0007_auto_20201112_1055.py
View File

@ -45,7 +45,7 @@ class Migration(migrations.Migration):
null=True, null=True,
on_delete=django.db.models.deletion.SET_DEFAULT, on_delete=django.db.models.deletion.SET_DEFAULT,
to="authentik_crypto.certificatekeypair", to="authentik_crypto.certificatekeypair",
verbose_name="Singing Keypair", verbose_name="Signing Keypair",
), ),
), ),
] ]

2
authentik/sources/saml/models.py
View File

@ -116,7 +116,7 @@ class SAMLSource(Source):
default=None, default=None,
blank=True, blank=True,
null=True, null=True,
verbose_name=_("Singing Keypair"), verbose_name=_("Signing Keypair"),
help_text=_( help_text=_(
"Keypair which is used to sign outgoing requests. Leave empty to disable signing." "Keypair which is used to sign outgoing requests. Leave empty to disable signing."
), ),

2
authentik/sources/saml/processors/metadata.py
View File

@ -30,7 +30,7 @@ class MetadataProcessor:
self.http_request = request self.http_request = request
def get_signing_key_descriptor(self) -> Optional[Element]: 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: if self.source.signing_kp:
key_descriptor = Element(f"{{{NS_SAML_METADATA}}}KeyDescriptor") key_descriptor = Element(f"{{{NS_SAML_METADATA}}}KeyDescriptor")
key_descriptor.attrib["use"] = "signing" key_descriptor.attrib["use"] = "signing"

6
locale/de/LC_MESSAGES/django.po
View File

@ -2,14 +2,14 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
# Translators: # Translators:
# Vrifox, 2021 # Vrifox, 2021
# Lars Lehmann <lars@lars-lehmann.net>, 2021 # Lars Lehmann <lars@lars-lehmann.net>, 2021
# Johannes —/—, 2021 # Johannes —/—, 2021
# flip yksflip, 2021 # flip yksflip, 2021
# Rhea Alleen, 2021 # Rhea Alleen, 2021
# #
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
@ -1274,7 +1274,7 @@ msgid "Delete temporary users after"
msgstr "Temporäre Benutzer danach löschen" msgstr "Temporäre Benutzer danach löschen"
#: authentik/sources/saml/models.py:119 #: authentik/sources/saml/models.py:119
msgid "Singing Keypair" msgid "Signing Keypair"
msgstr "Signierendes Schlüsselpaar" msgstr "Signierendes Schlüsselpaar"
#: authentik/sources/saml/models.py:121 #: authentik/sources/saml/models.py:121

54
locale/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -39,99 +39,99 @@ msgstr ""
msgid "Create a SAML Provider by importing its Metadata." msgid "Create a SAML Provider by importing its Metadata."
msgstr "" msgstr ""
#: authentik/core/models.py:70 #: authentik/core/models.py:69
msgid "name" msgid "name"
msgstr "" msgstr ""
#: authentik/core/models.py:72 #: authentik/core/models.py:71
msgid "Users added to this group will be superusers." msgid "Users added to this group will be superusers."
msgstr "" msgstr ""
#: authentik/core/models.py:130 #: authentik/core/models.py:129
msgid "User's display name." msgid "User's display name."
msgstr "" 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" msgid "User"
msgstr "" msgstr ""
#: authentik/core/models.py:198 #: authentik/core/models.py:197
msgid "Users" msgid "Users"
msgstr "" msgstr ""
#: authentik/core/models.py:209 #: authentik/core/models.py:208
msgid "Flow used when authorizing this provider." msgid "Flow used when authorizing this provider."
msgstr "" msgstr ""
#: authentik/core/models.py:242 #: authentik/core/models.py:241
msgid "Application's display Name." msgid "Application's display Name."
msgstr "" msgstr ""
#: authentik/core/models.py:243 #: authentik/core/models.py:242
msgid "Internal application name, used in URLs." msgid "Internal application name, used in URLs."
msgstr "" msgstr ""
#: authentik/core/models.py:290 #: authentik/core/models.py:289
msgid "Application" msgid "Application"
msgstr "" msgstr ""
#: authentik/core/models.py:291 #: authentik/core/models.py:290
msgid "Applications" msgid "Applications"
msgstr "" msgstr ""
#: authentik/core/models.py:297 #: authentik/core/models.py:296
msgid "Use the source-specific identifier" msgid "Use the source-specific identifier"
msgstr "" msgstr ""
#: authentik/core/models.py:305 #: authentik/core/models.py:304
msgid "" msgid ""
"Use the user's email address, but deny enrollment when the email address " "Use the user's email address, but deny enrollment when the email address "
"already exists." "already exists."
msgstr "" msgstr ""
#: authentik/core/models.py:314 #: authentik/core/models.py:313
msgid "" msgid ""
"Use the user's username, but deny enrollment when the username already " "Use the user's username, but deny enrollment when the username already "
"exists." "exists."
msgstr "" msgstr ""
#: authentik/core/models.py:321 #: authentik/core/models.py:320
msgid "Source's display Name." msgid "Source's display Name."
msgstr "" msgstr ""
#: authentik/core/models.py:322 #: authentik/core/models.py:321
msgid "Internal source name, used in URLs." msgid "Internal source name, used in URLs."
msgstr "" msgstr ""
#: authentik/core/models.py:333 #: authentik/core/models.py:332
msgid "Flow to use when authenticating existing users." msgid "Flow to use when authenticating existing users."
msgstr "" msgstr ""
#: authentik/core/models.py:342 #: authentik/core/models.py:341
msgid "Flow to use when enrolling new users." msgid "Flow to use when enrolling new users."
msgstr "" msgstr ""
#: authentik/core/models.py:474 #: authentik/core/models.py:473
msgid "Token" msgid "Token"
msgstr "" msgstr ""
#: authentik/core/models.py:475 #: authentik/core/models.py:474
msgid "Tokens" msgid "Tokens"
msgstr "" msgstr ""
#: authentik/core/models.py:518 #: authentik/core/models.py:517
msgid "Property Mapping" msgid "Property Mapping"
msgstr "" msgstr ""
#: authentik/core/models.py:519 #: authentik/core/models.py:518
msgid "Property Mappings" msgid "Property Mappings"
msgstr "" msgstr ""
#: authentik/core/models.py:555 #: authentik/core/models.py:554
msgid "Authenticated Session" msgid "Authenticated Session"
msgstr "" msgstr ""
#: authentik/core/models.py:556 #: authentik/core/models.py:555
msgid "Authenticated Sessions" msgid "Authenticated Sessions"
msgstr "" msgstr ""
@ -892,7 +892,7 @@ msgstr ""
msgid "Keypair used to sign outgoing Responses going to the Service Provider." msgid "Keypair used to sign outgoing Responses going to the Service Provider."
msgstr "" msgstr ""
#: authentik/providers/saml/models.py:150 #: authentik/providers/saml/models.py:150 authentik/sources/saml/models.py:119
msgid "Signing Keypair" msgid "Signing Keypair"
msgstr "" msgstr ""
@ -1196,10 +1196,6 @@ msgstr ""
msgid "Delete temporary users after" msgid "Delete temporary users after"
msgstr "" msgstr ""
#: authentik/sources/saml/models.py:119
msgid "Singing Keypair"
msgstr ""
#: authentik/sources/saml/models.py:121 #: authentik/sources/saml/models.py:121
msgid "" msgid ""
"Keypair which is used to sign outgoing requests. Leave empty to disable " "Keypair which is used to sign outgoing requests. Leave empty to disable "

6
schema.yml
View File

@ -27816,7 +27816,7 @@ components:
type: string type: string
format: uuid format: uuid
nullable: true nullable: true
title: Singing Keypair title: Signing Keypair
description: Keypair which is used to sign outgoing requests. Leave empty description: Keypair which is used to sign outgoing requests. Leave empty
to disable signing. to disable signing.
digest_algorithm: digest_algorithm:
@ -29489,7 +29489,7 @@ components:
type: string type: string
format: uuid format: uuid
nullable: true nullable: true
title: Singing Keypair title: Signing Keypair
description: Keypair which is used to sign outgoing requests. Leave empty description: Keypair which is used to sign outgoing requests. Leave empty
to disable signing. to disable signing.
digest_algorithm: digest_algorithm:
@ -29578,7 +29578,7 @@ components:
type: string type: string
format: uuid format: uuid
nullable: true nullable: true
title: Singing Keypair title: Signing Keypair
description: Keypair which is used to sign outgoing requests. Leave empty description: Keypair which is used to sign outgoing requests. Leave empty
to disable signing. to disable signing.
digest_algorithm: digest_algorithm: