github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 16:16:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Tidy up queries in dbutils.c

Browse Source 
- standardize formatting
- prefix various internal function calls with "pg_catalog.", to
  mitigate possible risks from CVE-2018-1058
This commit is contained in:
Ian Barwick
2018-03-23 10:28:28 +08:00
parent 0e55a60660
commit 462fdca4b4
1 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
dbutils.c
View File

@@ -981,7 +981,7 @@ get_cluster_size(PGconn *conn, char *size)
initPQExpBuffer(&query); initPQExpBuffer(&query);
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
"SELECT pg_catalog.pg_size_pretty(SUM(pg_catalog.pg_database_size(oid))::bigint) " "SELECT pg_catalog.pg_size_pretty(pg_catalog.sum(pg_catalog.pg_database_size(oid))::bigint) "
" FROM pg_catalog.pg_database "); " FROM pg_catalog.pg_database ");
log_verbose(LOG_DEBUG, "get_cluster_size():\n%s", query.data); log_verbose(LOG_DEBUG, "get_cluster_size():\n%s", query.data);
@@ -2646,7 +2646,7 @@ delete_node_record(PGconn *conn, int node)
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
"DELETE FROM repmgr.nodes " "DELETE FROM repmgr.nodes "
" WHERE node_id = %d", " WHERE node_id = %i",
node); node);
log_verbose(LOG_DEBUG, "delete_node_record():\n %s", query.data); log_verbose(LOG_DEBUG, "delete_node_record():\n %s", query.data);
@@ -2716,6 +2716,7 @@ update_node_record_slot_name(PGconn *primary_conn, int node_id, char *slot_name)
return true; return true;
} }
void void
get_node_replication_stats(PGconn *conn, int server_version_num, t_node_info *node_info) get_node_replication_stats(PGconn *conn, int server_version_num, t_node_info *node_info)
{ {
@@ -2725,14 +2726,14 @@ get_node_replication_stats(PGconn *conn, int server_version_num, t_node_info *no
initPQExpBuffer(&query); initPQExpBuffer(&query);
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
" SELECT current_setting('max_wal_senders')::INT AS max_wal_senders, " " SELECT pg_catalog.current_setting('max_wal_senders')::INT AS max_wal_senders, "
" (SELECT COUNT(*) FROM pg_catalog.pg_stat_replication) AS attached_wal_receivers, "); " (SELECT pg_catalog.count(*) FROM pg_catalog.pg_stat_replication) AS attached_wal_receivers, ");
/* no replication slots in PostgreSQL 9.3 */ /* no replication slots in PostgreSQL 9.3 */
if (server_version_num < 90400) if (server_version_num < 90400)
{ {
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
" 0 AS max_replication_slots, " " 0 AS max_replication_slots, "
" 0 AS total_replication_slots, " " 0 AS total_replication_slots, "
" 0 AS active_replication_slots, " " 0 AS active_replication_slots, "
" 0 AS inactive_replication_slots, "); " 0 AS inactive_replication_slots, ");
@@ -2741,16 +2742,16 @@ get_node_replication_stats(PGconn *conn, int server_version_num, t_node_info *no
{ {
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
" current_setting('max_replication_slots')::INT AS max_replication_slots, " " current_setting('max_replication_slots')::INT AS max_replication_slots, "
" (SELECT COUNT(*) FROM pg_catalog.pg_replication_slots) AS total_replication_slots, " " (SELECT pg_catalog.count(*) FROM pg_catalog.pg_replication_slots) AS total_replication_slots, "
" (SELECT COUNT(*) FROM pg_catalog.pg_replication_slots WHERE active IS TRUE) AS active_replication_slots, " " (SELECT pg_catalog.count(*) FROM pg_catalog.pg_replication_slots WHERE active IS TRUE) AS active_replication_slots, "
" (SELECT COUNT(*) FROM pg_catalog.pg_replication_slots WHERE active IS FALSE) AS inactive_replication_slots, "); " (SELECT pg_catalog.count(*) FROM pg_catalog.pg_replication_slots WHERE active IS FALSE) AS inactive_replication_slots, ");
} }
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
" pg_catalog.pg_is_in_recovery() AS in_recovery"); " pg_catalog.pg_is_in_recovery() AS in_recovery");
log_verbose(LOG_DEBUG, "get_node_replication_stats():\n%s", query.data);
res = PQexec(conn, query.data); res = PQexec(conn, query.data);
termPQExpBuffer(&query); termPQExpBuffer(&query);
@@ -2787,7 +2788,7 @@ is_downstream_node_attached(PGconn *conn, char *node_name)
initPQExpBuffer(&query); initPQExpBuffer(&query);
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
" SELECT COUNT(*) FROM pg_catalog.pg_stat_replication " " SELECT pg_catalog.count(*) FROM pg_catalog.pg_stat_replication "
" WHERE application_name = '%s'", " WHERE application_name = '%s'",
node_name); node_name);
res = PQexec(conn, query.data); res = PQexec(conn, query.data);
@@ -2877,21 +2878,21 @@ get_datadir_configuration_files(PGconn *conn, KeyValueList *list)
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
"WITH files AS ( " "WITH files AS ( "
" WITH dd AS ( " " WITH dd AS ( "
" SELECT setting " " SELECT setting "
" FROM pg_catalog.pg_settings " " FROM pg_catalog.pg_settings "
" WHERE name = 'data_directory') " " WHERE name = 'data_directory') "
" SELECT distinct(sourcefile) AS config_file" " SELECT distinct(sourcefile) AS config_file"
" FROM dd, pg_catalog.pg_settings ps " " FROM dd, pg_catalog.pg_settings ps "
" WHERE ps.sourcefile IS NOT NULL " " WHERE ps.sourcefile IS NOT NULL "
" AND ps.sourcefile ~ ('^' || dd.setting) " " AND ps.sourcefile ~ ('^' || dd.setting) "
" UNION " " UNION "
" SELECT ps.setting AS config_file" " SELECT ps.setting AS config_file"
" FROM dd, pg_catalog.pg_settings ps " " FROM dd, pg_catalog.pg_settings ps "
" WHERE ps.name IN ( 'config_file', 'hba_file', 'ident_file') " " WHERE ps.name IN ('config_file', 'hba_file', 'ident_file') "
" AND ps.setting ~ ('^' || dd.setting) " " AND ps.setting ~ ('^' || dd.setting) "
") " ") "
" SELECT config_file, " " SELECT config_file, "
" regexp_replace(config_file, '^.*\\/','') AS filename " " pg_catalog.regexp_replace(config_file, '^.*\\/','') AS filename "
" FROM files " " FROM files "
"ORDER BY config_file"); "ORDER BY config_file");
@@ -2984,7 +2985,7 @@ get_configuration_file_locations(PGconn *conn, t_configfile_list *list)
" WHERE name = 'data_directory' " " WHERE name = 'data_directory' "
" ) " " ) "
" SELECT ps.setting, " " SELECT ps.setting, "
" regexp_replace(setting, '^.*\\/', '') AS filename, " " pg_catalog.regexp_replace(setting, '^.*\\/', '') AS filename, "
" ps.setting ~ ('^' || dd.data_directory) AS in_data_dir " " ps.setting ~ ('^' || dd.data_directory) AS in_data_dir "
" FROM dd, pg_catalog.pg_settings ps " " FROM dd, pg_catalog.pg_settings ps "
" WHERE ps.name IN ('hba_file', 'ident_file') " " WHERE ps.name IN ('hba_file', 'ident_file') "
@@ -3401,7 +3402,7 @@ get_event_records(PGconn *conn, int node_id, const char *node_name, const char *
/* LEFT JOIN used here as a node record may have been removed */ /* LEFT JOIN used here as a node record may have been removed */
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
" SELECT e.node_id, n.node_name, e.event, e.successful, " " SELECT e.node_id, n.node_name, e.event, e.successful, "
" TO_CHAR(e.event_timestamp, 'YYYY-MM-DD HH24:MI:SS') AS timestamp, " " pg_catalog.to_char(e.event_timestamp, 'YYYY-MM-DD HH24:MI:SS') AS timestamp, "
" e.details " " e.details "
" FROM repmgr.events e " " FROM repmgr.events e "
"LEFT JOIN repmgr.nodes n ON e.node_id = n.node_id "); "LEFT JOIN repmgr.nodes n ON e.node_id = n.node_id ");
@@ -3654,7 +3655,7 @@ get_free_replication_slots(PGconn *conn)
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
" SELECT pg_catalog.current_setting('max_replication_slots')::INT - " " SELECT pg_catalog.current_setting('max_replication_slots')::INT - "
" COUNT(*) AS free_slots" " pg_catalog.count(*) AS free_slots"
" FROM pg_catalog.pg_replication_slots"); " FROM pg_catalog.pg_replication_slots");
res = PQexec(conn, query.data); res = PQexec(conn, query.data);
@@ -3955,9 +3956,9 @@ get_number_of_monitoring_records_to_delete(PGconn *primary_conn, int keep_histor
initPQExpBuffer(&query); initPQExpBuffer(&query);
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
"SELECT COUNT(*) " "SELECT pg_catalog.count(*) "
" FROM repmgr.monitoring_history " " FROM repmgr.monitoring_history "
" WHERE age(now(), last_monitor_time) >= '%d days'::interval", " WHERE pg_catalog.age(pg_catalog.now(), last_monitor_time) >= '%d days'::interval",
keep_history); keep_history);
res = PQexec(primary_conn, query.data); res = PQexec(primary_conn, query.data);
@@ -3996,7 +3997,7 @@ delete_monitoring_records(PGconn *primary_conn, int keep_history)
{ {
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
"DELETE FROM repmgr.monitoring_history " "DELETE FROM repmgr.monitoring_history "
" WHERE age(now(), last_monitor_time) >= '%d days'::interval ", " WHERE pg_catalog.age(pg_catalog.now(), last_monitor_time) >= '%d days'::interval ",
keep_history); keep_history);
} }
else else
@@ -4294,7 +4295,7 @@ _is_bdr_db(PGconn *conn, PQExpBufferData *output, bool quiet)
initPQExpBuffer(&query); initPQExpBuffer(&query);
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
"SELECT COUNT(*) FROM pg_catalog.pg_extension WHERE extname='bdr'"); "SELECT pg_catalog.count(*) FROM pg_catalog.pg_extension WHERE extname='bdr'");
res = PQexec(conn, query.data); res = PQexec(conn, query.data);
termPQExpBuffer(&query); termPQExpBuffer(&query);
@@ -4407,7 +4408,7 @@ is_bdr_repmgr(PGconn *conn)
initPQExpBuffer(&query); initPQExpBuffer(&query);
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
"SELECT COUNT(*)" "SELECT pg_catalog.count(*)"
" FROM repmgr.nodes n" " FROM repmgr.nodes n"
" WHERE n.type != 'bdr' "); " WHERE n.type != 'bdr' ");
@@ -4438,8 +4439,8 @@ is_table_in_bdr_replication_set(PGconn *conn, const char *tablename, const char
initPQExpBuffer(&query); initPQExpBuffer(&query);
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
"SELECT COUNT(*) " "SELECT pg_catalog.count(*) "
" FROM UNNEST(bdr.table_get_replication_sets('repmgr.%s')) AS repset " " FROM pg_catalog.unnest(bdr.table_get_replication_sets('repmgr.%s')) AS repset "
" WHERE repset='%s' ", " WHERE repset='%s' ",
tablename, tablename,
set); set);
@@ -4817,8 +4818,8 @@ bdr_node_has_repmgr_set(PGconn *conn, const char *node_name)
initPQExpBuffer(&query); initPQExpBuffer(&query);
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
" SELECT COUNT(*) " " SELECT pg_catalog.count(*) "
" FROM UNNEST(bdr.connection_get_replication_sets('%s') AS repset " " FROM pg_catalog.unnest(bdr.connection_get_replication_sets('%s') AS repset "
" WHERE repset = 'repmgr'", " WHERE repset = 'repmgr'",
node_name); node_name);
@@ -4853,7 +4854,7 @@ bdr_node_set_repmgr_set(PGconn *conn, const char *node_name)
" SELECT bdr.connection_set_replication_sets( " " SELECT bdr.connection_set_replication_sets( "
" ARRAY( " " ARRAY( "
" SELECT repset::TEXT " " SELECT repset::TEXT "
" FROM UNNEST(bdr.connection_get_replication_sets('%s')) AS repset " " FROM pg_catalog.unnest(bdr.connection_get_replication_sets('%s')) AS repset "
" UNION " " UNION "
" SELECT 'repmgr'::TEXT " " SELECT 'repmgr'::TEXT "
" ), " " ), "