Skip to content

[DPE-7511] Fix the auth username pattern #941

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 2 commits into from
Jun 8, 2025
Merged

[DPE-7511] Fix the auth username pattern #941

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfd2377
Fix auth username pattern
marceloneppel Jun 6, 2025
4f6bfac
Fix another ocurrence of the pattern
marceloneppel Jun 6, 2025
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
6 changes: 3 additions & 3 deletions lib/charms/postgresql_k8s/v0/postgresql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 54
LIBPATCH = 55

# Groups to distinguish HBA access
ACCESS_GROUP_IDENTITY = "identity_access"
Expand Down Expand Up @@ -751,7 +751,7 @@ def list_users_from_relation(self, current_host=False) -> Set[str]:
"SELECT usename "
"FROM pg_catalog.pg_user "
"WHERE usename LIKE 'relation_id_%' OR usename LIKE 'relation-%' "
"OR usename LIKE 'pgbouncer_auth_relation_id_%' OR usename LIKE '%_user_%_%';"
"OR usename LIKE 'pgbouncer_auth_relation_%' OR usename LIKE '%_user_%_%';"
)
usernames = cursor.fetchall()
return {username[0] for username in usernames}
Expand Down Expand Up @@ -830,7 +830,7 @@ def set_up_database(self) -> None:
END IF;
END LOOP;
-- Remove users that don't exist anymore from the pg_hba file.
FOR rec IN SELECT h.lines FROM pg_hba AS h LEFT JOIN relation_users AS r ON SPLIT_PART(h.lines, ' ', 3) = r.user WHERE r.user IS NULL AND (SPLIT_PART(h.lines, ' ', 3) LIKE 'relation_id_%' OR SPLIT_PART(h.lines, ' ', 3) LIKE 'pgbouncer_auth_relation_id_%' OR SPLIT_PART(h.lines, ' ', 3) LIKE '%_user_%_%')
FOR rec IN SELECT h.lines FROM pg_hba AS h LEFT JOIN relation_users AS r ON SPLIT_PART(h.lines, ' ', 3) = r.user WHERE r.user IS NULL AND (SPLIT_PART(h.lines, ' ', 3) LIKE 'relation_id_%' OR SPLIT_PART(h.lines, ' ', 3) LIKE 'pgbouncer_auth_relation_%' OR SPLIT_PART(h.lines, ' ', 3) LIKE '%_user_%_%')
LOOP
DELETE FROM pg_hba WHERE lines = rec.lines;
changes := changes + 1;
Expand Down