Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8SPSMDB-1164: Prevent $external DB user from dealing with passwords #1770

Merged
merged 1 commit into from
Jan 2, 2025
Merged

K8SPSMDB-1164: Prevent $external DB user from dealing with passwords #1770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/apis/psmdb/v1/psmdb_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ func (u *User) UserID() string {
return u.DB + "." + u.Name
}

func (u *User) IsExternalDB() bool {
return u.DB == "$external"
}

type RoleAuthenticationRestriction struct {
ClientSource []string `json:"clientSource,omitempty"`
ServerAddress []string `json:"serverAddress,omitempty"`
Expand Down
35 changes: 21 additions & 14 deletions pkg/controller/perconaservermongodb/custom_users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,32 +105,28 @@ func handleUsers(ctx context.Context, cr *api.PerconaServerMongoDB, mongoCli mon
continue
}

if user.DB == "$external" && userInfo == nil {
if user.IsExternalDB() && userInfo == nil {
err = createExternalUser(ctx, mongoCli, &user)
if err != nil {
return errors.Wrapf(err, "create user %s", user.Name)
}
continue
}

defaultUserSecretName := fmt.Sprintf("%s-custom-user-secret", cr.Name)

userSecretName := defaultUserSecretName
userSecretPassKey := user.Name
if user.PasswordSecretRef != nil {
userSecretName = user.PasswordSecretRef.Name
userSecretPassKey = user.PasswordSecretRef.Key
}

sec, err := getCustomUserSecret(ctx, client, cr, userSecretName, defaultUserSecretName, userSecretPassKey)
sec, err := getCustomUserSecret(ctx, client, cr, &user, userSecretPassKey)
if err != nil {
log.Error(err, "failed to get user secret", "user", user)
continue
}

annotationKey := fmt.Sprintf("percona.com/%s-%s-hash", cr.Name, user.Name)

if userInfo == nil {
if userInfo == nil && !user.IsExternalDB() {
err = createUser(ctx, client, mongoCli, &user, sec, annotationKey, userSecretPassKey)
if err != nil {
return errors.Wrapf(err, "create user %s", user.Name)
Expand Down Expand Up @@ -293,7 +289,7 @@ func updatePass(
annotationKey, passKey string) error {
log := logf.FromContext(ctx)

if userInfo == nil {
if userInfo == nil || user.IsExternalDB() {
return nil
}

Expand Down Expand Up @@ -417,24 +413,35 @@ func createUser(

// getCustomUserSecret gets secret by name defined by `user.PasswordSecretRef.Name` or returns a secret
// with newly generated password if name matches defaultName
func getCustomUserSecret(ctx context.Context, cl client.Client, cr *api.PerconaServerMongoDB, name, defaultName, passKey string) (*corev1.Secret, error) {
func getCustomUserSecret(ctx context.Context, cl client.Client, cr *api.PerconaServerMongoDB, user *api.User, passKey string) (*corev1.Secret, error) {
log := logf.FromContext(ctx)

if user.IsExternalDB() {
return nil, nil
}

defaultSecretName := fmt.Sprintf("%s-custom-user-secret", cr.Name)

secretName := defaultSecretName
if user.PasswordSecretRef != nil {
secretName = user.PasswordSecretRef.Name
}

secret := &corev1.Secret{}
err := cl.Get(ctx, types.NamespacedName{Name: name, Namespace: cr.Namespace}, secret)
err := cl.Get(ctx, types.NamespacedName{Name: secretName, Namespace: cr.Namespace}, secret)

if err != nil && name != defaultName {
if err != nil && secretName != defaultSecretName {
return nil, errors.Wrap(err, "failed to get user secret")
}

if err != nil && !k8serrors.IsNotFound(err) && name == defaultName {
if err != nil && !k8serrors.IsNotFound(err) && secretName == defaultSecretName {
return nil, errors.Wrap(err, "failed to get user secret")
}

if err != nil && k8serrors.IsNotFound(err) {
secret = &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Name: secretName,
Namespace: cr.Namespace,
},
}
Expand All @@ -458,7 +465,7 @@ func getCustomUserSecret(ctx context.Context, cl client.Client, cr *api.PerconaS
}

_, hasPass := secret.Data[passKey]
if !hasPass && name == defaultName {
if !hasPass && secretName == defaultSecretName {
pass, err := s.GeneratePassword()
if err != nil {
return nil, errors.Wrap(err, "generate custom user password")
Expand Down
Loading