Fix various lint warnings and suggestions

diff --git a/caches/caches.go b/caches/caches.go
index 81449349fac68479c2e89db80bbc72013239bc24..3d802d0f4da3f6db309e147287174b648acc24fc 100644 (file)
--- a/caches/caches.go
+++ b/caches/caches.go
@@ -21,6 +21,6 @@ var (
        Spies  = make([]string, 0)
        SpiesM sync.RWMutex
 
-       Restricted = make(map[string][]string)
+       Restricted  = make(map[string][]string)
        RestrictedM sync.RWMutex
 )

diff --git a/fifos/add.go b/fifos/add.go
index cf8f3fdc2ff57a9adc3db893b57970dc98d7fa69..bf573d089efc286e923ba0577bb5eaa873c8d5ee 100644 (file)
--- a/fifos/add.go
+++ b/fifos/add.go
@@ -23,7 +23,7 @@ import (
 )
 
 func readLinesFromFIFO(p string) []string {
-       fd, err := os.OpenFile(p, os.O_RDONLY, os.FileMode(0666))
+       fd, err := os.OpenFile(p, os.O_RDONLY, os.FileMode(0o666))
        if err != nil {
                log.Fatalln(err)
        }

diff --git a/fifos/del.go b/fifos/del.go
index a1923023a969f57a9013bcc5d920725c30e36057..d8806585d9f91989e946b06c09836c8edb64a39c 100644 (file)
--- a/fifos/del.go
+++ b/fifos/del.go
@@ -25,7 +25,7 @@ import (
 
 func del(l *sync.RWMutex, deleter func(string), p string) {
        for {
-               fd, err := os.OpenFile(p, os.O_RDONLY, os.FileMode(0666))
+               fd, err := os.OpenFile(p, os.O_RDONLY, os.FileMode(0o666))
                if err != nil {
                        log.Fatalln(err)
                }

diff --git a/fifos/list.go b/fifos/list.go
index f571d04c067c9db36afc0a5ae5f9d2750ba78399..13388f8cba7462bd9d8d625a78a998f18561c42d 100644 (file)
--- a/fifos/list.go
+++ b/fifos/list.go
@@ -28,7 +28,7 @@ import (
 
 func list(l *sync.RWMutex, m map[string]string, p string) {
        for {
-               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0666))
+               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0o666))
                if err != nil {
                        log.Fatalln(err)
                }
@@ -53,7 +53,7 @@ func listRejected(p string) {
 
 func listHTTPAuth(p string) {
        for {
-               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0666))
+               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0o666))
                if err != nil {
                        log.Fatalln(err)
                }
@@ -70,15 +70,16 @@ func listHTTPAuth(p string) {
 
 func listTLSAuth(p string) {
        for {
-               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0666))
+               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0o666))
                if err != nil {
                        log.Fatalln(err)
                }
                caches.TLSAuthCacheM.RLock()
+               var cert *x509.Certificate
                for host, tlsCert := range caches.TLSAuthCache {
                        subj := "NONE"
                        if len(tlsCert.Certificate) != 0 {
-                               cert, err := x509.ParseCertificate(tlsCert.Certificate[0])
+                               cert, err = x509.ParseCertificate(tlsCert.Certificate[0])
                                if err != nil {
                                        log.Fatalln(err)
                                }

diff --git a/fifos/log.go b/fifos/log.go
index b0f7508c82e3a26e231d43f40a2df54c9d0f07cd..e749eb34d731560ce63559e43b135e6973d948e7 100644 (file)
--- a/fifos/log.go
+++ b/fifos/log.go
@@ -44,7 +44,7 @@ var (
 func logger(c chan string, p string) {
        tai := new(tai64n.TAI64N)
        for {
-               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0666))
+               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0o666))
                if err != nil {
                        log.Fatalln(err)
                }

diff --git a/fifos/restricted.go b/fifos/restricted.go
index 6b8c319537c0d809c9681ee3fdafe7c77849ca4c..de6a7f4e1e4b29ce1e58a3c93504c90ccf37b8e5 100644 (file)
--- a/fifos/restricted.go
+++ b/fifos/restricted.go
@@ -27,7 +27,7 @@ import (
 
 func listRestricted(p string) {
        for {
-               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0666))
+               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0o666))
                if err != nil {
                        log.Fatalln(err)
                }

diff --git a/fifos/spies.go b/fifos/spies.go
index d0fa4a9cd73c5befa4e163d96c0816a223fa8b9c..51dc6542b52bc1754bfcc19bb688a90fe8c808db 100644 (file)
--- a/fifos/spies.go
+++ b/fifos/spies.go
@@ -25,7 +25,7 @@ import (
 
 func listSpies(p string) {
        for {
-               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0666))
+               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0o666))
                if err != nil {
                        log.Fatalln(err)
                }

