From 8d3f1048bf5d35f37b4f97d9245d5782ec3ad372 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Tue, 6 Aug 2024 15:02:21 +0300 Subject: [PATCH] Fix various lint warnings and suggestions --- caches/caches.go | 2 +- fifos/add.go | 2 +- fifos/del.go | 2 +- fifos/list.go | 9 +++++---- fifos/log.go | 2 +- fifos/restricted.go | 2 +- fifos/spies.go | 2 +- fifos/warcs.go | 2 +- rounds/gemini.go | 3 ++- rounds/redirectHTML.go | 5 +---- tls/tlsauth.go | 6 ++++-- trip.go | 34 +++++++++++++++++++--------------- warc/compressed.go | 12 ++++++------ warc/gzip.go | 4 ++-- warc/reader.go | 5 +++-- warc/record.go | 14 ++++++-------- warc/uris.go | 8 ++++---- 17 files changed, 59 insertions(+), 55 deletions(-) diff --git a/caches/caches.go b/caches/caches.go index 8144934..3d802d0 100644 --- 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 cf8f3fd..bf573d0 100644 --- 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 a192302..d880658 100644 --- 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 f571d04..13388f8 100644 --- 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 b0f7508..e749eb3 100644 --- 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 6b8c319..de6a7f4 100644 --- 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 d0fa4a9..51dc654 100644 --- 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 54f86a5..ba99b9f 100644 --- 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 71da97f..2b480ed 100644 --- 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 c5cc1d4..93e9d49 100644 --- 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 2aea588..62763b9 100644 --- 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 06a6f90..0e179a5 100644 --- 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 84b30c3..c085227 100644 --- 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 fc20ac4..6a675ee 100644 --- 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 50037c7..6d0993c 100644 --- 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 38181ab..de30151 100644 --- 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 56cd415..37644ac 100644 --- 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 -- 2.48.1