add a dump of hba_file and ident_file

orgrim · orgrim · commit 34cb671d0b73 · 2021-10-28T09:39:32.000+02:00
diff --git a/main.go b/main.go
@@ -191,6 +191,13 @@ func main() {
 		}
 	}
 
+	if err := dumpConfigFiles(opts.Directory, opts.TimeFormat, db); err != nil {
+		db.Close()
+		l.Fatalln("could not dump configuration files:", err)
+		postBackupHook(opts.PostHook)
+		os.Exit(1)
+	}
+
 	databases, err := listDatabases(db, opts.WithTemplates, opts.ExcludeDbs, opts.Dbnames)
 	if err != nil {
 		l.Fatalln(err)
@@ -334,7 +341,7 @@ func main() {
 		}
 	}
 
-	for _, other := range []string{"pg_globals", "pg_settings"} {
+	for _, other := range []string{"pg_globals", "pg_settings", "hba_file", "ident_file"} {
 		limit := now.Add(defDbOpts.PurgeInterval)
 		if err := purgeDumps(opts.Directory, other, defDbOpts.PurgeKeep, limit); err != nil {
 			exitCode = 1
@@ -607,3 +614,27 @@ func dumpSettings(dir string, timeFormat string, db *pg) error {
 
 	return nil
 }
+
+func dumpConfigFiles(dir string, timeFormat string, db *pg) error {
+	for _, param := range []string{"hba_file", "ident_file"} {
+		file := formatDumpPath(dir, timeFormat, "out", param, time.Now())
+
+		if err := os.MkdirAll(filepath.Dir(file), 0755); err != nil {
+			return err
+		}
+
+		s, err := extractFileFromSettings(db, param)
+		if err != nil {
+			return err
+		}
+
+		// Use a Buffer to avoid creating an empty file
+		if len(s) > 0 {
+			l.Verbosef("writing contents of '%s' to: %s", param, file)
+			if err := ioutil.WriteFile(file, []byte(s), 0644); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
diff --git a/sql.go b/sql.go
@@ -506,6 +506,41 @@ func showSettings(db *pg) (string, error) {
 	}
 }
 
+func extractFileFromSettings(db *pg, name string) (string, error) {
+	query := "SELECT setting, pg_read_file(setting, 0, (pg_stat_file(setting)).size) FROM pg_settings WHERE name = $1"
+
+	l.Verboseln("executing SQL query:", query)
+	rows, err := db.conn.Query(query, name)
+	if err != nil {
+		return "", fmt.Errorf("could not query file contents from settings: %s", err)
+	}
+	defer rows.Close()
+
+	var result string
+
+	for rows.Next() {
+		var (
+			path     string
+			contents string
+		)
+
+		err := rows.Scan(&path, &contents)
+		if err != nil {
+			l.Errorln(err)
+			continue
+		}
+
+		result = fmt.Sprintf("# path: %s\n%s\n", path, contents)
+	}
+
+	err = rows.Err()
+	if err != nil {
+		return "", fmt.Errorf("could not retrive rows: %s", err)
+	}
+
+	return result, nil
+}
+
 type pgReplicaHasLocks struct{}
 
 func (*pgReplicaHasLocks) Error() string {
diff --git a/sql_test.go b/sql_test.go
@@ -292,5 +292,24 @@ func TestDumpCreateDBAndACL(t *testing.T) {
 	}
 }
 
+func TestExtractFileFromSettings(t *testing.T) {
+	needPgConn(t)
+
+	got, err := extractFileFromSettings(testdb, "hba_file")
+	if err != nil {
+		t.Errorf("expected non nil error, got %q", err)
+	}
+
+	if got == "" {
+		t.Errorf("expected some data, got nothing")
+	} else {
+		c := strings.Split(got, "\n")
+		re := regexp.MustCompile(`^# path: \S+`)
+		if !re.MatchString(c[0]) {
+			t.Errorf("excepted string matching \"^# path: \\S+\", got %s", c[0])
+		}
+	}
+}
+
 // Testing replication management fonctions needs a more complex setup
 // so we skip it.
