From a896abbbe0843f764edcdb21297534bcb5d39fbe Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Sat, 4 Mar 2023 11:17:11 -0700 Subject: [PATCH] initial version with thumbnailing --- Dockerfile | 11 +++++++ build.sh | 7 +++++ cmd/webfs/main.go | 76 +++++++++++++++++++++++++++++++++++++++++++++++ go.mod | 8 +++++ go.sum | 30 +++++++++++++++++++ 5 files changed, 132 insertions(+) create mode 100644 Dockerfile create mode 100755 build.sh create mode 100644 cmd/webfs/main.go create mode 100644 go.mod create mode 100644 go.sum diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1ab4279 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM golang:1-bullseye AS build +RUN apt-get update +RUN apt-get -y --no-install-recommends install libavutil-dev libswscale-dev libavformat-dev libgraphicsmagick-dev +WORKDIR /src +COPY go.* ./ +COPY pkg ./pkg/ +COPY cmd ./cmd/ +COPY web /web +RUN go get ./... +RUN go install ./... +ENTRYPOINT ["/go/bin/simpleauth"] diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..a26f738 --- /dev/null +++ b/build.sh @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +tag=git.woozle.org/neale/webfs:latest + +docker buildx build --push --tag $tag $(dirname $0)/. diff --git a/cmd/webfs/main.go b/cmd/webfs/main.go new file mode 100644 index 0000000..93bd59d --- /dev/null +++ b/cmd/webfs/main.go @@ -0,0 +1,76 @@ +package main + +import ( + "bytes" + "context" + "flag" + "fmt" + "github.com/bakape/thumbnailer" + "golang.org/x/net/webdav" + "log" + "net/http" + "os" + "path" + "path/filepath" + "strconv" +) + +type Handler struct { + webdav.Handler +} + +func (h *Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) { + width, _ := strconv.Atoi(req.FormValue("w")) + height, _ := strconv.Atoi(req.FormValue("h")) + + if (width > 0) || (height > 0) { + h.ServeThumbnail(w, req, uint(width), uint(height)) + return + } + + h.Handler.ServeHTTP(w, req) +} + +func (h *Handler) ServeThumbnail(w http.ResponseWriter, req *http.Request, width uint, height uint) { + srcPath := path.Clean(req.URL.Path) + srcFile, err := h.FileSystem.OpenFile(context.Background(), srcPath, os.O_RDONLY, 0664) + if err != nil { + http.NotFound(w, req) + return + } + defer srcFile.Close() + srcFileInfo, err := srcFile.Stat() + if err != nil { + http.NotFound(w, req) + return + } + + var opts thumbnailer.Options + opts.ThumbDims.Width = width + opts.ThumbDims.Height = height + _, thumb, err := thumbnailer.Process(srcFile, opts) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + ext := "jpeg" + if thumb.IsPNG { + ext = "png" + } + fileName := filepath.Base(srcPath) + thumbFileName := fmt.Sprintf("%s.thumb.%s", fileName, ext) + thumbRs := bytes.NewReader(thumb.Image.Data) + http.ServeContent(w, req, thumbFileName, srcFileInfo.ModTime(), thumbRs) +} + +func main() { + address := flag.String("a", "localhost:8080", "Address to listen to.") + flag.Parse() + + handler := &Handler{} + handler.FileSystem = webdav.Dir(".") + handler.LockSystem = webdav.NewMemLS() + + log.Println("Listening on", *address) + http.ListenAndServe(*address, handler) +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..d39c0b4 --- /dev/null +++ b/go.mod @@ -0,0 +1,8 @@ +module woozle.org/neale/webfs + +go 1.15 + +require ( + github.com/bakape/thumbnailer v1.0.0 + golang.org/x/net v0.6.0 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..f87b4ff --- /dev/null +++ b/go.sum @@ -0,0 +1,30 @@ +github.com/bakape/thumbnailer v1.0.0 h1:fmaLCJ6sJ5wCAUmB3hhzgFAZ5G3cpueo3olI9N0ox3E= +github.com/bakape/thumbnailer v1.0.0/go.mod h1:PVB2nXXJHD4KAUWn9HaNKtWeDeAb9BFQ7oDOAdZCKUM= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=