api, common, db4s, webui: Replace deprecated ioutil functions

Author: justinclift

api/main.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"html/template"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -85,7 +84,7 @@ func main() {
 
 	// Load our self signed CA chain
 	ourCAPool = x509.NewCertPool()
-	certFile, err := ioutil.ReadFile(com.Conf.DB4S.CAChain)
+	certFile, err := os.ReadFile(com.Conf.DB4S.CAChain)
 	if err != nil {
 		fmt.Printf("Error opening Certificate Authority chain file: %v\n", err)
 		return

common/cert.go

@@ -8,9 +8,9 @@ import (
 	"crypto/x509/pkix"
 	"encoding/pem"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"math/big"
+	"os"
 	"time"
 )
 
@@ -43,7 +43,7 @@ func GenerateClientCert(userName string) (_ []byte, err error) {
 	}
 
 	// Load the certificate used for signing (the intermediate certificate)
-	certFile, err := ioutil.ReadFile(Conf.Sign.IntermediateCert)
+	certFile, err := os.ReadFile(Conf.Sign.IntermediateCert)
 	if err != nil {
 		log.Printf("%s: Error opening intermediate certificate file: %v\n", pageName, err)
 		return
@@ -60,7 +60,7 @@ func GenerateClientCert(userName string) (_ []byte, err error) {
 	}
 
 	// Load the private key for the intermediate certificate
-	intKeyFile, err := ioutil.ReadFile(Conf.Sign.IntermediateKey)
+	intKeyFile, err := os.ReadFile(Conf.Sign.IntermediateKey)
 	if err != nil {
 		log.Printf("%s: Error opening intermediate certificate key: %v\n", pageName, err)
 		return

common/licences.go

@@ -1,8 +1,8 @@
 package common
 
 import (
-	"io/ioutil"
 	"log"
+	"os"
 	"path/filepath"
 )
 
@@ -73,7 +73,7 @@ func AddDefaultLicences() (err error) {
 		txt := []byte{}
 		if l.Path != "" {
 			// Read the file contents
-			txt, err = ioutil.ReadFile(filepath.Join(Conf.Licence.LicenceDir, l.Path))
+			txt, err = os.ReadFile(filepath.Join(Conf.Licence.LicenceDir, l.Path))
 			if err != nil {
 				return err
 			}

common/merge.go

@@ -3,7 +3,6 @@ package common
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -184,7 +183,7 @@ func performMerge(destOwner, destFolder, destName, destBranch, destCommitID, src
 	}
 
 	// Create a temporary file for the new database
-	tmpFile, err := ioutil.TempFile(Conf.DiskCache.Directory, "dbhub-merge-*.db")
+	tmpFile, err := os.CreateTemp(Conf.DiskCache.Directory, "dbhub-merge-*.db")
 	if err != nil {
 		return
 	}

common/responses.go

@@ -111,7 +111,7 @@ func UploadResponse(w http.ResponseWriter, r *http.Request, loggedInUser, target
 	}
 	if err != nil {
 		if err.Error() == "http: no such file" {
-			// Check for a 'file1' FormFile too, as the some clients can't use 'file' (without a number) due to a design bug
+			// Check for a 'file1' FormFile too, as some clients can't use 'file' (without a number) due to a design bug
 			tempFile, handler, err = r.FormFile("file1")
 			if err != nil {
 				log.Printf("Uploading file failed: %v\n", err)

common/util.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"math/rand"
 	"net/http"
@@ -45,7 +44,7 @@ func AddDatabase(loggedInUser, dbOwner, dbFolder, dbName string, createBranch bo
 	}
 
 	// Create a temporary file to store the database in
-	tempDB, err := ioutil.TempFile(Conf.DiskCache.Directory, "dbhub-upload-")
+	tempDB, err := os.CreateTemp(Conf.DiskCache.Directory, "dbhub-upload-")
 	if err != nil {
 		log.Printf("Error creating temporary file. User: '%s', Database: '%s%s%s', Error: %v\n", loggedInUser,
 			SanitiseLogString(dbOwner), SanitiseLogString(dbFolder), SanitiseLogString(dbName), err)

db4s/main.go

@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -76,7 +75,7 @@ func main() {
 
 	// Load our self signed CA chain
 	ourCAPool = x509.NewCertPool()
-	certFile, err := ioutil.ReadFile(com.Conf.DB4S.CAChain)
+	certFile, err := os.ReadFile(com.Conf.DB4S.CAChain)
 	if err != nil {
 		fmt.Printf("Error opening Certificate Authority chain file: %v\n", err)
 		return

webui/main.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"html/template"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"net/url"
@@ -121,7 +121,7 @@ func auth0CallbackHandler(w http.ResponseWriter, r *http.Request) {
 		errorPage(w, r, http.StatusInternalServerError, err.Error())
 		return
 	}
-	raw, err := ioutil.ReadAll(userInfo.Body)
+	raw, err := io.ReadAll(userInfo.Body)
 	defer userInfo.Body.Close()
 	if err != nil {
 		errorPage(w, r, http.StatusInternalServerError, err.Error())