diff options
| author | bptato <nincsnevem662@gmail.com> | 2023-12-12 22:06:46 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2023-12-12 22:07:07 +0100 |
| commit | bf761bcb6dcc5288a86aa5e8c2b67df3f0df056b (patch) | |
| tree | a2f4c0d47ed484bcca4daaaa11b4d862243019fe | |
| parent | 1df10adfe7eb20bc460eeb0e5a8e242970642c58 (diff) | |
| download | chawan-bf761bcb6dcc5288a86aa5e8c2b67df3f0df056b.tar.gz | |
Move gopher to adapter/
Also, move default urimethodmap config to res.
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | adapter/format/gopher2html.nim | 16 | ||||
| -rw-r--r-- | adapter/gophertypes.nim | 15 | ||||
| -rw-r--r-- | adapter/protocol/gopher.nim | 113 | ||||
| -rw-r--r-- | res/urimethodmap | 12 | ||||
| -rw-r--r-- | src/config/config.nim | 11 | ||||
| -rw-r--r-- | src/loader/gopher.nim | 149 | ||||
| -rw-r--r-- | src/loader/loader.nim | 5 |
8 files changed, 154 insertions, 181 deletions
@@ -43,7 +43,8 @@ FLAGS += --nimcache:"$(OBJDIR)/$(TARGET)" .PHONY: all all: $(OUTDIR_BIN)/cha $(OUTDIR_LIBEXEC)/gopher2html $(OUTDIR_CGI_BIN)/gmifetch \ $(OUTDIR_LIBEXEC)/gmi2html $(OUTDIR_CGI_BIN)/cha-finger $(OUTDIR_CGI_BIN)/about \ - $(OUTDIR_CGI_BIN)/data $(OUTDIR_CGI_BIN)/file $(OUTDIR_CGI_BIN)/ftp + $(OUTDIR_CGI_BIN)/data $(OUTDIR_CGI_BIN)/file $(OUTDIR_CGI_BIN)/ftp \ + $(OUTDIR_CGI_BIN)/gopher $(OUTDIR_BIN)/cha: lib/libquickjs.a src/*.nim src/**/*.nim res/* res/**/* @mkdir -p "$(OUTDIR)/$(TARGET)/bin" @@ -51,7 +52,8 @@ $(OUTDIR_BIN)/cha: lib/libquickjs.a src/*.nim src/**/*.nim res/* res/**/* $(FLAGS) -o:"$(OUTDIR_BIN)/cha" src/main.nim ln -sf "$(OUTDIR)/$(TARGET)/bin/cha" cha -$(OUTDIR_LIBEXEC)/gopher2html: adapter/format/gopher2html.nim src/utils/twtstr.nim +$(OUTDIR_LIBEXEC)/gopher2html: adapter/format/gopher2html.nim \ + src/utils/twtstr.nim adapter/gophertypes.nim $(NIMC) $(FLAGS) -o:"$(OUTDIR_LIBEXEC)/gopher2html" \ adapter/format/gopher2html.nim @@ -82,6 +84,12 @@ $(OUTDIR_CGI_BIN)/ftp: adapter/protocol/ftp.nim src/bindings/curl.nim \ src/types/opt.nim src/loader/connecterror.nim $(NIMC) $(FLAGS) -o:"$(OUTDIR_CGI_BIN)/ftp" adapter/protocol/ftp.nim +$(OUTDIR_CGI_BIN)/gopher: adapter/protocol/gopher.nim adapter/gophertypes.nim \ + src/bindings/curl.nim src/loader/dirlist.nim \ + src/utils/twtstr.nim src/types/url.nim src/types/opt.nim \ + src/loader/connecterror.nim + $(NIMC) $(FLAGS) -o:"$(OUTDIR_CGI_BIN)/gopher" adapter/protocol/gopher.nim + CFLAGS = -g -Wall -O2 -DCONFIG_VERSION=\"$(shell cat lib/quickjs/VERSION)\" QJSOBJ = $(OBJDIR)/quickjs @@ -161,6 +169,8 @@ uninstall: rm -f $(LIBEXECDIR_CHAWAN)/cgi-bin/data rm -f $(LIBEXECDIR_CHAWAN)/cgi-bin/gmifetch rm -f $(LIBEXECDIR_CHAWAN)/cgi-bin/cha-finger + rm -f $(LIBEXECDIR_CHAWAN)/cgi-bin/ftp + rm -f $(LIBEXECDIR_CHAWAN)/cgi-bin/gopher rmdir $(LIBEXECDIR_CHAWAN)/cgi-bin && rmdir $(LIBEXECDIR_CHAWAN) || true rm -f "$(DESTDIR)$(MANPREFIX5)/cha-config.5" rm -f "$(DESTDIR)$(MANPREFIX5)/cha-mailcap.5" diff --git a/adapter/format/gopher2html.nim b/adapter/format/gopher2html.nim index cfdeab1e..33cd564a 100644 --- a/adapter/format/gopher2html.nim +++ b/adapter/format/gopher2html.nim @@ -7,21 +7,7 @@ import std/strutils import utils/twtstr -type GopherType = enum - UNKNOWN = "unsupported" - TEXT_FILE = "text file" - ERROR = "error" - DIRECTORY = "directory" - DOS_BINARY = "DOS binary" - SEARCH = "search" - MESSAGE = "message" - SOUND = "sound" - GIF = "gif" - HTML = "HTML" - INFO = "" - IMAGE = "image" - BINARY = "binary" - PNG = "png" +include ../gophertypes func gopherType(c: char): GopherType = return case c diff --git a/adapter/gophertypes.nim b/adapter/gophertypes.nim new file mode 100644 index 00000000..dbc8d64d --- /dev/null +++ b/adapter/gophertypes.nim @@ -0,0 +1,15 @@ +type GopherType = enum + UNKNOWN = "unsupported" + TEXT_FILE = "text file" + ERROR = "error" + DIRECTORY = "directory" + DOS_BINARY = "DOS binary" + SEARCH = "search" + MESSAGE = "message" + SOUND = "sound" + GIF = "gif" + HTML = "HTML" + INFO = "" + IMAGE = "image" + BINARY = "binary" + PNG = "png" diff --git a/adapter/protocol/gopher.nim b/adapter/protocol/gopher.nim new file mode 100644 index 00000000..cf3038f7 --- /dev/null +++ b/adapter/protocol/gopher.nim @@ -0,0 +1,113 @@ +import std/envvars +import std/options + +import bindings/curl +import loader/connecterror +import loader/curlwrap +import loader/request +import types/opt +import types/url +import utils/twtstr + +include ../gophertypes + +type GopherHandle = ref object + curl: CURL + t: GopherType + statusline: bool + +func gopherType(c: char): GopherType = + return case c + of '0': TEXT_FILE + of '1': DIRECTORY + of '3': ERROR + of '5': DOS_BINARY + of '7': SEARCH + of 'm': MESSAGE + of 's': SOUND + of 'g': GIF + of 'h': HTML + of 'i': INFO + of 'I': IMAGE + of '9': BINARY + of 'p': PNG + else: UNKNOWN + +proc onStatusLine(op: GopherHandle) = + var status: clong + op.curl.getinfo(CURLINFO_RESPONSE_CODE, addr status) + stdout.write("Status: " & $status & "\n") + let s = case op.t + of DIRECTORY, SEARCH: "Content-Type: text/gopher\n" + of HTML: "Content-Type: text/html\n" + of GIF: "Content-Type: image/gif\n" + of PNG: "Content-Type: image/png\n" + of TEXT_FILE, ERROR: "Content-Type: text/plain\n" + else: "" + stdout.write(s & "\n") + +proc loadSearch(op: GopherHandle, surl: string) = + stdout.write(""" +Content-Type: text/html + +<!DOCTYPE HTML> +<HTML> +<HEAD> +<BASE HREF="""" & surl & """"> +</HEAD> +<BODY> +<H1>Search """ & htmlEscape(surl) & """</H1> +<FORM> +<INPUT TYPE=SEARCH NAME="NAME"> +</FORM> +</BODY> +</HTML> +""") + +# From the documentation: size is always 1. +proc curlWriteBody(p: cstring, size, nmemb: csize_t, userdata: pointer): + csize_t {.cdecl.} = + let op = cast[GopherHandle](userdata) + if not op.statusline: + op.statusline = true + op.onStatusLine() + return csize_t(stdout.writeBuffer(p, int(nmemb))) + +proc main() = + let curl = curl_easy_init() + doAssert curl != nil + if getEnv("REQUEST_METHOD") != "GET": + stdout.write("Cha-Control: ConnectionError " & $int(ERROR_INVALID_METHOD)) + return + var url = newURL(getEnv("QUERY_STRING")).get + var path = url.pathname + if path.len < 1: + path &= '/' + if path.len < 2: + path &= '1' + url = newURL(url) + url.setPathname(path) + let op = GopherHandle( + curl: curl, + t: gopherType(path[1]) + ) + if op.t == SEARCH: + if url.query.isNone: + op.loadSearch(url.serialize()) + return + else: + url.query = some(url.query.get.after('=')) + let surl = url.serialize() + #TODO avoid re-parsing + curl.setopt(CURLOPT_URL, surl) + curl.setopt(CURLOPT_WRITEDATA, op) + curl.setopt(CURLOPT_WRITEFUNCTION, curlWriteBody) + let proxy = getEnv("ALL_PROXY") + if proxy != "": + curl.setopt(CURLOPT_PROXY, proxy) + let res = curl_easy_perform(curl) + if res != CURLE_OK and not op.statusline: + stdout.write("Cha-Control: ConnectionError " & $int(res) & "\n") + curl_easy_cleanup(curl) + +main() diff --git a/res/urimethodmap b/res/urimethodmap new file mode 100644 index 00000000..bba78e82 --- /dev/null +++ b/res/urimethodmap @@ -0,0 +1,12 @@ +# Default urimethodmap file for Chawan. + +finger: cgi-bin:cha-finger +gemini: cgi-bin:gmifetch?%s +about: cgi-bin:about +data: cgi-bin:data +file: cgi-bin:file?%s +ftp: cgi-bin:ftp?%s +sftp: cgi-bin:sftp?%s +ftps: cgi-bin:ftps?%s +gopher: cgi-bin:gopher?%s +gophers: cgi-bin:gophers?%s diff --git a/src/config/config.nim b/src/config/config.nim index 79561c3a..eec0bffd 100644 --- a/src/config/config.nim +++ b/src/config/config.nim @@ -407,16 +407,7 @@ proc getMimeTypes*(config: Config): MimeTypes = return DefaultGuess return mimeTypes -const DefaultURIMethodMap = parseURIMethodMap(""" -finger: cgi-bin:cha-finger -gemini: cgi-bin:gmifetch?%s -about: cgi-bin:about -data: cgi-bin:data -file: cgi-bin:file?%s -ftp: cgi-bin:ftp?%s -sftp: cgi-bin:sftp?%s -ftps: cgi-bin:ftps?%s -""") +const DefaultURIMethodMap = parseURIMethodMap(staticRead"res/urimethodmap") proc getURIMethodMap*(config: Config): URIMethodMap = let configDir = getConfigDir() / "chawan" #TODO store this in config? diff --git a/src/loader/gopher.nim b/src/loader/gopher.nim deleted file mode 100644 index 5f27b213..00000000 --- a/src/loader/gopher.nim +++ /dev/null @@ -1,149 +0,0 @@ -import options - -import bindings/curl -import loader/connecterror -import loader/curlhandle -import loader/curlwrap -import loader/headers -import loader/loaderhandle -import loader/request -import types/url -import utils/twtstr - -type GopherType = enum - UNKNOWN = "unsupported" - TEXT_FILE = "text file" - ERROR = "error" - DIRECTORY = "directory" - DOS_BINARY = "DOS binary" - SEARCH = "search" - MESSAGE = "message" - SOUND = "sound" - GIF = "gif" - HTML = "HTML" - INFO = "" - IMAGE = "image" - BINARY = "binary" - PNG = "png" - -type GopherHandle = ref object of CurlHandle - t: GopherType - -func gopherType(c: char): GopherType = - return case c - of '0': TEXT_FILE - of '1': DIRECTORY - of '3': ERROR - of '5': DOS_BINARY - of '7': SEARCH - of 'm': MESSAGE - of 's': SOUND - of 'g': GIF - of 'h': HTML - of 'i': INFO - of 'I': IMAGE - of '9': BINARY - of 'p': PNG - else: UNKNOWN - -func newGopherHandle(curl: CURL, request: Request, handle: LoaderHandle, - t: GopherType): GopherHandle = - return GopherHandle( - curl: curl, - handle: handle, - request: request, - t: t - ) - -proc onStatusLine(op: GopherHandle): bool = - if not op.handle.sendResult(int(CURLE_OK)): - return false - var status: clong - op.curl.getinfo(CURLINFO_RESPONSE_CODE, addr status) - if not op.handle.sendStatus(cast[int](status)): - return false - let headers = case op.t - of DIRECTORY, SEARCH: - newHeaders({"Content-Type": "text/gopher"}) - of HTML: - newHeaders({"Content-Type": "text/html"}) - of GIF: - newHeaders({"Content-Type": "image/gif"}) - of PNG: - newHeaders({"Content-Type": "image/png"}) - of TEXT_FILE, ERROR: - newHeaders({"Content-Type": "text/plain"}) - else: - newHeaders() - if not op.handle.sendHeaders(headers): - return false - return true - -proc loadSearch(op: GopherHandle, surl: string) = - discard op.handle.sendResult(int(CURLE_OK)) - discard op.handle.sendStatus(200) # ok - discard op.handle.sendHeaders(newHeaders({"Content-Type": "text/html"})) - let heads = """ -<!DOCTYPE HTML> -<HTML> -<HEAD> -<BASE HREF="""" & $op.request.url & """"> -</HEAD> -<BODY> -<H1>Search """ & htmlEscape(surl) & """</H1> -<FORM> -<INPUT TYPE=SEARCH NAME="NAME"> -</FORM> -</BODY> -</HTML> -""" - discard op.handle.sendData(heads) - -# From the documentation: size is always 1. -proc curlWriteBody(p: cstring, size: csize_t, nmemb: csize_t, - userdata: pointer): csize_t {.cdecl.} = - let op = cast[GopherHandle](userdata) - if not op.statusline: - op.statusline = true - if not op.onStatusLine(): - return 0 - if not op.handle.sendData(p, int(nmemb)): - return 0 - return nmemb - -proc loadGopher*(handle: LoaderHandle, curlm: CURLM, - request: Request): CurlHandle = - let curl = curl_easy_init() - doAssert curl != nil - if request.httpmethod != HTTP_GET: - discard handle.sendResult(int(ERROR_INVALID_METHOD)) - return nil - var url = request.url - var path = url.pathname - if path.len < 1: - path &= '/' - if path.len < 2: - path &= '1' - url = newURL(url) - url.setPathname(path) - let t = gopherType(path[1]) - let op = curl.newGopherHandle(request, handle, t) - if t == SEARCH: - if url.query.isNone: - op.loadSearch(url.serialize()) - handle.close() - return nil - else: - url.query = some(url.query.get.after('=')) - let surl = url.serialize() - curl.setopt(CURLOPT_URL, surl) - curl.setopt(CURLOPT_WRITEDATA, op) - curl.setopt(CURLOPT_WRITEFUNCTION, curlWriteBody) - if request.proxy != nil: - let purl = request.proxy.serialize() - curl.setopt(CURLOPT_PROXY, purl) - let res = curl_multi_add_handle(curlm, curl) - if res != CURLM_OK: - discard handle.sendResult(int(res)) - return nil - return op diff --git a/src/loader/loader.nim b/src/loader/loader.nim index 13684301..2116a403 100644 --- a/src/loader/loader.nim +++ b/src/loader/loader.nim @@ -31,7 +31,6 @@ import js/javascript import loader/cgi import loader/connecterror import loader/curlhandle -import loader/gopher import loader/headers import loader/http import loader/loaderhandle @@ -140,10 +139,6 @@ proc loadResource(ctx: LoaderContext, request: Request, handle: LoaderHandle) = let handleData = handle.loadHttp(ctx.curlm, request) if handleData != nil: ctx.handleList.add(handleData) - of "gopher", "gophers": - let handleData = handle.loadGopher(ctx.curlm, request) - if handleData != nil: - ctx.handleList.add(handleData) of "cgi-bin": handle.loadCGI(request, ctx.config.cgiDir, prevurl) handle.close() |