X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=handler.go;h=81bd2aa1f399101d5a10ef06619ea80cd845c9f5;hb=165d9a8cd3569e555ace6362f9f968cdc90241f1;hp=76859813b79349fa1ad6e09f0807f11a14c2df64;hpb=75cd1a5bc1ea7eb25a54b397f95b6169a6c99cd0;p=godlighty.git

diff --git a/handler.go b/handler.go
index 7685981..81bd2aa 100644
--- a/handler.go
+++ b/handler.go
@@ -1,6 +1,6 @@
 /*
 godlighty -- highly-customizable HTTP, HTTP/2, HTTPS server
-Copyright (C) 2021 Sergey Matveev <stargrave@stargrave.org>
+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
@@ -23,7 +23,7 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net"
 	"net/http"
@@ -47,12 +47,12 @@ const (
 
 var (
 	gzPool = sync.Pool{
-		New: func() interface{} { return gzip.NewWriter(ioutil.Discard) },
+		New: func() interface{} { return gzip.NewWriter(io.Discard) },
 	}
 	zstdPool = sync.Pool{
 		New: func() interface{} {
 			w, err := zstd.NewWriter(
-				ioutil.Discard,
+				io.Discard,
 				zstd.WithEncoderLevel(zstd.SpeedDefault),
 			)
 			if err != nil {
@@ -86,6 +86,7 @@ func (h Handler) Handle(
 		)
 		http.NotFound(w, r)
 	}
+	w.Header().Set("Server", Version)
 	if cfg == nil {
 		notFound()
 		return
@@ -118,7 +119,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 +143,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 +177,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)
@@ -200,12 +205,12 @@ IndexLookup:
 			}
 			var readme []byte
 			for _, f := range append(cfg.Readmes, Readme) {
-				readme, _ = ioutil.ReadFile(path.Join(pth, f))
+				readme, _ = os.ReadFile(path.Join(pth, f))
 				if readme != nil {
 					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)
@@ -213,11 +218,16 @@ IndexLookup:
 			}
 			contentType = "text/html; charset=utf-8"
 		} else {
-			for _, index := range append(cfg.Indexes, Index) {
+			for _, index := range append(cfg.Indices, Index) {
 				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()
@@ -245,7 +255,7 @@ IndexLookup:
 		if meta4fi.Size() > meta4.MaxSize {
 			goto SkipMeta4
 		}
-		meta4Raw, err := ioutil.ReadFile(pth + meta4.Ext)
+		meta4Raw, err := os.ReadFile(pth + meta4.Ext)
 		if err != nil {
 			goto SkipMeta4
 		}
@@ -260,13 +270,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 +285,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)
 	}