habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stages/authenticator_validate: use friendly_name for stage selector when enrolling (cherry-pick #8255) (#8256)

Browse Source 
stages/authenticator_validate: use friendly_name for stage selector when enrolling (#8255)

* stages/authenticator_validate: use friendly_name for stage selector when enrolling



* fix tests



---------

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Co-authored-by: Jens L <jens@goauthentik.io>
This commit is contained in:
gcp-cherry-pick-bot[bot]
2024-01-22 16:27:46 +01:00
committed by GitHub
parent 0fa8432b72
commit bc83176962
7 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
authentik/stages/authenticator_static/migrations/0009_throttling.py
View File

@ -38,4 +38,11 @@ class Migration(migrations.Migration):
name="statictoken",
options={"verbose_name": "Static Token", "verbose_name_plural": "Static Tokens"},
),
migrations.AlterModelOptions(
name="authenticatorstaticstage",
options={
"verbose_name": "Static Authenticator Setup Stage",
"verbose_name_plural": "Static Authenticator Setup Stages",
},
),
]

6
authentik/stages/authenticator_static/models.py
View File

@ -46,11 +46,11 @@ class AuthenticatorStaticStage(ConfigurableStage, FriendlyNamedStage, Stage):
)
def __str__(self) -> str:
return f"Static Authenticator Stage {self.name}"
return f"Static Authenticator Setup Stage {self.name}"
class Meta:
verbose_name = _("Static Authenticator Stage")
verbose_name_plural = _("Static Authenticator Stages")
verbose_name = _("Static Authenticator Setup Stage")
verbose_name_plural = _("Static Authenticator Setup Stages")
class StaticDevice(SerializerModel, ThrottlingMixin, Device):

6
authentik/stages/authenticator_validate/stage.py
View File

@ -300,8 +300,10 @@ class AuthenticatorValidateStageView(ChallengeStageView):
serializer = SelectableStageSerializer(
data={
"pk": stage.pk,
"name": stage.name,
"verbose_name": str(stage._meta.verbose_name),
"name": stage.friendly_name or stage.name,
"verbose_name": str(stage._meta.verbose_name)
.replace("Setup Stage", "")
.strip(),
"meta_model_name": f"{stage._meta.app_label}.{stage._meta.model_name}",
}
)

34
authentik/stages/authenticator_validate/tests/test_stage.py
View File

@ -11,6 +11,7 @@ from authentik.flows.tests import FlowTestCase
from authentik.flows.views.executor import SESSION_KEY_PLAN
from authentik.lib.generators import generate_id, generate_key
from authentik.stages.authenticator_duo.models import AuthenticatorDuoStage, DuoDevice
from authentik.stages.authenticator_static.models import AuthenticatorStaticStage
from authentik.stages.authenticator_validate.api import AuthenticatorValidateStageSerializer
from authentik.stages.authenticator_validate.models import AuthenticatorValidateStage, DeviceClasses
from authentik.stages.authenticator_validate.stage import PLAN_CONTEXT_DEVICE_CHALLENGES
@ -26,19 +27,22 @@ class AuthenticatorValidateStageTests(FlowTestCase):
def test_not_configured_action(self):
"""Test not_configured_action"""
conf_stage = IdentificationStage.objects.create(
ident_stage = IdentificationStage.objects.create(
name=generate_id(),
user_fields=[
UserFields.USERNAME,
],
)
conf_stage = AuthenticatorStaticStage.objects.create(
name=generate_id(),
)
stage = AuthenticatorValidateStage.objects.create(
name=generate_id(),
not_configured_action=NotConfiguredAction.CONFIGURE,
)
stage.configuration_stages.set([conf_stage])
flow = create_test_flow()
FlowStageBinding.objects.create(target=flow, stage=conf_stage, order=0)
FlowStageBinding.objects.create(target=flow, stage=ident_stage, order=0)
FlowStageBinding.objects.create(target=flow, stage=stage, order=1)
response = self.client.get(
@ -57,27 +61,22 @@ class AuthenticatorValidateStageTests(FlowTestCase):
self.assertStageResponse(
response,
flow,
component="ak-stage-identification",
password_fields=False,
primary_action="Continue",
user_fields=["username"],
sources=[],
show_source_labels=False,
component="ak-stage-authenticator-static",
)
def test_not_configured_action_multiple(self):
"""Test not_configured_action"""
conf_stage = IdentificationStage.objects.create(
ident_stage = IdentificationStage.objects.create(
name=generate_id(),
user_fields=[
UserFields.USERNAME,
],
)
conf_stage2 = IdentificationStage.objects.create(
conf_stage = AuthenticatorStaticStage.objects.create(
name=generate_id(),
)
conf_stage2 = AuthenticatorStaticStage.objects.create(
name=generate_id(),
user_fields=[
UserFields.USERNAME,
],
)
stage = AuthenticatorValidateStage.objects.create(
name=generate_id(),
@ -85,7 +84,7 @@ class AuthenticatorValidateStageTests(FlowTestCase):
)
stage.configuration_stages.set([conf_stage, conf_stage2])
flow = create_test_flow()
FlowStageBinding.objects.create(target=flow, stage=conf_stage, order=0)
FlowStageBinding.objects.create(target=flow, stage=ident_stage, order=0)
FlowStageBinding.objects.create(target=flow, stage=stage, order=1)
# Get initial identification stage
@ -118,12 +117,7 @@ class AuthenticatorValidateStageTests(FlowTestCase):
self.assertStageResponse(
response,
flow,
component="ak-stage-identification",
password_fields=False,
primary_action="Continue",
user_fields=["username"],
sources=[],
show_source_labels=False,
component="ak-stage-authenticator-static",
)
def test_stage_validation(self):

1
blueprints/default/flow-default-authenticator-static-setup.yaml
View File

@ -14,6 +14,7 @@ entries:
- attrs:
configure_flow: !KeyOf flow
token_count: 6
friendly_name: Static tokens
identifiers:
name: default-authenticator-static-setup
id: default-authenticator-static-setup

1
blueprints/default/flow-default-authenticator-totp-setup.yaml
View File

@ -14,6 +14,7 @@ entries:
- attrs:
configure_flow: !KeyOf flow
digits: 6
friendly_name: TOTP Device
identifiers:
name: default-authenticator-totp-setup
id: default-authenticator-totp-setup

1
blueprints/default/flow-default-authenticator-webauthn-setup.yaml
View File

@ -13,6 +13,7 @@ entries:
id: flow
- attrs:
configure_flow: !KeyOf flow
friendly_name: WebAuthn device
identifiers:
name: default-authenticator-webauthn-setup
id: default-authenticator-webauthn-setup