feat: propagate password policy to UI

ory · Feb 26, 2024 · de382c2 · de382c2
1 parent 6a52949
commit de382c2
Show file tree

Hide file tree

Showing 36 changed files with 79 additions and 4 deletions.
diff --git a/internal/client-go/model_ui_node_input_attributes.go b/internal/client-go/model_ui_node_input_attributes.go
diff --git a/internal/httpclient/model_ui_node_input_attributes.go b/internal/httpclient/model_ui_node_input_attributes.go
diff --git a/...egy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=githuber.json b/...egy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=githuber.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...gy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=multiuser.json b/...gy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=multiuser.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...rategy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=oryer.json b/...rategy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=oryer.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...egy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=password.json b/...egy-case=should_adjust_linkable_providers_based_on_linked_credentials-agent=password.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/.../.snapshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=fetch.json b/.../.snapshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=fetch.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...napshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=original.json b/...napshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=original.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...napshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=response.json b/...napshots/TestSettingsStrategy-suite=link-case=should_link_a_connection-flow=response.json
@@ -65,6 +65,8 @@
       "type": "password",
       "required": true,
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "node_type": "input"
     },

diff --git a/...e=link-case=should_link_a_connection_even_if_user_does_not_have_oidc_credentials_yet.json b/...e=link-case=should_link_a_connection_even_if_user_does_not_have_oidc_credentials_yet.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...trategy-suite=link-case=should_not_be_able_to_link_a_connection_which_already_exists.json b/...trategy-suite=link-case=should_not_be_able_to_link_a_connection_which_already_exists.json
@@ -65,6 +65,8 @@
       "type": "password",
       "required": true,
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "node_type": "input"
     },

diff --git a/...ttingsStrategy-suite=link-case=should_not_be_able_to_link_an_non-existing_connection.json b/...ttingsStrategy-suite=link-case=should_not_be_able_to_link_an_non-existing_connection.json
@@ -65,6 +65,8 @@
       "type": "password",
       "required": true,
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "node_type": "input"
     },

diff --git a/...uite=unlink-case=should_not_be_able_to_unlink_a_connection_not_yet_linked-flow=fetch.json b/...uite=unlink-case=should_not_be_able_to_unlink_a_connection_not_yet_linked-flow=fetch.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...suite=unlink-case=should_not_be_able_to_unlink_a_connection_not_yet_linked-flow=json.json b/...suite=unlink-case=should_not_be_able_to_unlink_a_connection_not_yet_linked-flow=json.json
@@ -65,6 +65,8 @@
       "type": "password",
       "required": true,
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "node_type": "input"
     },

diff --git a/...suite=unlink-case=should_not_be_able_to_unlink_an_non-existing_connection-flow=fetch.json b/...suite=unlink-case=should_not_be_able_to_unlink_an_non-existing_connection-flow=fetch.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...-suite=unlink-case=should_not_be_able_to_unlink_an_non-existing_connection-flow=json.json b/...-suite=unlink-case=should_not_be_able_to_unlink_an_non-existing_connection-flow=json.json
@@ -65,6 +65,8 @@
       "type": "password",
       "required": true,
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "node_type": "input"
     },

diff --git a/...te=unlink-case=should_not_be_able_to_unlink_the_last_remaining_connection-flow=fetch.json b/...te=unlink-case=should_not_be_able_to_unlink_the_last_remaining_connection-flow=fetch.json
@@ -60,6 +60,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...ite=unlink-case=should_not_be_able_to_unlink_the_last_remaining_connection-flow=json.json b/...ite=unlink-case=should_not_be_able_to_unlink_the_last_remaining_connection-flow=json.json
@@ -65,6 +65,8 @@
       "type": "password",
       "required": true,
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "node_type": "input"
     },

diff --git a/selfservice/strategy/password/login.go b/selfservice/strategy/password/login.go
@@ -167,7 +167,7 @@ func (s *Strategy) PopulateLoginMethod(r *http.Request, requestedAAL identity.Au
 	}
 
 	sr.UI.SetCSRF(s.d.GenerateCSRFToken(r))