diff --git a/fifos/warcs.go b/fifos/warcs.go
index 54f86a5b72d6900f513e9da1bf3fe6a7742c8e4c..ba99b9fa2e6fb1dd6fd690906c4f34fbd7629170 100644 (file)
--- a/fifos/warcs.go
+++ b/fifos/warcs.go
@@ -26,7 +26,7 @@ import (
 
 func listWARCs(p string) {
        for {
-               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0666))
+               fd, err := os.OpenFile(p, os.O_WRONLY|os.O_APPEND, os.FileMode(0o666))
                if err != nil {
                        log.Fatalln(err)
                }

diff --git a/rounds/gemini.go b/rounds/gemini.go
index 71da97f361bfe33526a696be30e00ac0b2177b62..2b480ed5a730695dbdd9fe494fd12540dd0a503c 100644 (file)
--- a/rounds/gemini.go
+++ b/rounds/gemini.go
@@ -195,7 +195,8 @@ func RoundGemini(
                !strings.Contains(req.Header.Get("Accept"), ContentTypeGemini) {
                w.Header().Add("Content-Type", "text/html")
                w.WriteHeader(http.StatusOK)
-               raw, err := io.ReadAll(br)
+               var raw []byte
+               raw, err = io.ReadAll(br)
                if err != nil {
                        log.Printf("%s: can not read response body: %+v\n", req.URL, err)
                        return false, err

diff --git a/rounds/redirectHTML.go b/rounds/redirectHTML.go
index c5cc1d4b80d3659248b37b6d58e59d1c82a80792..93e9d490a2498cf8affcb75010637080e9bad498 100644 (file)
--- a/rounds/redirectHTML.go
+++ b/rounds/redirectHTML.go
@@ -43,10 +43,7 @@ var imageExts = map[string]struct{}{
 }
 
 func isFeeder(req *http.Request) bool {
-       if strings.Contains(req.Header.Get("User-Agent"), "stargrave.org-feeder/") {
-               return true
-       }
-       return false
+       return strings.Contains(req.Header.Get("User-Agent"), "stargrave.org-feeder/")
 }
 
 func RoundRedirectHTML(

diff --git a/tls/tlsauth.go b/tls/tlsauth.go
index 2aea58818fafc01a985d0dcc612fe3ea4bbc5fd1..62763b90c59bb3db646b449e7b2c3ff164f71069 100644 (file)
--- a/tls/tlsauth.go
+++ b/tls/tlsauth.go
@@ -104,11 +104,13 @@ foreach sigScheme {%s} {
        tlsCerts = append(tlsCerts, nil)
        for i, ent := range ents {
                p := filepath.Join(CCerts, ent.Name())
-               _, cert, err := ucspi.CertificateFromFile(p)
+               var cert *x509.Certificate
+               _, cert, err = ucspi.CertificateFromFile(p)
                if err != nil {
                        log.Fatalln(err)
                }
-               prv, err := ucspi.PrivateKeyFromFile(p)
+               var prv any
+               prv, err = ucspi.PrivateKeyFromFile(p)
                if err != nil {
                        log.Fatalln(err)
                }

diff --git a/trip.go b/trip.go
index 06a6f905c7af6c785aee0359fbe3a9cb375d05e8..0e179a5b00aabdfd70b97d8d956f6ffbfd41a5c4 100644 (file)
--- a/trip.go
+++ b/trip.go
@@ -103,7 +103,8 @@ Retry:
                fifos.LogVarious <- fmt.Sprintf(
                        "%s %s\tHTTP authorization required", req.Method, req.URL.Host,
                )
-               user, pass, err := authDialog(host, resp.Header.Get("WWW-Authenticate"))
+               var user, pass string
+               user, pass, err = authDialog(host, resp.Header.Get("WWW-Authenticate"))
                if err != nil {
                        caches.HTTPAuthCacheM.Unlock()
                        fifos.LogErr <- fmt.Sprintf("%s\t%s", req.URL.Host, err.Error())
@@ -132,20 +133,23 @@ Retry:
                }
        }
 
-       for _, round := range []Round{
-               rounds.RoundDenyFonts,
-               rounds.RoundTranscodeWebP,
-               rounds.RoundTranscodeJXL,
-               rounds.RoundTranscodeAVIF,
-               rounds.RoundRedirectHTML,
-       } {
-               cont, err := round(host, resp, w, req)
-               if err != nil {
-                       http.Error(w, err.Error(), http.StatusBadGateway)
-                       return
-               }
-               if !cont {
-                       return
+       {
+               var cont bool
+               for _, round := range []Round{
+                       rounds.RoundDenyFonts,
+                       rounds.RoundTranscodeWebP,
+                       rounds.RoundTranscodeJXL,
+                       rounds.RoundTranscodeAVIF,
+                       rounds.RoundRedirectHTML,
+               } {
+                       cont, err = round(host, resp, w, req)
+                       if err != nil {
+                               http.Error(w, err.Error(), http.StatusBadGateway)
+                               return
+                       }
+                       if !cont {
+                               return
+                       }
                }
        }
 

diff --git a/warc/compressed.go b/warc/compressed.go
index 84b30c35e5c0e4bf91ece7d498eee2f74578698e..c0852270bd7a38f14f3e53061648cb22b1622df8 100644 (file)
--- a/warc/compressed.go
+++ b/warc/compressed.go
@@ -29,12 +29,11 @@ import (
 )
 
 type CompressedReader struct {
-       cmd     *exec.Cmd
-       fd      *os.File
-       stdout  io.ReadCloser
-       offsets []Offset
-
+       stdout    io.ReadCloser
+       cmd       *exec.Cmd
+       fd        *os.File
        offW      *os.File
+       offsets   []Offset
        offReader sync.WaitGroup
 }
 
@@ -79,7 +78,8 @@ func NewCompressedReader(
                cmd.Stdin = io.MultiReader(bytes.NewReader(dict), fd)
        }
        if offsets == nil {
-               offR, offW, err := os.Pipe()
+               var offR, offW *os.File
+               offR, offW, err = os.Pipe()
                if err != nil {
                        fd.Close()
                        return nil, err

diff --git a/warc/gzip.go b/warc/gzip.go
index fc20ac451892e463ee7db57e9f22e3fa5f94abef..6a675eed1da4d68a4e04c998c9546e0fe399ae00 100644 (file)
--- a/warc/gzip.go
+++ b/warc/gzip.go
@@ -91,9 +91,9 @@ func NewGZIPReader(
        gr := GZIPReader{r: r}
        go func() {
                z.Multistream(false)
-               var offset, offsetPrev int64
+               var offset, offsetPrev, written int64
                for {
-                       written, err := io.Copy(w, z)
+                       written, err = io.Copy(w, z)
                        if err != nil {
                                w.CloseWithError(err)
                                return

diff --git a/warc/reader.go b/warc/reader.go
index 50037c734edd89764f494cc8f6410e78bc0487a4..6d0993cf378463e862171c83c877304b03e44b21 100644 (file)
--- a/warc/reader.go
+++ b/warc/reader.go
@@ -30,9 +30,9 @@ type Reader struct {
        Path    string
        rrr     RawRecordReader
        br      *bufio.Reader
-       offset  int64
        prevRec *Record
        offsets []Offset
+       offset  int64
 }
 
 func NewReader(warcPath string) (*Reader, error) {
@@ -81,7 +81,8 @@ func (r *Reader) ReadRecord() (*Record, io.Reader, error) {
        hdrLen := len(line)
        hdr := NewHeader()
        for {
-               line, err := r.br.ReadString('\n')
+               var line string
+               line, err = r.br.ReadString('\n')
                if err != nil {
                        return nil, nil, err
                }

diff --git a/warc/record.go b/warc/record.go
index 38181ab92724bc509f05402a87846624a5efe365..de3015185f718af02ce15ee6b8b3166a2e1e1b90 100644 (file)
--- a/warc/record.go
+++ b/warc/record.go
@@ -22,15 +22,13 @@ import (
 )
 
 type Record struct {
-       WARCPath string
-       Offset   int64
-       Size     int64
-
-       Hdr      Header
-       HdrLen   int
-       HdrLines []string
-
+       WARCPath      string
+       Hdr           Header
+       HdrLines      []string
        Continuations []*Record
+       Offset        int64
+       Size          int64
+       HdrLen        int
 }
 
 func (rec *Record) URI() string {

diff --git a/warc/uris.go b/warc/uris.go
index 56cd415d1a51868fc3b05e99bbd53403431107dd..37644ac218e9d6c3db02a83be5e943c183c3d371 100644 (file)
--- a/warc/uris.go
+++ b/warc/uris.go
@@ -46,10 +46,10 @@ func Add(warcPath string) error {
                var uris map[string]*Record
                var offsets []Offset
                dec := gob.NewDecoder(fd)
-               if err := dec.Decode(&uris); err != nil {
+               if err = dec.Decode(&uris); err != nil {
                        return err
                }
-               if err := dec.Decode(&offsets); err != nil {
+               if err = dec.Decode(&offsets); err != nil {
                        return err
                }
                WARCsM.Lock()
@@ -59,7 +59,7 @@ func Add(warcPath string) error {
                log.Println("loaded marshalled index:", warcPath+IndexExt)
                return nil
        }
-       if err != nil && !errors.Is(err, fs.ErrNotExist) {
+       if !errors.Is(err, fs.ErrNotExist) {
                return err
        }
        r, err := NewReader(warcPath)
@@ -135,7 +135,7 @@ func SaveIndices() error {
                fd, err := os.OpenFile(
                        p+tmpSuffix,
                        os.O_WRONLY|os.O_CREATE|os.O_EXCL,
-                       os.FileMode(0666),
+                       os.FileMode(0o666),
                )
                if err != nil {
                        return err