Skip to content

Delete password not just login from user when password removed from CR #286

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

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Delete password not just login from user when password removed from CR #286

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: 2 additions & 2 deletions pkg/postgres/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ func createServiceRole(log logr.Logger, db *sql.DB, user, password string) error
}

if password != "" {
err = execf(db, "ALTER ROLE %s LOGIN PASSWORD '%s' NOCREATEROLE VALID UNTIL 'infinity'", user, password)
err = execf(db, "ALTER ROLE %s LOGIN PASSWORD '%s' VALID UNTIL 'infinity'", user, password)
} else {
err = execf(db, "ALTER ROLE %s NOLOGIN NOCREATEROLE", user)
err = execf(db, "ALTER ROLE %s NOLOGIN PASSWORD NULL", user)
}
return err
}
Expand Down
29 changes: 29 additions & 0 deletions pkg/postgres/database_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ func TestDatabase_sunshine(t *testing.T) {
}

assert.True(t, roleCanLogin(t, db, name))
assert.True(t, hasPassword(t, log, postgresqlHost, name))

newDB, err := postgres.Connect(log, postgres.ConnectionString{
Host: postgresqlHost,
Expand Down Expand Up @@ -200,6 +201,7 @@ func TestDatabase_switchFromLoginToNoLoginAndBack(t *testing.T) {
postgresqlHost := test.Integration(t)
log := test.SetLogger(t)
managerRole := "postgres_role_name"

db, err := postgres.Connect(log, postgres.ConnectionString{
Host: postgresqlHost,
Database: "postgres",
Expand Down Expand Up @@ -232,6 +234,7 @@ func TestDatabase_switchFromLoginToNoLoginAndBack(t *testing.T) {
}

assert.True(t, roleCanLogin(t, db, name))
assert.True(t, hasPassword(t, log, postgresqlHost, name))

// Invoke again with same name but no password
err = postgres.Database(log, postgresqlHost, postgres.Credentials{
Expand All @@ -246,6 +249,7 @@ func TestDatabase_switchFromLoginToNoLoginAndBack(t *testing.T) {
t.Fatalf("Second Database failed: %v", err)
}
assert.False(t, roleCanLogin(t, db, name))
assert.False(t, hasPassword(t, log, postgresqlHost, name))

// Invoke again with same name with password
err = postgres.Database(log, postgresqlHost, postgres.Credentials{
Expand All @@ -261,6 +265,7 @@ func TestDatabase_switchFromLoginToNoLoginAndBack(t *testing.T) {
t.Fatalf("Second Database failed: %v", err)
}
assert.True(t, roleCanLogin(t, db, name))
assert.True(t, hasPassword(t, log, postgresqlHost, name))

newDB, err := postgres.Connect(log, postgres.ConnectionString{
Host: postgresqlHost,
Expand Down Expand Up @@ -634,6 +639,30 @@ func TestDatabase_idempotency(t *testing.T) {
}
}

func hasPassword(t *testing.T, log logr.Logger, host, username string) bool {
db, err := postgres.Connect(log, postgres.ConnectionString{
Host: host,
Database: "postgres",
User: "admin",
Password: "admin",
})
if err != nil {
t.Fatalf("connect to database as admin failed: %v", err)
}

row := db.QueryRow("SELECT passwd FROM pg_shadow WHERE usename = $1", username)
if row.Err() != nil {
t.Fatalf("get password failed: %v", row.Err())
}

var password string
err = row.Scan(&password)
if err != nil {
return false
}
return true
}

func roleCanLogin(t *testing.T, db *sql.DB, role string) bool {
t.Helper()
row := db.QueryRow("SELECT rolcanlogin FROM pg_roles WHERE rolname = $1", role)
Expand Down