-	sr.UI.SetNode(NewPasswordNode("password", node.InputAttributeAutocompleteCurrentPassword))
+	sr.UI.SetNode(NewPasswordNode("password", node.InputAttributeAutocompleteCurrentPassword, s.d.Config().PasswordPolicyConfig(r.Context())))
 	sr.UI.GetNodes().Append(node.NewInputField("method", "password", node.PasswordGroup, node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoLogin()))
 
 	return nil

diff --git a/selfservice/strategy/password/nodes.go b/selfservice/strategy/password/nodes.go
@@ -4,15 +4,18 @@
 package password
 
 import (
+	"github.com/ory/kratos/driver/config"
 	"github.com/ory/kratos/text"
 	"github.com/ory/kratos/ui/node"
 )
 
-func NewPasswordNode(name string, autocomplete node.UiNodeInputAttributeAutocomplete) *node.Node {
+func NewPasswordNode(name string, autocomplete node.UiNodeInputAttributeAutocomplete, passwordPolicy *config.PasswordPolicy) *node.Node {
 	return node.NewInputField(name, nil, node.PasswordGroup,
 		node.InputAttributeTypePassword,
 		node.WithRequiredInputAttribute,
 		node.WithInputAttributes(func(a *node.InputAttributes) {
+			a.MinLength = passwordPolicy.MinPasswordLength
+			a.MaxLength = passwordPolicy.MaxPasswordLength
 			a.Autocomplete = autocomplete
 		})).
 		WithMetaLabel(text.NewInfoNodeInputPassword())

diff --git a/selfservice/strategy/password/registration.go b/selfservice/strategy/password/registration.go
@@ -188,7 +188,7 @@ func (s *Strategy) PopulateRegistrationMethod(r *http.Request, f *registration.F
 	}
 
 	f.UI.SetCSRF(s.d.GenerateCSRFToken(r))
-	f.UI.Nodes.Upsert(NewPasswordNode("password", node.InputAttributeAutocompleteNewPassword))
+	f.UI.Nodes.Upsert(NewPasswordNode("password", node.InputAttributeAutocompleteNewPassword, s.d.Config().PasswordPolicyConfig(r.Context())))
 	f.UI.Nodes.Append(node.NewInputField("method", "password", node.PasswordGroup, node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoRegistration()))
 
 	return nil

diff --git a/selfservice/strategy/password/settings.go b/selfservice/strategy/password/settings.go
@@ -169,7 +169,7 @@ func (s *Strategy) continueSettingsFlow(
 
 func (s *Strategy) PopulateSettingsMethod(r *http.Request, _ *identity.Identity, f *settings.Flow) error {
 	f.UI.SetCSRF(s.d.GenerateCSRFToken(r))
-	f.UI.Nodes.Upsert(NewPasswordNode("password", node.InputAttributeAutocompleteNewPassword).WithMetaLabel(text.NewInfoNodeInputPassword()))
+	f.UI.Nodes.Upsert(NewPasswordNode("password", node.InputAttributeAutocompleteNewPassword, s.d.Config().PasswordPolicyConfig(r.Context())).WithMetaLabel(text.NewInfoNodeInputPassword()))
 	f.UI.Nodes.Append(node.NewInputField("method", "password", node.PasswordGroup, node.InputAttributeTypeSubmit).WithMetaLabel(text.NewInfoNodeLabelSave()))
 
 	return nil

diff --git a/...file/.snapshots/TestStrategyTraits-description=hydrate_the_proper_fields-type=api#01.json b/...file/.snapshots/TestStrategyTraits-description=hydrate_the_proper_fields-type=api#01.json
@@ -113,6 +113,8 @@
     {
       "attributes": {
         "autocomplete": "new-password",
+        "minlength": 8,
+        "maxlength": 1024,
         "disabled": false,
         "name": "password",
         "node_type": "input",

diff --git a/...profile/.snapshots/TestStrategyTraits-description=hydrate_the_proper_fields-type=api.json b/...profile/.snapshots/TestStrategyTraits-description=hydrate_the_proper_fields-type=api.json
@@ -113,6 +113,8 @@
     {
       "attributes": {
         "autocomplete": "new-password",
+        "minlength": 8,
+        "maxlength": 1024,
         "disabled": false,
         "name": "password",
         "node_type": "input",

diff --git a/...ile/.snapshots/TestStrategyTraits-description=hydrate_the_proper_fields-type=browser.json b/...ile/.snapshots/TestStrategyTraits-description=hydrate_the_proper_fields-type=browser.json
@@ -113,6 +113,8 @@
     {
       "attributes": {
         "autocomplete": "new-password",
+        "minlength": 8,
+        "maxlength": 1024,
         "disabled": false,
         "name": "password",
         "node_type": "input",

diff --git a/...gistration-case=webauthn_button_does_not_exist_when_passwordless_is_disabled-browser.json b/...gistration-case=webauthn_button_does_not_exist_when_passwordless_is_disabled-browser.json
@@ -28,6 +28,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...stRegistration-case=webauthn_button_does_not_exist_when_passwordless_is_disabled-spa.json b/...stRegistration-case=webauthn_button_does_not_exist_when_passwordless_is_disabled-spa.json
@@ -28,6 +28,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...ce/strategy/webauthn/.snapshots/TestRegistration-case=webauthn_button_exists-browser.json b/...ce/strategy/webauthn/.snapshots/TestRegistration-case=webauthn_button_exists-browser.json
@@ -107,6 +107,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/...ervice/strategy/webauthn/.snapshots/TestRegistration-case=webauthn_button_exists-spa.json b/...ervice/strategy/webauthn/.snapshots/TestRegistration-case=webauthn_button_exists-spa.json
@@ -107,6 +107,8 @@
   {
     "attributes": {
       "autocomplete": "new-password",
+      "minlength": 8,
+      "maxlength": 1024,
       "disabled": false,
       "name": "password",
       "node_type": "input",

diff --git a/ui/node/attributes.go b/ui/node/attributes.go
@@ -78,6 +78,12 @@ type InputAttributes struct {
 	// The autocomplete attribute for the input.
 	Autocomplete UiNodeInputAttributeAutocomplete `json:"autocomplete,omitempty"`
 
+	// The minlength attribute for the input.
+	MinLength uint `json:"minlength,omitempty"`
+
+	// The maxlength attribute for the input.
+	MaxLength uint `json:"maxlength,omitempty"`
+
 	// The input's label text.
 	Label *text.Message `json:"label,omitempty"`
 

diff --git a/ui/node/fixtures/sort/expected/1.json b/ui/node/fixtures/sort/expected/1.json
@@ -85,6 +85,8 @@
     "attributes": {
       "name": "password",
       "type": "password",
+      "minlength": 8,
+      "maxlength": 1024,
       "required": true,
       "disabled": false,
       "node_type": "input"

diff --git a/ui/node/fixtures/sort/expected/2.json b/ui/node/fixtures/sort/expected/2.json
@@ -83,6 +83,8 @@
     "attributes": {
       "name": "password",
       "type": "password",
+      "minlength": 8,
+      "maxlength": 1024,
       "required": true,
       "disabled": false,
       "node_type": "input"

diff --git a/ui/node/fixtures/sort/expected/4.json b/ui/node/fixtures/sort/expected/4.json
@@ -63,6 +63,8 @@
     "attributes": {
       "name": "password",
       "type": "password",
+      "minlength": 8,
+      "maxlength": 1024,
       "required": true,
       "disabled": false,
       "node_type": "input"

diff --git a/ui/node/fixtures/sort/input/1.json b/ui/node/fixtures/sort/input/1.json
@@ -84,6 +84,8 @@
     "attributes": {
       "name": "password",
       "type": "password",
+      "minlength": 8,
+      "maxlength": 1024,
       "required": true,
       "disabled": false
     },

diff --git a/ui/node/fixtures/sort/input/2.json b/ui/node/fixtures/sort/input/2.json
@@ -16,6 +16,8 @@
     "attributes": {
       "name": "password",
       "type": "password",
+      "minlength": 8,
+      "maxlength": 1024,
       "required": true,
       "disabled": false
     },

diff --git a/ui/node/fixtures/sort/input/4.json b/ui/node/fixtures/sort/input/4.json
@@ -57,6 +57,8 @@
     "attributes": {
       "disabled": false,
       "name": "password",
+      "minlength": 8,
+      "maxlength": 1024,
       "required": true,
       "type": "password"
     },