From 44aa04981e7146d5d178988af81948b47f1e1553 Mon Sep 17 00:00:00 2001 From: Trevor Slocum Date: Sun, 22 Nov 2020 17:54:44 -0800 Subject: [PATCH] Add index page --- README.md | 4 +- pkg/gmitohtml/assets.go | 22 ++++++ pkg/gmitohtml/convert.go | 129 +-------------------------------- pkg/gmitohtml/daemon.go | 153 +++++++++++++++++++++++++++++++++++++++ pkg/gmitohtml/doc.go | 4 + 5 files changed, 185 insertions(+), 127 deletions(-) create mode 100644 pkg/gmitohtml/daemon.go create mode 100644 pkg/gmitohtml/doc.go diff --git a/README.md b/README.md index 1a9a2f2..54bfdcf 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ # gmitohtml +[![GoDoc](https://gitlab.com/tslocum/godoc-static/-/raw/master/badge.svg)](https://docs.rocketnine.space/gitlab.com/tslocum/gmitohtml) [![CI status](https://gitlab.com/tslocum/gmitohtml/badges/master/pipeline.svg)](https://gitlab.com/tslocum/gmitohtml/commits/master) [![Donate](https://img.shields.io/liberapay/receives/rocketnine.space.svg?logo=liberapay)](https://liberapay.com/rocketnine.space) -[Gemini](https://gemini.circumlunar.space) to HTML conversion tool and daemon +[Gemini](https://gemini.circumlunar.space) to [HTML](https://en.wikipedia.org/wiki/HTML) +conversion tool and daemon ## Download diff --git a/pkg/gmitohtml/assets.go b/pkg/gmitohtml/assets.go index a978f71..5fd034e 100644 --- a/pkg/gmitohtml/assets.go +++ b/pkg/gmitohtml/assets.go @@ -2,6 +2,28 @@ package gmitohtml var fs = make(inMemoryFS) +const indexPage = ` + + + +Xenia + + + +

Welcome to Xenia


