Linter cleanupgek/ban-ip-on-user-ban

9 files changed, 11 insertions, 9 deletions

diff --git a/controllers/admin/chat.go b/controllers/admin/chat.go
index 20e909262..c8a9d7085 100644
--- a/controllers/admin/chat.go
+++ b/controllers/admin/chat.go
@@ -165,7 +165,7 @@ func UpdateUserEnabled(w http.ResponseWriter, r *http.Request) {
 
 		// Ban this user's IP address.
 		for _, client := range clients {
-			ipAddress := client.IpAddress
+			ipAddress := client.IPAddress
 			reason := fmt.Sprintf("Banning of %s", disconnectedUser.DisplayName)
 			if err := data.BanIPAddress(ipAddress, reason); err != nil {
 				log.Errorln("error banning IP address: ", err)
diff --git a/core/chat/chatclient.go b/core/chat/chatclient.go
index 31eeca8a9..d838f8561 100644
--- a/core/chat/chatclient.go
+++ b/core/chat/chatclient.go
@@ -22,7 +22,7 @@ type Client struct {
 	conn        *websocket.Conn
 	User        *user.User `json:"user"`
 	server      *Server
-	IpAddress   string `json:"-"`
+	IPAddress   string `json:"-"`
 	// Buffered channel of outbound messages.
 	send         chan []byte
 	rateLimiter  *rate.Limiter
@@ -175,7 +175,7 @@ func (c *Client) handleEvent(data []byte) {
 }
 
 func (c *Client) close() {
-	log.Traceln("client closed:", c.User.DisplayName, c.id, c.IpAddress)
+	log.Traceln("client closed:", c.User.DisplayName, c.id, c.IPAddress)
 
 	_ = c.conn.Close()
 	c.server.unregister <- c.id
diff --git a/core/chat/persistence.go b/core/chat/persistence.go
index a6efafa94..9805e653e 100644
--- a/core/chat/persistence.go
+++ b/core/chat/persistence.go
@@ -327,6 +327,7 @@ func saveMessageVisibility(messageIDs []string, visible bool) error {
 		return err
 	}
 
+	// nolint:gosec
 	stmt, err := tx.Prepare("UPDATE messages SET hidden_at=? WHERE id IN (?" + strings.Repeat(",?", len(messageIDs)-1) + ")")
 	if err != nil {
 		return err
diff --git a/core/chat/server.go b/core/chat/server.go
index aeb143adf..f0f8a1451 100644
--- a/core/chat/server.go
+++ b/core/chat/server.go
@@ -83,7 +83,7 @@ func (s *Server) Addclient(conn *websocket.Conn, user *user.User, accessToken st
 		server:      s,
 		conn:        conn,
 		User:        user,
-		IpAddress:   ipAddress,
+		IPAddress:   ipAddress,
 		accessToken: accessToken,
 		send:        make(chan []byte, 256),
 		UserAgent:   userAgent,
diff --git a/core/data/data.go b/core/data/data.go
index f233d542c..bd7bab6b6 100644
--- a/core/data/data.go
+++ b/core/data/data.go
@@ -52,7 +52,7 @@ func SetupPersistence(file string) error {
 		if !utils.DoesFileExists(file) {
 			log.Traceln("Creating new database at", file)
 
-			_, err := os.Create(file)
+			_, err := os.Create(file) //nolint:gosec
 			if err != nil {
 				log.Fatal(err.Error())
 			}
diff --git a/core/offlineState.go b/core/offlineState.go
index 47ff34958..629d463e6 100644
--- a/core/offlineState.go
+++ b/core/offlineState.go
@@ -92,7 +92,7 @@ func createEmptyOfflinePlaylist(playlistFilePath string, offlineFilename string)
 	}
 
 	p.Close()
-	f, err := os.Create(playlistFilePath)
+	f, err := os.Create(playlistFilePath) //nolint:gosec
 	if err != nil {
 		log.Errorln(err)
 	}
diff --git a/core/playlist/writer.go b/core/playlist/writer.go
index a15e71040..20e451de1 100644
--- a/core/playlist/writer.go
+++ b/core/playlist/writer.go
@@ -4,6 +4,7 @@ import "os"
 
 // WritePlaylist writes the playlist to disk.
 func WritePlaylist(data string, filePath string) error {
+	// nolint:gosec
 	f, err := os.Create(filePath)
 	if err != nil {
 		return err
diff --git a/core/transcoder/fileWriterReceiverService.go b/core/transcoder/fileWriterReceiverService.go
index e974cc08d..c33a7d388 100644
--- a/core/transcoder/fileWriterReceiverService.go
+++ b/core/transcoder/fileWriterReceiverService.go
@@ -4,12 +4,11 @@ import (
 	"bytes"
 	"io"
 	"net"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"net/http"
-
 	"github.com/owncast/owncast/config"
 	"github.com/owncast/owncast/utils"
 	log "github.com/sirupsen/logrus"
@@ -67,7 +66,7 @@ func (s *FileWriterReceiverService) uploadHandler(w http.ResponseWriter, r *http
 	_, _ = io.Copy(&buf, r.Body)
 	data := buf.Bytes()
 
-	f, err := os.Create(writePath)
+	f, err := os.Create(writePath) //nolint:gosec
 	if err != nil {
 		returnError(err, w)
 		return
diff --git a/utils/backup.go b/utils/backup.go
index f960a7157..0e3c095a7 100644
--- a/utils/backup.go
+++ b/utils/backup.go
@@ -39,6 +39,7 @@ func Restore(backupFile string, databaseFile string) error {
 
 	rawSQL := b.String()
 
+	// nolint:gosec
 	if _, err := os.Create(databaseFile); err != nil {
 		return errors.New("unable to write restored database")
 	}