From 1137c70508b8f44a785e0fad51651b0e8347469d Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Fri, 23 Feb 2024 07:29:22 -0500
Subject: [PATCH] Use consistent file perms post Boot

---
 CHANGELOG.md   |  4 ++++
 store/store.go | 19 +++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c74ba7cb..b0aa94a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 8.21.2 (unreleased)
+### Implementation changes and bug fixes
+- [PR #1696](https://github.com/rqlite/rqlite/pull/1696): Use consistent file perms post boot.
+
 ## 8.21.1 (February 21st 2024)
 ### Implementation changes and bug fixes
 - [PR #1693](https://github.com/rqlite/rqlite/pull/1693): Use built-in `max` function for Commit Index _sync_ check.
diff --git a/store/store.go b/store/store.go
index 5e51d7df..db4035da 100644
--- a/store/store.go
+++ b/store/store.go
@@ -1314,7 +1314,7 @@ func (s *Store) Backup(br *proto.BackupRequest, dst io.Writer) (retErr error) {
 				}
 			}
 
-			srcFD, err = os.CreateTemp(s.dbDir, backupScatchPattern)
+			srcFD, err = createTemp(s.dbDir, backupScatchPattern)
 			if err != nil {
 				return err
 			}
@@ -1433,7 +1433,7 @@ func (s *Store) ReadFrom(r io.Reader) (int64, error) {
 	}
 
 	// Write the data to a temporary file.
-	f, err := os.CreateTemp(s.dbDir, bootScatchPattern)
+	f, err := createTemp(s.dbDir, bootScatchPattern)
 	if err != nil {
 		return 0, err
 	}
@@ -1487,7 +1487,7 @@ func (s *Store) ReadFrom(r io.Reader) (int64, error) {
 // the temporary file with the existing database file. The database is then
 // re-opened.
 func (s *Store) Vacuum() error {
-	fd, err := os.CreateTemp(s.dbDir, vacuumScatchPattern)
+	fd, err := createTemp(s.dbDir, vacuumScatchPattern)
 	if err != nil {
 		return err
 	}
@@ -2065,7 +2065,7 @@ func (s *Store) fsmRestore(rc io.ReadCloser) (retErr error) {
 	startT := time.Now()
 
 	// Create a scatch file to write the restore data to it.
-	tmpFile, err := os.CreateTemp(s.dbDir, restoreScratchPattern)
+	tmpFile, err := createTemp(s.dbDir, restoreScratchPattern)
 	if err != nil {
 		return fmt.Errorf("error creating temporary file for restore operation: %v", err)
 	}
@@ -2360,6 +2360,17 @@ func createOnDisk(path string, fkConstraints, wal bool) (*sql.SwappableDB, error
 	return sql.OpenSwappable(path, fkConstraints, wal)
 }
 
+func createTemp(dir, pattern string) (*os.File, error) {
+	fd, err := os.CreateTemp(dir, pattern)
+	if err != nil {
+		return nil, err
+	}
+	if err := os.Chmod(fd.Name(), 0644); err != nil {
+		return nil, err
+	}
+	return fd, nil
+}
+
 func copyFromReaderToFile(path string, r io.Reader) (int64, error) {
 	fd, err := os.Create(path)
 	if err != nil {