Skip to content

fix: explicitly use the POSTGRES_USER #13

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.

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
Nov 24, 2024
Merged
Changes from all commits
Commits
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
18 changes: 11 additions & 7 deletions ensure_role_and_database_exists.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,35 @@ static ClientAuthentication_hook_type original_client_auth_hook = NULL;

static void ensure_role_and_database_exists(Port *port, int status) {
char *cmd;
char *postgres_user;
char *role_attributes;

if (original_client_auth_hook) {
original_client_auth_hook(port, status);
}

// don't infinitely recurse
if (strcmp(port->database_name, "postgres") == 0 && strcmp(port->user_name, "postgres") == 0) {
postgres_user = getenv("POSTGRES_USER");

fprintf(stderr, "handling connection for username '%s' to database '%s'\n", port->user_name, port->database_name);

// don't infinitely recurse when connecting as superuser
if (strcmp(port->database_name, postgres_user) == 0 && strcmp(port->user_name, postgres_user) == 0) {
return;
}

role_attributes = getenv("POSTGRES_ROLE_ATTRIBUTES");

fprintf(stderr, "ensuring user_name '%s' exists with attributes '%s'\n", port->user_name, role_attributes);
asprintf(&cmd,
"echo \"SELECT 'CREATE ROLE %s WITH %s' WHERE NOT EXISTS (SELECT FROM pg_roles WHERE rolname = '%s')\\gexec\" | psql",
port->user_name, role_attributes, port->user_name);
"echo \"SELECT 'CREATE ROLE %s WITH %s' WHERE NOT EXISTS (SELECT FROM pg_roles WHERE rolname = '%s')\\gexec\" | psql -U %s -d %s",
port->user_name, role_attributes, port->user_name, postgres_user, postgres_user);
system(cmd);
free(cmd);

fprintf(stderr, "ensuring database '%s' exists\n", port->database_name);

asprintf(&cmd,
"echo \"SELECT 'CREATE DATABASE %s WITH OWNER = %s' WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = '%s')\\gexec\" | psql",
port->database_name, port->user_name, port->database_name);
"echo \"SELECT 'CREATE DATABASE %s WITH OWNER = %s' WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = '%s')\\gexec\" | psql -U %s -d %s",
port->database_name, port->user_name, port->database_name, postgres_user, postgres_user);
system(cmd);
free(cmd);
}
Expand Down