+
+ +
+
+ + + +` + func loadAssets() { fs["/assets/style.css"] = loadFile("style.css", ` /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ diff --git a/pkg/gmitohtml/convert.go b/pkg/gmitohtml/convert.go index 06dedf8..1540142 100644 --- a/pkg/gmitohtml/convert.go +++ b/pkg/gmitohtml/convert.go @@ -3,12 +3,8 @@ package gmitohtml import ( "bufio" "bytes" - "crypto/tls" "errors" "fmt" - "io/ioutil" - "log" - "net/http" "net/url" "path" "strings" @@ -74,6 +70,9 @@ func Convert(page []byte, u string) []byte { if l >= 7 && bytes.HasPrefix(line, []byte("=> ")) { split := bytes.SplitN(line[3:], []byte(" "), 2) + if len(split) != 2 { + split = bytes.SplitN(line[3:], []byte("\t"), 2) + } if len(split) == 2 { link := append([]byte(``)...) @@ -110,125 +109,3 @@ func Convert(page []byte, u string) []byte { result = append(result, []byte("\n\n")...) return result } - -// Fetch downloads and converts a Gemini page. -func fetch(u string, clientCertFile string, clientCertKey string) ([]byte, []byte, error) { - if u == "" { - return nil, nil, ErrInvalidURL - } - - requestURL, err := url.ParseRequestURI(u) - if err != nil { - return nil, nil, err - } - if requestURL.Scheme == "" { - requestURL.Scheme = "gemini" - } - - host := requestURL.Host - if strings.IndexRune(host, ':') == -1 { - host += ":1965" - } - - tlsConfig := &tls.Config{} - - conn, err := tls.Dial("tcp", host, tlsConfig) - if err != nil { - return nil, nil, err - } - - // Send request header - conn.Write([]byte(requestURL.String() + "\r\n")) - - data, err := ioutil.ReadAll(conn) - if err != nil { - return nil, nil, err - } - - firstNewLine := -1 - l := len(data) - if l > 2 { - for i := 1; i < l; i++ { - if data[i] == '\n' && data[i-1] == '\r' { - firstNewLine = i - break - } - } - } - var header []byte - if firstNewLine > -1 { - header = data[:firstNewLine] - data = data[firstNewLine+1:] - } - - if bytes.HasPrefix(header, []byte("text/html")) { - return header, data, nil - } - return header, Convert(data, requestURL.String()), nil -} - -func handleRequest(writer http.ResponseWriter, request *http.Request) { - defer request.Body.Close() - if request.URL == nil { - return - } - - pathSplit := strings.Split(request.URL.Path, "/") - if len(pathSplit) < 2 || pathSplit[1] != "gemini" { - writer.Write([]byte("Error: invalid protocol, only Gemini is supported")) - return - } - - u, err := url.ParseRequestURI("gemini://" + strings.Join(pathSplit[2:], "/")) - if err != nil { - writer.Write([]byte("Error: invalid URL")) - return - } - - header, data, err := fetch(u.String(), "", "") - if err != nil { - fmt.Fprintf(writer, "Error: failed to fetch %s: %s", u, err) - return - } - - if len(header) > 0 && header[0] == '3' { - split := bytes.SplitN(header, []byte(" "), 2) - if len(split) == 2 { - http.Redirect(writer, request, rewriteURL(string(split[1]), request.URL), http.StatusTemporaryRedirect) - return - } - } - - if len(header) > 3 && !bytes.HasPrefix(header[3:], []byte("text/gemini")) { - writer.Header().Set("Content-Type", string(header[3:])) - } else { - writer.Header().Set("Content-Type", "text/html; charset=utf-8") - } - - writer.Write(data) -} - -func handleAssets(writer http.ResponseWriter, request *http.Request) { - assetLock.Lock() - defer assetLock.Unlock() - - writer.Header().Set("Cache-Control", "max-age=86400") - - http.FileServer(fs).ServeHTTP(writer, request) -} - -// StartDaemon starts the page conversion daemon. -func StartDaemon(address string) error { - loadAssets() - - daemonAddress = address - - handler := http.NewServeMux() - handler.HandleFunc("/assets/style.css", handleAssets) - handler.HandleFunc("/", handleRequest) - go func() { - log.Fatal(http.ListenAndServe(address, handler)) - }() - - return nil -} diff --git a/pkg/gmitohtml/daemon.go b/pkg/gmitohtml/daemon.go new file mode 100644 index 0000000..3337f9f --- /dev/null +++ b/pkg/gmitohtml/daemon.go @@ -0,0 +1,153 @@ +package gmitohtml + +import ( + "bytes" + "crypto/tls" + "fmt" + "io/ioutil" + "log" + "net/http" + "net/url" + "strings" +) + +// Fetch downloads and converts a Gemini page. +func fetch(u string, clientCertFile string, clientCertKey string) ([]byte, []byte, error) { + if u == "" { + return nil, nil, ErrInvalidURL + } + + requestURL, err := url.ParseRequestURI(u) + if err != nil { + return nil, nil, err + } + if requestURL.Scheme == "" { + requestURL.Scheme = "gemini" + } + + host := requestURL.Host + if strings.IndexRune(host, ':') == -1 { + host += ":1965" + } + + tlsConfig := &tls.Config{ + // This must be enabled until most sites have transitioned away from + // using self-signed certificates. + InsecureSkipVerify: true, + } + + conn, err := tls.Dial("tcp", host, tlsConfig) + if err != nil { + return nil, nil, err + } + + // Send request header + conn.Write([]byte(requestURL.String() + "\r\n")) + + data, err := ioutil.ReadAll(conn) + if err != nil { + return nil, nil, err + } + + firstNewLine := -1 + l := len(data) + if l > 2 { + for i := 1; i < l; i++ { + if data[i] == '\n' && data[i-1] == '\r' { + firstNewLine = i + break + } + } + } + var header []byte + if firstNewLine > -1 { + header = data[:firstNewLine] + data = data[firstNewLine+1:] + } + + if bytes.HasPrefix(header, []byte("text/html")) { + return header, data, nil + } + return header, Convert(data, requestURL.String()), nil +} + +func handleIndex(writer http.ResponseWriter, request *http.Request) { + address := request.FormValue("address") + if address != "" { + http.Redirect(writer, request, rewriteURL(address, request.URL), http.StatusTemporaryRedirect) + return + } + + writer.Write([]byte(indexPage)) +} + +func handleRequest(writer http.ResponseWriter, request *http.Request) { + defer request.Body.Close() + if request.URL == nil { + return + } + + if request.URL.Path == "/" { + handleIndex(writer, request) + return + } + + pathSplit := strings.Split(request.URL.Path, "/") + if len(pathSplit) < 2 || pathSplit[1] != "gemini" { + writer.Write([]byte("Error: invalid protocol, only Gemini is supported")) + return + } + + u, err := url.ParseRequestURI("gemini://" + strings.Join(pathSplit[2:], "/")) + if err != nil { + writer.Write([]byte("Error: invalid URL")) + return + } + + header, data, err := fetch(u.String(), "", "") + if err != nil { + fmt.Fprintf(writer, "Error: failed to fetch %s: %s", u, err) + return + } + + if len(header) > 0 && header[0] == '3' { + split := bytes.SplitN(header, []byte(" "), 2) + if len(split) == 2 { + http.Redirect(writer, request, rewriteURL(string(split[1]), request.URL), http.StatusTemporaryRedirect) + return + } + } + + if len(header) > 3 && !bytes.HasPrefix(header[3:], []byte("text/gemini")) { + writer.Header().Set("Content-Type", string(header[3:])) + } else { + writer.Header().Set("Content-Type", "text/html; charset=utf-8") + } + + writer.Write(data) +} + +func handleAssets(writer http.ResponseWriter, request *http.Request) { + assetLock.Lock() + defer assetLock.Unlock() + + writer.Header().Set("Cache-Control", "max-age=86400") + + http.FileServer(fs).ServeHTTP(writer, request) +} + +// StartDaemon starts the page conversion daemon. +func StartDaemon(address string) error { + loadAssets() + + daemonAddress = address + + handler := http.NewServeMux() + handler.HandleFunc("/assets/style.css", handleAssets) + handler.HandleFunc("/", handleRequest) + go func() { + log.Fatal(http.ListenAndServe(address, handler)) + }() + + return nil +} diff --git a/pkg/gmitohtml/doc.go b/pkg/gmitohtml/doc.go new file mode 100644 index 0000000..70365b6 --- /dev/null +++ b/pkg/gmitohtml/doc.go @@ -0,0 +1,4 @@ +/* +Package gmitohtml converts Gemini pages to HTML. +*/ +package gmitohtml