Missing logging on successful gemini:// responses

[tofuproxy.git] / rounds / gemini.go

diff --git a/rounds/gemini.go b/rounds/gemini.go
index 43cf422f5db1600c832c678b503db0dfead8d6e6..b3ed3205f2aabdc974a75407285aba429a4babb2 100644 (file)
--- a/rounds/gemini.go
+++ b/rounds/gemini.go
@@ -1,6 +1,6 @@
 /*
-tofuproxy -- flexible HTTP proxy, TLS terminator, X.509 certificates
-             manager, WARC/Gemini browser
+tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
+             manager, WARC/geminispace browser
 Copyright (C) 2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
@@ -94,6 +94,12 @@ func RoundGemini(
        }
        paths := strings.Split(strings.TrimPrefix(req.URL.Path, "/"), "/")
        host, paths = paths[0], paths[1:]
+       if host == "gemini:" {
+               http.Redirect(w, req, strings.Join(
+                       append([]string{GeminiEntrypoint}, paths[1:]...), "/",
+               ), http.StatusTemporaryRedirect)
+               return false, nil
+       }
        hostWithPort := host
        if !strings.Contains(hostWithPort, ":") {
                hostWithPort += GeminiPort
@@ -157,27 +163,37 @@ func RoundGemini(
                )
                return false, nil
        }
+       msg := fmt.Sprintf(
+               "%s %s\t%d (%s)\t%s",
+               req.Method, req.URL,
+               code, codeName,
+               cols[1],
+       )
        if 40 <= code && code <= 49 {
                w.Header().Add("Content-Type", "text/plain")
                w.WriteHeader(http.StatusBadGateway)
                fmt.Fprintf(w, "%s\n%d (%s)\n", cols[1], code, codeName)
+               fifos.LogNonOK <- msg
                return false, nil
        }
        if 50 <= code && code <= 59 {
                w.Header().Add("Content-Type", "text/plain")
                w.WriteHeader(http.StatusBadGateway)
                fmt.Fprintf(w, "%s\n%d (%s)\n", cols[1], code, codeName)
+               fifos.LogNonOK <- msg
                return false, nil
        }
        if 60 <= code && code <= 69 {
                w.Header().Add("Content-Type", "text/plain")
                w.WriteHeader(http.StatusUnauthorized)
                fmt.Fprintf(w, "%s\n%d (%s)\n", cols[1], code, codeName)
+               fifos.LogNonOK <- msg
                return false, nil
        }
        if !(20 <= code && code <= 29) {
                err = fmt.Errorf("unknown response code: %d", code)
                log.Printf("%s: %s\n", req.URL, err)
+               fifos.LogNonOK <- msg
                return false, err
        }
        contentType := strings.Split(strings.TrimRight(cols[1], "\r\n"), ";")[0]
@@ -253,6 +269,7 @@ func RoundGemini(
                }
                buf.WriteString("</body></html>\n")
                _, err = w.Write(buf.Bytes())
+               fifos.LogOK <- msg
                return false, err
        }
        w.Header().Add("Content-Type", contentType)
@@ -261,5 +278,6 @@ func RoundGemini(
        if err != nil {
                log.Printf("%s: can not read response body: %+v\n", req.URL, err)
        }
+       fifos.LogOK <- msg
        return false, err
 }