From 7c2decf5ecb3530226fc8904bd585dc6a21bc8be Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Wed, 14 Jul 2021 09:22:25 +0200 Subject: [PATCH] providers/ldap: squash migrations Signed-off-by: Jens Langhammer --- .../migrations/0004_auto_20210713_2115.py | 4 +-- ...005_alter_ldapprovider_gid_start_number.py | 21 --------------- authentik/providers/ldap/models.py | 11 +++++--- web/src/locales/en.po | 26 +++++++++++++++++++ web/src/locales/pseudo-LOCALE.po | 26 +++++++++++++++++++ 5 files changed, 61 insertions(+), 27 deletions(-) delete mode 100644 authentik/providers/ldap/migrations/0005_alter_ldapprovider_gid_start_number.py diff --git a/authentik/providers/ldap/migrations/0004_auto_20210713_2115.py b/authentik/providers/ldap/migrations/0004_auto_20210713_2115.py index 1fd0bc256..3f559aefc 100644 --- a/authentik/providers/ldap/migrations/0004_auto_20210713_2115.py +++ b/authentik/providers/ldap/migrations/0004_auto_20210713_2115.py @@ -14,8 +14,8 @@ class Migration(migrations.Migration): model_name="ldapprovider", name="gid_start_number", field=models.IntegerField( - default=2000, - help_text="The start for gidNumbers, this number is added to a number generated from the group.Pk to make sure that the numbers aren't too low for POSIX groups. Default is 2000 to ensure that we don't collide with local groups gidNumber", + default=4000, + help_text="The start for gidNumbers, this number is added to a number generated from the group.Pk to make sure that the numbers aren't too low for POSIX groups. Default is 4000 to ensure that we don't collide with local groups or users primary groups gidNumber", ), ), migrations.AddField( diff --git a/authentik/providers/ldap/migrations/0005_alter_ldapprovider_gid_start_number.py b/authentik/providers/ldap/migrations/0005_alter_ldapprovider_gid_start_number.py deleted file mode 100644 index 34cfb44b8..000000000 --- a/authentik/providers/ldap/migrations/0005_alter_ldapprovider_gid_start_number.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 3.2.5 on 2021-07-14 06:49 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("authentik_providers_ldap", "0004_auto_20210713_2115"), - ] - - operations = [ - migrations.AlterField( - model_name="ldapprovider", - name="gid_start_number", - field=models.IntegerField( - default=4000, - help_text="The start for gidNumbers, this number is added to a number generated from the group.Pk to make sure that the numbers aren't too low for POSIX groups. Default is 4000 to ensure that we don't collide with local groups or users primary groups gidNumber", - ), - ), - ] diff --git a/authentik/providers/ldap/models.py b/authentik/providers/ldap/models.py index 4f871f65d..b041b8e07 100644 --- a/authentik/providers/ldap/models.py +++ b/authentik/providers/ldap/models.py @@ -43,16 +43,19 @@ class LDAPProvider(OutpostModel, Provider): uid_start_number = models.IntegerField( default=2000, help_text=_( - "The start for uidNumbers, this number is added to the user.Pk to make sure that the numbers aren't too low for POSIX users. " - "Default is 2000 to ensure that we don't collide with local users uidNumber" + "The start for uidNumbers, this number is added to the user.Pk to make sure that the " + "numbers aren't too low for POSIX users. Default is 2000 to ensure that we don't " + "collide with local users uidNumber" ), ) gid_start_number = models.IntegerField( default=4000, help_text=_( - "The start for gidNumbers, this number is added to a number generated from the group.Pk to make sure that the numbers aren't too low for POSIX groups. " - "Default is 4000 to ensure that we don't collide with local groups or users primary groups gidNumber" + "The start for gidNumbers, this number is added to a number generated from the " + "group.Pk to make sure that the numbers aren't too low for POSIX groups. Default " + "is 4000 to ensure that we don't collide with local groups or users " + "primary groups gidNumber" ), ) diff --git a/web/src/locales/en.po b/web/src/locales/en.po index 74e976223..ab65a5ee2 100644 --- a/web/src/locales/en.po +++ b/web/src/locales/en.po @@ -483,6 +483,7 @@ msgid "Case insensitive matching" msgstr "Case insensitive matching" #: src/pages/crypto/CertificateKeyPairForm.ts +#: src/pages/providers/ldap/LDAPProviderForm.ts #: src/pages/providers/proxy/ProxyProviderForm.ts msgid "Certificate" msgstr "Certificate" @@ -1669,6 +1670,10 @@ msgstr "From" msgid "From address" msgstr "From address" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "GID start number" +msgstr "GID start number" + #: src/pages/admin-overview/AdminOverviewPage.ts msgid "General system status" msgstr "General system status" @@ -2079,6 +2084,7 @@ msgstr "Loading" #: src/pages/property-mappings/PropertyMappingTestForm.ts #: src/pages/providers/ldap/LDAPProviderForm.ts #: src/pages/providers/ldap/LDAPProviderForm.ts +#: src/pages/providers/ldap/LDAPProviderForm.ts #: src/pages/providers/oauth2/OAuth2ProviderForm.ts #: src/pages/providers/oauth2/OAuth2ProviderForm.ts #: src/pages/providers/oauth2/OAuth2ProviderForm.ts @@ -3222,6 +3228,10 @@ msgstr "Separator: Static Separator Line" msgid "Server URI" msgstr "Server URI" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "Server name for which this provider's certificate is valid for." +msgstr "Server name for which this provider's certificate is valid for." + #: src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts msgid "Server validation of credential failed: {err}" msgstr "Server validation of credential failed: {err}" @@ -3791,6 +3801,10 @@ msgstr "System Tasks" msgid "TLS Authentication Certificate" msgstr "TLS Authentication Certificate" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "TLS Server name" +msgstr "TLS Server name" + #: src/pages/outposts/ServiceConnectionDockerForm.ts msgid "TLS Verification Certificate" msgstr "TLS Verification Certificate" @@ -3877,6 +3891,14 @@ msgstr "" msgid "The policy takes a random time to execute. This controls the minimum time it will take." msgstr "The policy takes a random time to execute. This controls the minimum time it will take." +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "The start for gidNumbers, this number is added to a number generated from the group.Pk to make sure that the numbers aren't too low for POSIX groups. Default is 4000 to ensure that we don't collide with local groups or users primary groups gidNumber" +msgstr "The start for gidNumbers, this number is added to a number generated from the group.Pk to make sure that the numbers aren't too low for POSIX groups. Default is 4000 to ensure that we don't collide with local groups or users primary groups gidNumber" + +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "The start for uidNumbers, this number is added to the user.Pk to make sure that the numbers aren't too low for POSIX users. Default is 2000 to ensure that we don't collide with local users uidNumber" +msgstr "The start for uidNumbers, this number is added to the user.Pk to make sure that the numbers aren't too low for POSIX users. Default is 2000 to ensure that we don't collide with local users uidNumber" + #: src/pages/flows/BoundStagesList.ts msgid "These bindings control if this stage will be applied to the flow." msgstr "These bindings control if this stage will be applied to the flow." @@ -4035,6 +4057,10 @@ msgstr "UI settings" msgid "UID" msgstr "UID" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "UID start number" +msgstr "UID start number" + #: src/flows/stages/identification/IdentificationStage.ts #: src/pages/stages/identification/IdentificationStageForm.ts msgid "UPN" diff --git a/web/src/locales/pseudo-LOCALE.po b/web/src/locales/pseudo-LOCALE.po index f49c3907b..86564a441 100644 --- a/web/src/locales/pseudo-LOCALE.po +++ b/web/src/locales/pseudo-LOCALE.po @@ -479,6 +479,7 @@ msgid "Case insensitive matching" msgstr "" #: src/pages/crypto/CertificateKeyPairForm.ts +#: src/pages/providers/ldap/LDAPProviderForm.ts #: src/pages/providers/proxy/ProxyProviderForm.ts msgid "Certificate" msgstr "" @@ -1661,6 +1662,10 @@ msgstr "" msgid "From address" msgstr "" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "GID start number" +msgstr "" + #: src/pages/admin-overview/AdminOverviewPage.ts msgid "General system status" msgstr "" @@ -2071,6 +2076,7 @@ msgstr "" #: src/pages/property-mappings/PropertyMappingTestForm.ts #: src/pages/providers/ldap/LDAPProviderForm.ts #: src/pages/providers/ldap/LDAPProviderForm.ts +#: src/pages/providers/ldap/LDAPProviderForm.ts #: src/pages/providers/oauth2/OAuth2ProviderForm.ts #: src/pages/providers/oauth2/OAuth2ProviderForm.ts #: src/pages/providers/oauth2/OAuth2ProviderForm.ts @@ -3214,6 +3220,10 @@ msgstr "" msgid "Server URI" msgstr "" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "Server name for which this provider's certificate is valid for." +msgstr "" + #: src/flows/stages/authenticator_webauthn/WebAuthnAuthenticatorRegisterStage.ts msgid "Server validation of credential failed: {err}" msgstr "" @@ -3783,6 +3793,10 @@ msgstr "" msgid "TLS Authentication Certificate" msgstr "" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "TLS Server name" +msgstr "" + #: src/pages/outposts/ServiceConnectionDockerForm.ts msgid "TLS Verification Certificate" msgstr "" @@ -3866,6 +3880,14 @@ msgstr "" msgid "The policy takes a random time to execute. This controls the minimum time it will take." msgstr "" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "The start for gidNumbers, this number is added to a number generated from the group.Pk to make sure that the numbers aren't too low for POSIX groups. Default is 4000 to ensure that we don't collide with local groups or users primary groups gidNumber" +msgstr "" + +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "The start for uidNumbers, this number is added to the user.Pk to make sure that the numbers aren't too low for POSIX users. Default is 2000 to ensure that we don't collide with local users uidNumber" +msgstr "" + #: src/pages/flows/BoundStagesList.ts msgid "These bindings control if this stage will be applied to the flow." msgstr "" @@ -4020,6 +4042,10 @@ msgstr "" msgid "UID" msgstr "" +#: src/pages/providers/ldap/LDAPProviderForm.ts +msgid "UID start number" +msgstr "" + #: src/flows/stages/identification/IdentificationStage.ts #: src/pages/stages/identification/IdentificationStageForm.ts msgid "UPN"