Fix various lint warnings and suggestions

[godlighty.git] / handler.go

diff --git a/handler.go b/handler.go
index e17583c4388f1aa901b89fb237e0eb8b2bb75e88..3060f97b995ec4d992e39fac0a19fa8651ff6f08 100644 (file)
--- a/handler.go
+++ b/handler.go
@@ -1,19 +1,17 @@
-/*
-godlighty -- highly-customizable HTTP, HTTP/2, HTTPS server
-Copyright (C) 2021-2023 Sergey Matveev <stargrave@stargrave.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// godlighty -- highly-customizable HTTP, HTTP/2, HTTPS server
+// Copyright (C) 2021-2024 Sergey Matveev <stargrave@stargrave.org>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 package godlighty
 
 
 package godlighty
 


@@ -24,6 +22,7 @@ import (
        "errors"
        "fmt"
        "io"
        "errors"
        "fmt"
        "io"

+       "io/fs"

        "log"
        "net"
        "net/http"
        "log"
        "net"
        "net/http"


@@ -184,7 +183,8 @@ func (h Handler) Handle(
 IndexLookuped:
        if fi.IsDir() {
                if cfg.DirList {
 IndexLookuped:
        if fi.IsDir() {
                if cfg.DirList {

-                       entries, err := os.ReadDir(pth)
+                       var entries []fs.DirEntry
+                       entries, err = os.ReadDir(pth)

                        if err != nil {
                                printErr(http.StatusInternalServerError, err)
                                http.Error(w, "internal error", http.StatusInternalServerError)
                        if err != nil {
                                printErr(http.StatusInternalServerError, err)
                                http.Error(w, "internal error", http.StatusInternalServerError)


@@ -196,7 +196,7 @@ IndexLookuped:
                                http.Error(w, "internal error", http.StatusInternalServerError)
                                return
                        }
                                http.Error(w, "internal error", http.StatusInternalServerError)
                                return
                        }

-                       etag, err = ctimeETag(fd)
+                       etag, err = mtimeETag(fd)

                        fd.Close()
                        if err != nil {
                                printErr(http.StatusInternalServerError, err)
                        fd.Close()
                        if err != nil {
                                printErr(http.StatusInternalServerError, err)


@@ -220,7 +220,7 @@ IndexLookuped:
                } else {
                        for _, index := range append(cfg.Indices, Index) {
                                p := path.Join(pth, index)
                } else {
                        for _, index := range append(cfg.Indices, Index) {
                                p := path.Join(pth, index)

-                               if _, err := os.Stat(p); err == nil {
+                               if _, err = os.Stat(p); err == nil {

                                        pth = p
                                        fi, err = os.Stat(pth)
                                        if err != nil {
                                        pth = p
                                        fi, err = os.Stat(pth)
                                        if err != nil {


@@ -242,7 +242,7 @@ IndexLookuped:
                        http.Error(w, "internal error", http.StatusInternalServerError)
                        return
                }
                        http.Error(w, "internal error", http.StatusInternalServerError)
                        return
                }

-               etag, err = ctimeETag(fd)
+               etag, err = mtimeETag(fd)

                if err != nil {
                        printErr(http.StatusInternalServerError, err)
                        http.Error(w, "internal error", http.StatusInternalServerError)
                if err != nil {
                        printErr(http.StatusInternalServerError, err)
                        http.Error(w, "internal error", http.StatusInternalServerError)


@@ -270,21 +270,11 @@ IndexLookuped:
                for _, u := range forHTTP.URLs {
                        w.Header().Add("Link", "<"+u+">; rel=duplicate")
                }
                for _, u := range forHTTP.URLs {
                        w.Header().Add("Link", "<"+u+">; rel=duplicate")
                }

-               if forHTTP.SHA256 != nil {
-                       w.Header().Add("Digest", "SHA-256="+
-                               base64.StdEncoding.EncodeToString(forHTTP.SHA256))
-               }
-               if forHTTP.SHA512 != nil {
-                       w.Header().Add("Digest", "SHA-512="+
-                               base64.StdEncoding.EncodeToString(forHTTP.SHA512))
-               }
-               if forHTTP.Streebog256 != nil {
-                       w.Header().Add("Digest", "Streebog-256="+
-                               base64.StdEncoding.EncodeToString(forHTTP.Streebog256))
+               for name, digest := range forHTTP.Hashes {
+                       w.Header().Add("Digest", name+"="+base64.StdEncoding.EncodeToString(digest))

                }
                }

-               if forHTTP.Streebog512 != nil {
-                       w.Header().Add("Digest", "Streebog-512="+
-                               base64.StdEncoding.EncodeToString(forHTTP.Streebog512))
+               for _, u := range forHTTP.Torrents {
+                       w.Header().Add("Link", "<"+u+`>; rel=describedby; type="application/x-bittorrent"`)

                }
        }
 SkipMeta4:
                }
        }
 SkipMeta4: