rework disabling the password policy

cs3org · Jan 8, 2024 · 6769510 · 6769510
1 parent 46b7156
commit 6769510
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/changelog/unreleased/disabled-password-policy-rework.md b/changelog/unreleased/disabled-password-policy-rework.md
@@ -0,0 +1,6 @@
+Enhancement: Disable the password policy
+
+We reworked and moved disabling the password policy logic to the ocis. 
+
+https://github.com/cs3org/reva/pull/4453
+https://github.com/owncloud/ocis/issues/7916
diff --git a/internal/grpc/services/publicshareprovider/publicshareprovider.go b/internal/grpc/services/publicshareprovider/publicshareprovider.go
@@ -68,7 +68,6 @@ type config struct {
 }
 
 type passwordPolicy struct {
-	Disabled               bool                `mapstructure:"disabled"`
 	MinCharacters          int                 `mapstructure:"min_characters"`
 	MinLowerCaseCharacters int                 `mapstructure:"min_lowercase_characters"`
 	MinUpperCaseCharacters int                 `mapstructure:"min_uppercase_characters"`
@@ -174,10 +173,9 @@ func New(m map[string]interface{}, ss *grpc.Server) (rgrpc.Service, error) {
 
 func newPasswordPolicy(c *passwordPolicy) password.Validator {
 	if c == nil {
-		return password.NewPasswordPolicy(true, 0, 0, 0, 0, 0, nil)
+		return password.NewPasswordPolicy(0, 0, 0, 0, 0, nil)
 	}
 	return password.NewPasswordPolicy(
-		c.Disabled,
 		c.MinCharacters,
 		c.MinLowerCaseCharacters,
 		c.MinUpperCaseCharacters,

diff --git a/internal/http/services/owncloud/ocs/data/capabilities.go b/internal/http/services/owncloud/ocs/data/capabilities.go
@@ -117,7 +117,6 @@ type CapabilitiesGraph struct {
 
 // CapabilitiesPasswordPolicy hold the password policy capabilities
 type CapabilitiesPasswordPolicy struct {
-	Disabled               bool                `json:"disabled" xml:"disabled" mapstructure:"disabled"`
 	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_lowercase_characters" xml:"min_lowercase_characters" mapstructure:"min_lowercase_characters"`

diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go
@@ -1734,10 +1734,9 @@ func publicPwdEnforced(c *config.Config) passwordEnforced {
 
 func passwordPolicies(c *config.Config) password.Validator {
 	if c.Capabilities.Capabilities == nil || c.Capabilities.Capabilities.PasswordPolicy == nil {
-		return password.NewPasswordPolicy(true, 0, 0, 0, 0, 0, nil)
+		return password.NewPasswordPolicy(0, 0, 0, 0, 0, nil)
 	}
 	return password.NewPasswordPolicy(
-		c.Capabilities.Capabilities.PasswordPolicy.Disabled,
 		c.Capabilities.Capabilities.PasswordPolicy.MinCharacters,
 		c.Capabilities.Capabilities.PasswordPolicy.MinLowerCaseCharacters,
 		c.Capabilities.Capabilities.PasswordPolicy.MinUpperCaseCharacters,

diff --git a/pkg/password/password_policies.go b/pkg/password/password_policies.go
@@ -18,7 +18,6 @@ type Validator interface {
 
 // Policies represents a password validation rules
 type Policies struct {
-	disabled                bool
 	minCharacters           int
 	minLowerCaseCharacters  int
 	minUpperCaseCharacters  int
@@ -30,9 +29,8 @@ type Policies struct {
 }
 
 // NewPasswordPolicy returns a new NewPasswordPolicy instance
-func NewPasswordPolicy(disabled bool, minCharacters, minLowerCaseCharacters, minUpperCaseCharacters, minDigits, minSpecialCharacters int, bannedPasswordsList map[string]struct{}) Validator {
+func NewPasswordPolicy(minCharacters, minLowerCaseCharacters, minUpperCaseCharacters, minDigits, minSpecialCharacters int, bannedPasswordsList map[string]struct{}) Validator {
 	p := &Policies{
-		disabled:               disabled,
 		minCharacters:          minCharacters,
 		minLowerCaseCharacters: minLowerCaseCharacters,
 		minUpperCaseCharacters: minUpperCaseCharacters,
@@ -48,9 +46,6 @@ func NewPasswordPolicy(disabled bool, minCharacters, minLowerCaseCharacters, min
 
 // Validate implements a password validation regarding the policy
 func (s Policies) Validate(str string) error {
-	if s.disabled {
-		return nil
-	}
 	var allErr error
 	if !utf8.ValidString(str) {
 		return fmt.Errorf("the password contains invalid characters")

diff --git a/pkg/password/password_policies_test.go b/pkg/password/password_policies_test.go
@@ -75,7 +75,6 @@ func TestPolicies_Validate(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			s := NewPasswordPolicy(
-				false,
 				tt.fields.minCharacters,
 				tt.fields.minLowerCaseCharacters,
 				tt.fields.minUpperCaseCharacters,
@@ -144,7 +143,6 @@ func TestPasswordPolicies_Count(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			i := NewPasswordPolicy(
-				false,
 				tt.fields.wantCharacters,
 				tt.fields.wantLowerCaseCharacters,
 				tt.fields.wantUpperCaseCharacters,