Fix various lint warnings and suggestions

diff --git a/auth_argon2i.go b/auth_argon2i.go
index 7b1010dc62c56064258c543e8c6fbfcc5a05a85e..94c86701e92c62575c8d244deb0b7f1329921fe0 100644 (file)
--- a/auth_argon2i.go
+++ b/auth_argon2i.go
@@ -26,12 +26,12 @@ import (
 )
 
 type Argon2iAuthData struct {
-       version  int
+       salt     []byte
+       password []byte
        memory   uint32
        time     uint32
+       version  int
        threads  uint8
-       salt     []byte
-       password []byte
 }
 
 func (ad Argon2iAuthData) Auth(password string) bool {

diff --git a/fileutils.go b/fileutils.go
index 9655d0a7a9b285d9d153fbc7cdc8d892e4eea5f3..64de99ceeee870993e12fe72c406d35337838309 100644 (file)
--- a/fileutils.go
+++ b/fileutils.go
@@ -33,7 +33,7 @@ func TempFile(dir string) (*os.File, error) {
        if err != nil {
                return nil, err
        }
-       err = os.Chmod(tmp.Name(), os.FileMode(0666&^UmaskCur))
+       err = os.Chmod(tmp.Name(), os.FileMode(0o666&^UmaskCur))
        if err != nil {
                tmp.Close()
                return nil, err
@@ -87,7 +87,7 @@ func WriteFileSync(dirPath, filePath string, data []byte, mtime time.Time) error
 func mkdirForPkg(w http.ResponseWriter, r *http.Request, pkgName string) bool {
        path := filepath.Join(Root, pkgName)
        if _, err := os.Stat(path); os.IsNotExist(err) {
-               if err = os.Mkdir(path, os.FileMode(0777)); err != nil {
+               if err = os.Mkdir(path, os.FileMode(0o777)); err != nil {
                        log.Println("error", r.RemoteAddr, "mkdir", pkgName, err)
                        http.Error(w, err.Error(), http.StatusInternalServerError)
                        return false

diff --git a/list.go b/list.go
index 779e348353b6e6638799933eaaaca47d092e3d4f..8e0c709d3cd89e02f153fa09e1c2689eb1c1fdad 100644 (file)
--- a/list.go
+++ b/list.go
@@ -42,8 +42,10 @@ var (
        //go:embed list.tmpl
        HTMLReleasesTmplRaw string
        HTMLReleasesTmpl    = template.Must(template.New("list").Parse(HTMLReleasesTmplRaw))
-       KnownExts           = []string{".tar.bz2", ".tar.gz", ".whl", ".zip", ".egg",
-               ".exe", ".dmg", ".msi", ".rpm", ".deb", ".tgz"}
+       KnownExts           = []string{
+               ".tar.bz2", ".tar.gz", ".whl", ".zip", ".egg",
+               ".exe", ".dmg", ".msi", ".rpm", ".deb", ".tgz",
+       }
 )
 
 func listRoot(w http.ResponseWriter, r *http.Request) {
@@ -143,14 +145,16 @@ func listDir(pkgName string, doSize bool) (int64, []*PkgReleaseInfo, error) {
                                continue
                        }
                        delete(files, fn)
-                       digest, err := os.ReadFile(filepath.Join(dirPath, fn))
+                       var digest []byte
+                       digest, err = os.ReadFile(filepath.Join(dirPath, fn))
                        if err != nil {
                                return 0, nil, err
                        }
                        fnClean := strings.TrimSuffix(fn, "."+algo)
                        release := releaseFiles[fnClean]
                        if release == nil {
-                               fi, err := entry.Info()
+                               var fi fs.FileInfo
+                               fi, err = entry.Info()
                                if err != nil {
                                        return 0, nil, err
                                }
@@ -165,7 +169,8 @@ func listDir(pkgName string, doSize bool) (int64, []*PkgReleaseInfo, error) {
                                releaseFiles[fnClean] = release
                                if entry, exists := files[fnClean]; exists {
                                        if doSize {
-                                               fi, err := entry.Info()
+                                               var fi fs.FileInfo
+                                               fi, err = entry.Info()
                                                if err != nil {
                                                        return 0, nil, err
                                                }

diff --git a/main.go b/main.go
index cdab06e1de21ab38599c968d64a630a681b58239..bdcc82539b09a3eeacb65668c875f53f0c19a429 100644 (file)
--- a/main.go
+++ b/main.go
@@ -174,7 +174,7 @@ func main() {
                                fd, err := os.OpenFile(
                                        *PasswdPath,
                                        os.O_RDONLY,
-                                       os.FileMode(0666),
+                                       os.FileMode(0o666),
                                )
                                if err != nil {
                                        log.Fatal(err)
@@ -190,7 +190,7 @@ func main() {
                                fd, err := os.OpenFile(
                                        *PasswdListPath,
                                        os.O_WRONLY|os.O_APPEND,
-                                       os.FileMode(0666),
+                                       os.FileMode(0o666),
                                )
                                if err != nil {
                                        log.Fatal(err)
@@ -222,7 +222,8 @@ func main() {
                TLSClientConfig:   &tlsConfig,
        }
        if *PyPICertHash != "" {
-               ourDgst, err := hex.DecodeString(*PyPICertHash)
+               var ourDgst []byte
+               ourDgst, err = hex.DecodeString(*PyPICertHash)
                if err != nil {
                        log.Fatal(err)
                }
@@ -250,7 +251,7 @@ func main() {
                server.SetKeepAlivesEnabled(false)
                ln := &UCSPI{}
                server.ConnState = connStater
-               err := server.Serve(ln)
+               err = server.Serve(ln)
                if _, ok := err.(UCSPIAlreadyAccepted); !ok {
                        log.Fatal(err)
                }

diff --git a/passwd.go b/passwd.go
index e5edc5241acfb60fcead30fe37b79acb18c47cb3..dc94bb2b0fc31c18f05e8cdd2b9a5ba5199f135c 100644 (file)
--- a/passwd.go
+++ b/passwd.go
@@ -41,9 +41,9 @@ type Auther interface {
 }
 
 type User struct {
+       auther Auther
        name   string
        ro     bool
-       auther Auther
 }
 
 func strToAuther(verifier string) (string, Auther, error) {

diff --git a/refresh.go b/refresh.go
index 5b41173ec7d9b197ab30db1ce4dfdcb7371d1f57..64e99932a0e680148f9e635c3972fab68b2070df 100644 (file)
--- a/refresh.go
+++ b/refresh.go
@@ -26,6 +26,7 @@ import (
        "errors"
        "hash"
        "io"
+       "io/fs"
        "log"
        "net/http"
        "net/url"
@@ -369,7 +370,6 @@ func refreshDir(
                                http.Error(w, "invalid digest provided", http.StatusBadGateway)
                                return false
                        }
-                       var err error
                        digest, err = hex.DecodeString(digestInfo[1])
                        if err != nil {
                                log.Println("error", r.RemoteAddr, "pypi", filename, "invalid digest")
@@ -446,7 +446,8 @@ func refreshDir(
                        hasher := hasherNew()
                        hasherBLAKE2b256 := blake2b256New()
                        hasherSHA256 := sha256.New()
-                       dst, err := TempFile(dirPath)
+                       var dst *os.File
+                       dst, err = TempFile(dirPath)
                        if err != nil {
                                log.Println("error", r.RemoteAddr, "pypi", filename, err)
                                http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -482,7 +483,7 @@ func refreshDir(
                                http.Error(w, "digest mismatch", http.StatusBadGateway)
                                return false
                        }
-                       if digestStored, err := os.ReadFile(path + "." + hashAlgo); err == nil &&
+                       if digestStored, errRead := os.ReadFile(path + "." + hashAlgo); errRead == nil &&
                                !bytes.Equal(digest, digestStored) {
                                err = errors.New("stored digest mismatch")
                                log.Println("error", r.RemoteAddr, "pypi", filename, err)
@@ -560,7 +561,8 @@ func refreshDir(
                        digest = nil
                }
                if mtimeExists {
-                       stat, err := os.Stat(path)
+                       var stat fs.FileInfo
+                       stat, err = os.Stat(path)
                        if err == nil && !stat.ModTime().Truncate(time.Second).Equal(mtime) {
                                log.Println(r.RemoteAddr, "pypi", filename, "touch")
                                if err = os.Chtimes(path, mtime, mtime); err != nil {

diff --git a/ucspi.go b/ucspi.go
index 488f3080da6df24f8738cc245e86a972d9739cf3..15c68c560d8f1411d47c9b646921442d1c88a132 100644 (file)
--- a/ucspi.go
+++ b/ucspi.go
@@ -43,15 +43,15 @@ type UCSPIConn struct {
 }
 
 type ReadResult struct {
-       n   int
        err error
+       n   int
 }
 
 func (conn *UCSPIConn) Read(b []byte) (int, error) {
        c := make(chan ReadResult)
        go func() {
                n, err := os.Stdin.Read(b)
-               c <- ReadResult{n, err}
+               c <- ReadResult{err, n}
        }()
        select {
        case res := <-c:

diff --git a/upload.go b/upload.go
index a78a0a9b5855cc9cddd496c48472fb66edd51f70..349cc37d6a0e380a77b25184d7dcf59caaa53328 100644 (file)
--- a/upload.go
+++ b/upload.go
@@ -23,6 +23,7 @@ import (
        "encoding/hex"
        "io"
        "log"
+       "mime/multipart"
        "net/http"
        "os"
        "path/filepath"
@@ -99,14 +100,16 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                if !mkdirForPkg(w, r, pkgName) {
                        return
                }
-               src, err := file.Open()
+               var src multipart.File
+               src, err = file.Open()
                if err != nil {
                        log.Println("error", r.RemoteAddr, filename, err)
                        http.Error(w, err.Error(), http.StatusInternalServerError)
                        return
                }
                defer src.Close()
-               dst, err := TempFile(dirPath)
+               var dst *os.File
+               dst, err = TempFile(dirPath)
                if err != nil {
                        log.Println("error", r.RemoteAddr, filename, err)
                        http.Error(w, err.Error(), http.StatusInternalServerError)