No CSS

[godlighty.git] / handler.go

diff --git a/handler.go b/handler.go
index 1fcbb7e821a33b5f3156feb8a8fbe011f2c29a9d..81bd2aa1f399101d5a10ef06619ea80cd845c9f5 100644 (file)
--- a/handler.go
+++ b/handler.go
@@ -1,6 +1,6 @@
 /*
 godlighty -- highly-customizable HTTP, HTTP/2, HTTPS server
-Copyright (C) 2021-2022 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
@@ -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)
@@ -217,7 +222,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()
@@ -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)
        }