X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=handler.go;h=10b0d2ff83f0b7b557be80494eea1389e8d0e31b;hb=HEAD;hp=d7037b43f109f008dfda8e1deddc0750f785cb7f;hpb=5cec1e322c642beeef9af0c53b1c9d977dd97cfd;p=godlighty.git

diff --git a/handler.go b/handler.go
index d7037b4..10b0d2f 100644
--- a/handler.go
+++ b/handler.go
@@ -1,19 +1,17 @@
-/*
-godlighty -- highly-customizable HTTP, HTTP/2, HTTPS server
-Copyright (C) 2021-2022 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
 
@@ -86,6 +84,7 @@ func (h Handler) Handle(
 		)
 		http.NotFound(w, r)
 	}
+	w.Header().Set("Server", Version)
 	if cfg == nil {
 		notFound()
 		return
@@ -118,7 +117,9 @@ func (h Handler) Handle(
 		return
 	}
 
-	if cfg.TLS != nil && len(cfg.TLS.ClientCAs) > 0 {
+	if (cfg.ECDSATLS != nil && len(cfg.ECDSATLS.ClientCAs) > 0) ||
+		(cfg.EdDSATLS != nil && len(cfg.EdDSATLS.ClientCAs) > 0) ||
+		(cfg.GOSTTLS != nil && len(cfg.GOSTTLS.ClientCAs) > 0) {
 		if r.TLS == nil {
 			err = errors.New("TLS client authentication required")
 			printErr(http.StatusForbidden, err)
@@ -140,7 +141,15 @@ func (h Handler) Handle(
 		return
 	}
 
-	if cfg.WebDAV && (r.Method == http.MethodHead ||
+	pthOrig := path.Clean(path.Join(cfg.Root, r.URL.Path))
+	pth := pthOrig
+	fi, err := os.Stat(pth)
+	if err != nil {
+		notFound()
+		return
+	}
+
+	if cfg.WebDAV && (((r.Method == http.MethodHead) && fi.IsDir()) ||
 		r.Method == http.MethodOptions ||
 		r.Method == "PROPFIND") {
 		dav := webdav.Handler{
@@ -166,17 +175,11 @@ func (h Handler) Handle(
 		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
 		return
 	}
+
 	var fd *os.File
 	var contentType string
 	var etag string
-	pthOrig := path.Clean(path.Join(cfg.Root, r.URL.Path))
-	pth := pthOrig
-IndexLookup:
-	fi, err := os.Stat(pth)
-	if err != nil {
-		notFound()
-		return
-	}
+IndexLookuped:
 	if fi.IsDir() {
 		if cfg.DirList {
 			entries, err := os.ReadDir(pth)
@@ -191,7 +194,7 @@ IndexLookup:
 				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)
@@ -205,7 +208,7 @@ IndexLookup:
 					break
 				}
 			}
-			fd, err = dirList(cfg, r.URL.Path, entries, string(readme))
+			fd, err = dirList(cfg, r.URL.Path, pth, entries, string(readme))
 			if err != nil {
 				printErr(http.StatusInternalServerError, err)
 				http.Error(w, "internal error", http.StatusInternalServerError)
@@ -217,7 +220,12 @@ IndexLookup:
 				p := path.Join(pth, index)
 				if _, err := os.Stat(p); err == nil {
 					pth = p
-					goto IndexLookup
+					fi, err = os.Stat(pth)
+					if err != nil {
+						notFound()
+						return
+					}
+					goto IndexLookuped
 				}
 			}
 			notFound()
@@ -232,7 +240,7 @@ IndexLookup:
 			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)
@@ -260,13 +268,11 @@ IndexLookup:
 		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))
+		for name, digest := range forHTTP.Hashes {
+			w.Header().Add("Digest", name+"="+base64.StdEncoding.EncodeToString(digest))
 		}
-		if forHTTP.SHA512 != nil {
-			w.Header().Add("Digest", "SHA-512="+
-				base64.StdEncoding.EncodeToString(forHTTP.SHA512))
+		for _, u := range forHTTP.Torrents {
+			w.Header().Add("Link", "<"+u+`>; rel=describedby; type="application/x-bittorrent"`)
 		}
 	}
 SkipMeta4:
@@ -277,7 +283,6 @@ SkipMeta4:
 	contentTypeBase := strings.SplitN(contentType, ";", 2)[0]
 	w.Header().Set("Content-Type", contentType)
 
-	w.Header().Set("Server", Version)
 	if etag != "" {
 		w.Header().Set("ETag", etag)
 	}