diff --git a/changelog/unreleased/passwod-policies-renaming.md b/changelog/unreleased/passwod-policies-renaming.md new file mode 100644 index 000000000..a82ee8af9 --- /dev/null +++ b/changelog/unreleased/passwod-policies-renaming.md @@ -0,0 +1,5 @@ +Enhancement: The password policies change request + +The variables renaming OCIS-3767 + +https://github.com/cs3org/reva/pull/7264 diff --git a/go.mod b/go.mod index eb7dfc7d5..7994cb5cc 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/coreos/go-oidc/v3 v3.6.0 github.com/cs3org/go-cs3apis v0.0.0-20230516150832-730ac860c71d - github.com/cs3org/reva/v2 v2.16.1-0.20230908122008-491b5c5bf72a + github.com/cs3org/reva/v2 v2.16.1-0.20230911153145-a2e2320f3448 github.com/disintegration/imaging v1.6.2 github.com/dutchcoders/go-clamd v0.0.0-20170520113014-b970184f4d9e github.com/egirna/icap-client v0.1.1 diff --git a/go.sum b/go.sum index dc4fc443a..6d5fa32f1 100644 --- a/go.sum +++ b/go.sum @@ -1015,8 +1015,8 @@ github.com/crewjam/httperr v0.2.0 h1:b2BfXR8U3AlIHwNeFFvZ+BV1LFvKLlzMjzaTnZMybNo github.com/crewjam/httperr v0.2.0/go.mod h1:Jlz+Sg/XqBQhyMjdDiC+GNNRzZTD7x39Gu3pglZ5oH4= github.com/crewjam/saml v0.4.13 h1:TYHggH/hwP7eArqiXSJUvtOPNzQDyQ7vwmwEqlFWhMc= github.com/crewjam/saml v0.4.13/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA= -github.com/cs3org/reva/v2 v2.16.1-0.20230908122008-491b5c5bf72a h1:E7XghgSsNsR57wd0z/emKRfwDmoT2q/vuIYGNtx9IkA= -github.com/cs3org/reva/v2 v2.16.1-0.20230908122008-491b5c5bf72a/go.mod h1:RvhuweTFqzezjUFU0SIdTXakrEx9vJlMvQ7znPXSP1g= +github.com/cs3org/reva/v2 v2.16.1-0.20230911153145-a2e2320f3448 h1:cQt0iMKURVZ6d0DhiNh9eqJ0WTQfPwDn29VArnJpwYg= +github.com/cs3org/reva/v2 v2.16.1-0.20230911153145-a2e2320f3448/go.mod h1:RvhuweTFqzezjUFU0SIdTXakrEx9vJlMvQ7znPXSP1g= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/services/frontend/README.md b/services/frontend/README.md index ed087d6de..b276b7bbf 100644 --- a/services/frontend/README.md +++ b/services/frontend/README.md @@ -76,9 +76,9 @@ Note that a password can have a maximum length of **72 bytes**. Depending on the - `FRONTEND_PASSWORD_POLICIES_MIN_CHARACTERS` Define the minimum password length. -- `FRONTEND_PASSWORD_POLICIES_MIN_LOWER_CASE_CHARACTERS` +- `FRONTEND_PASSWORD_POLICIES_MIN_LOWERCASE_CHARACTERS` Define the minimum number of uppercase letters. -- `FRONTEND_PASSWORD_POLICIES_MIN_UPPER_CASE_CHARACTERS` +- `FRONTEND_PASSWORD_POLICIES_MIN_UPPERCASE_CHARACTERS` Define the minimum number of lowercase letters. - `FRONTEND_PASSWORD_POLICIES_MIN_DIGITS` Define the minimum number of digits. diff --git a/services/frontend/pkg/config/config.go b/services/frontend/pkg/config/config.go index 2e9d87afc..ff716ec87 100644 --- a/services/frontend/pkg/config/config.go +++ b/services/frontend/pkg/config/config.go @@ -177,8 +177,8 @@ type ServiceAccount struct { // PasswordPolicies configures reva password policies type PasswordPolicies struct { MinCharacters int `yaml:"min_characters,omitempty" env:"FRONTEND_PASSWORD_POLICIES_MIN_CHARACTERS" desc:"Define the minimum password length. Defaults to 0 if not set."` - MinLowerCaseCharacters int `yaml:"min_lower_case_characters" env:"FRONTEND_PASSWORD_POLICIES_MIN_LOWER_CASE_CHARACTERS" desc:"Define the minimum number of uppercase letters. Defaults to 0 if not set."` - MinUpperCaseCharacters int `yaml:"min_upper_case_characters" env:"FRONTEND_PASSWORD_POLICIES_MIN_UPPER_CASE_CHARACTERS" desc:"Define the minimum number of lowercase letters. Defaults to 0 if not set."` + MinLowerCaseCharacters int `yaml:"min_lowercase_characters" env:"FRONTEND_PASSWORD_POLICIES_MIN_LOWERCASE_CHARACTERS" desc:"Define the minimum number of uppercase letters. Defaults to 0 if not set."` + MinUpperCaseCharacters int `yaml:"min_uppercase_characters" env:"FRONTEND_PASSWORD_POLICIES_MIN_UPPERCASE_CHARACTERS" desc:"Define the minimum number of lowercase letters. Defaults to 0 if not set."` MinDigits int `yaml:"min_digits" env:"FRONTEND_PASSWORD_POLICIES_MIN_DIGITS" desc:"Define the minimum number of digits. Defaults to 0 if not set."` MinSpecialCharacters int `yaml:"min_special_characters" env:"FRONTEND_PASSWORD_POLICIES_MIN_SPECIAL_CHARACTERS" desc:"Define the minimum number of characters from the special characters list to be present. Defaults to 0 if not set."` } diff --git a/services/frontend/pkg/revaconfig/config.go b/services/frontend/pkg/revaconfig/config.go index e800c5a43..619ac29c5 100644 --- a/services/frontend/pkg/revaconfig/config.go +++ b/services/frontend/pkg/revaconfig/config.go @@ -275,12 +275,12 @@ func FrontendConfigFromStruct(cfg *config.Config) (map[string]interface{}, error "max_quota": cfg.MaxQuota, }, "password_policies": map[string]interface{}{ - "max_characters": 72, - "min_characters": cfg.PasswordPolicies.MinCharacters, - "min_lower_case_characters": cfg.PasswordPolicies.MinLowerCaseCharacters, - "min_upper_case_characters": cfg.PasswordPolicies.MinUpperCaseCharacters, - "min_digits": cfg.PasswordPolicies.MinDigits, - "min_special_characters": cfg.PasswordPolicies.MinSpecialCharacters, + "max_characters": 72, + "min_characters": cfg.PasswordPolicies.MinCharacters, + "min_lowercase_characters": cfg.PasswordPolicies.MinLowerCaseCharacters, + "min_uppercase_characters": cfg.PasswordPolicies.MinUpperCaseCharacters, + "min_digits": cfg.PasswordPolicies.MinDigits, + "min_special_characters": cfg.PasswordPolicies.MinSpecialCharacters, }, "notifications": map[string]interface{}{ "endpoints": []string{"list", "get", "delete"}, diff --git a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data/capabilities.go b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data/capabilities.go index 118e8b5db..a53ac679b 100644 --- a/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data/capabilities.go +++ b/vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data/capabilities.go @@ -90,8 +90,8 @@ type CapabilitiesGraph struct { type CapabilitiesPasswordPolicies struct { MinCharacters int `json:"min_characters" xml:"min_characters" mapstructure:"min_characters"` MaxCharacters int `json:"max_characters" xml:"max_characters" mapstructure:"max_characters"` - MinLowerCaseCharacters int `json:"min_lower_case_characters" xml:"min_lower_case_characters" mapstructure:"min_lower_case_characters"` - MinUpperCaseCharacters int `json:"min_upper_case_characters" xml:"min_upper_case_characters" mapstructure:"min_upper_case_characters"` + MinLowerCaseCharacters int `json:"min_lowercase_characters" xml:"min_lowercase_characters" mapstructure:"min_lowercase_characters"` + MinUpperCaseCharacters int `json:"min_uppercase_characters" xml:"min_uppercase_characters" mapstructure:"min_uppercase_characters"` MinDigits int `json:"min_digits" xml:"min_digits" mapstructure:"min_digits"` MinSpecialCharacters int `json:"min_special_characters" xml:"min_special_characters" mapstructure:"min_special_characters"` SpecialCharacters string `json:"special_characters" xml:"special_characters" mapstructure:"special_characters"` diff --git a/vendor/modules.txt b/vendor/modules.txt index d92e2eb8c..26bae98c0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -359,7 +359,7 @@ github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1 github.com/cs3org/go-cs3apis/cs3/storage/registry/v1beta1 github.com/cs3org/go-cs3apis/cs3/tx/v1beta1 github.com/cs3org/go-cs3apis/cs3/types/v1beta1 -# github.com/cs3org/reva/v2 v2.16.1-0.20230908122008-491b5c5bf72a +# github.com/cs3org/reva/v2 v2.16.1-0.20230911153145-a2e2320f3448 ## explicit; go 1.20 github.com/cs3org/reva/v2/cmd/revad/internal/grace github.com/cs3org/reva/v2/cmd/revad/runtime