// tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
// manager, WARC/geminispace browser
-// Copyright (C) 2021-2024 Sergey Matveev <stargrave@stargrave.org>
+// Copyright (C) 2021-2025 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
log.Printf("%s: can not read response: %+v\n", req.URL, err)
return false, err
}
- cols := strings.SplitN(rawResp, " ", 2)
+ cols := strings.SplitN(strings.TrimRight(rawResp, "\r\n"), " ", 2)
if len(cols) < 2 {
err = fmt.Errorf("invalid response format: %s", rawResp)
log.Printf("%s: %s\n", req.URL, err)
!strings.Contains(req.Header.Get("Accept"), ContentTypeGemini) {
w.Header().Add("Content-Type", "text/html")
w.WriteHeader(http.StatusOK)
- raw, err := io.ReadAll(br)
+ var raw []byte
+ raw, err = io.ReadAll(br)
if err != nil {
log.Printf("%s: can not read response body: %+v\n", req.URL, err)
return false, err
<html><head><title>%d (%s)</title></head><body>
`, code, codeName)
pre := false
- for _, line := range strings.Split(string(raw), "\n") {
+ for line := range strings.SplitSeq(string(raw), "\n") {
if strings.HasPrefix(line, "```") {
if pre {
buf.WriteString("</pre>\n")
if strings.HasPrefix(line, "=>") {
line = strings.TrimLeft(line[2:], " ")
cols = strings.Fields(line)
- u := geminifyURL(host, cols[0], paths...)
+ u1 := geminifyURL(host, cols[0], paths...)
+ u2 := geminifyURL(host, cols[0])
switch len(cols) {
case 1:
fmt.Fprintf(
- &buf, "<a href=\"%s\">%s</a><br/>\n",
- u, html.EscapeString(cols[0]),
+ &buf, "<a href=\"%s\">%s</a>",
+ u1, html.EscapeString(cols[0]),
)
+ if u1 != u2 {
+ fmt.Fprintf(&buf, " <a href=\"%s\">[2]</a>", u2)
+ }
+ fmt.Fprintf(&buf, "<br/>\n")
default:
fmt.Fprintf(
- &buf, "<a href=\"%s\">%s</a> (<tt>%s</tt>)<br/>\n",
- u, html.EscapeString(strings.Join(cols[1:], " ")), cols[0],
+ &buf, "<a href=\"%s\">%s</a>",
+ u1, html.EscapeString(strings.Join(cols[1:], " ")),
)
+ if u1 != u2 {
+ fmt.Fprintf(&buf, " <a href=\"%s\">[2]</a>", u2)
+ }
+ fmt.Fprintf(&buf, "(<tt>%s</tt>)<br/>\n", cols[0])
}
continue
}