vulncheck

.ansible/files/sour.is-paste.service

@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/local/bin/sour.is-paste
+ExecStart=/usr/local/bin/sour.is-paste serve
 User=www-data
 
 Restart=always

.ansible/playbook.yml

@@ -5,8 +5,9 @@
   tasks:
   - name: Copy build to remote
     ansible.builtin.copy:
-      src: ../build/sour.is-paste
+      src: ../sour.is-paste
       dest: /usr/local/bin/sour.is-paste
+      mode: u=rwx,g=rx,o=rx
       owner: root
       group: root
 
@@ -14,6 +15,7 @@
     ansible.builtin.copy:
       src: sour.is-paste.service
       dest: /etc/systemd/system/sour.is-paste.service
+      mode: u=r,g=r,o=r
       owner: root
       group: root
 

.drone.yml

@@ -1,49 +0,0 @@
----
-kind: pipeline
-type: exec
-name: default
-
-platform:
-    os: linux
-    arch: amd64
-
-steps:
-- name: Setup
-  commands:
-    - git fetch origin --tags
-    - make setup
-
-- name: Test
-  commands:
-    - make test
-
-trigger:
-  event:
-  - push
-  - pull_request
----
-kind: pipeline
-type: exec
-name: deploy
-
-platform:
-    os: linux
-    arch: amd64
-
-steps:
-- name: Setup
-  commands:
-    - git fetch origin --tags
-    - make setup
-
-- name: Build Release
-  commands:
-    - cd debian
-    - make tag
-    - make build
-    - make copy
-    - make deploy
-trigger:
-  event:
-  - promote
-...

.gitea/workflows/bump-push.yml

@@ -2,7 +2,7 @@ name: Go Bump
 
 on: 
   push:
-    branches: [ "main" ]
+    branches: [ "main", "master" ]
 
 jobs:
   bump:
@@ -20,6 +20,6 @@ jobs:
 
     - run: go install github.com/psanetra/git-semver/cli@master
 
-    - run: git tag v$(cli next --stable=false) && git push --tags || echo no change
+    - run: git tag v$(cli next) && git push --tags || echo no change
 
     - run: echo "🍏 This job's status is ${{ job.status }}."

.gitea/workflows/deploy.yml

@@ -1,8 +1,8 @@
 name: Deploy
 
 on:
-  push:
+  # push:
-    branches: [ "main" ]
+  #   branches: [ "master" ]
   release:
     types: [ published ]
 
@@ -11,26 +11,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-        fetch-tags: true
-
     - run: apt-get update && apt-get -y install ansible
 
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.21.1
+        go-version: 1.21.3
 
-    - name: Build
+    - name: Install
-      run: go build -ldflags "-s -w" -o ./build/sour.is-paste ./cmd/paste
+      run: go install -ldflags "-s -w" go.sour.is/paste/cmd/paste/v2@master
+
+    - run: mv $(go env GOPATH)/bin/paste sour.is-paste
 
     - name: Compress
       uses: https://git.sour.is/actions/ghaction-upx@v2.4.0
       with:
         version: latest
         files: |
-            ./build/sour.is-paste
+            ./sour.is-paste
         args: -fq
 
     - name: Deploy

.gitignore

@@ -1,3 +1 @@
-/paste
+/sour.is-paste
-/vendor
-/public

LICENSE

@@ -0,0 +1,11 @@
+Copyright 2023 Sour.is
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile

@@ -1,61 +1,35 @@
-ROUTE_ASSET=src/routes/bindata.go
+export LOG_DEBUG=1
-DOCS_ASSET=src/docs/bindata.go
+export HTTP_LISTEN=:8085
+export PASTE_STORE=data/paste/
+export ARTIFACT_STORE=data/artifact/
+export IMAGE_STORE=data/image/
 
-SOURCE=$(wildcard cmd/paste/*.go) $(filter-out src/routes/bindata.go, $(wildcard src/routes/*.go))
+SOURCE=$(wildcard *.go) $(wildcard paste/*.go) $(wildcard assets/*.go)
-BINARY=paste
+ASSETS=$(wildcard assets/*) $(wildcard assets/public/*) $(wildcard assets/src/*) $(wildcard assets/src/paste/*) 
-PKG=./cmd/paste
+ASSET_FILE=assets/build/index.html
-
+BINARY=sour.is-paste
-VERSION=$(shell git describe --tags `git rev-list --tags --max-count=1`|cut -b2-)
-VERSION_PAT=$(shell debian/inc_version.sh -p $(VERSION))
-VERSION_MIN=$(shell debian/inc_version.sh -m $(VERSION))
-VERSION_MAJ=$(shell debian/inc_version.sh -M $(VERSION))
-DATE:=$(shell date -u +%FT%TZ)
-
-define DUMMY_BINDATA
-package docs
-import "net/http"
-func assetFS() (fs http.FileSystem) { return }
-endef
-export DUMMY_BINDATA
 
 all: $(BINARY)
 clean:
 	rm -rf $(BINARY)
-
 setup:
-	go mod download
+	cd assets; npm i
 fmt:
 	go fmt ./...
-test: $(ROUTE_ASSET) $(DOCS_ASSET)
+test:
 	go test ./...
 	go vet ./...
-run:
+run: $(BINARY)
-	go run \
+	go run .
-	  -ldflags "-X main.AppVersion=$(VERSION_PAT) -X main.AppBuild=$(DATE)" \
-	  $(PKG) -vv serve
 
-$(BINARY): $(SOURCE) $(ROUTE_ASSET) $(DOCS_ASSET)
+build-assets: $(ASSET_FILE)
-	go build -v \
+${ASSET_FILE}: $(ASSETS)
-        -ldflags "-X main.AppVersion=$(VERSION) -X main.AppBuild=$(DATE)" \
-      "sour.is/x/paste/cmd/paste"
-
-clean-ui:
-	rm -rf $(ROUTE_ASSET) $(DOCS_ASSET)
-build-ui: clean-ui $(ROUTE_ASSET) $(DOCS_ASSET)
-$(ROUTE_ASSET):
 	cd assets; \
-	rm -rf build ../public; \
+	npm run build
-		npm i; npm run build; \
-	cp -r build ../public
-	go generate "sour.is/x/paste/src/routes"
 
-$(DOCS_ASSET):
+build:  $(BINARY)
-	echo "$$DUMMY_BINDATA" > src/docs/bindata.go
+$(BINARY): $(SOURCE) $(ASSET_FILE)
-	go generate "sour.is/x/paste/cmd/paste"
+	go build -o $(BINARY) .
-	go generate "sour.is/x/paste/src/docs"
 
-deploy: $(SOURCE) $(ROUTE_ASSET)
+.PHONEY: all clean build run setup
-	cd debian && make
-
-.PHONEY: all clean build deploy run setup
 # DO NOT DELETE

app.artifact.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"context"
+
+	"go.sour.is/paste/v2/artifact"
+	"go.sour.is/pkg/env"
+	"go.sour.is/pkg/lg"
+	"go.sour.is/pkg/service"
+)
+
+var _ = apps.Register(40, func(ctx context.Context, svc *service.Harness) error {
+	_, span := lg.Span(ctx)
+	defer span.End()
+
+	store := env.Default("ARTIFACT_STORE", "data/")
+
+	a, err := artifact.New(store, -1)
+	if err != nil {
+		return err
+	}
+	svc.Add(a)
+	span.AddEvent("register artifact")
+
+	return nil
+})

app.favicon.go

@@ -0,0 +1,39 @@
+package main
+
+import (
+	"context"
+	"embed"
+	"io/fs"
+	"net/http"
+
+	"go.sour.is/pkg/lg"
+	"go.sour.is/pkg/service"
+)
+
+var _ = apps.Register(10, func(ctx context.Context, svc *service.Harness) error {
+	_, span := lg.Span(ctx)
+	defer span.End()
+
+	svc.Add(&favicon{})
+
+	return nil
+})
+
+//go:embed favicon/*
+var faviconAsset embed.FS
+
+type favicon struct{}
+
+func (favicon) RegisterHTTP(mux *http.ServeMux) {
+	dir, _ := fs.Sub(faviconAsset, "favicon")
+	srv := http.FileServer(http.FS(dir))
+
+	mux.Handle("/favicon.ico", srv)
+	mux.Handle("/favicon.txt", srv)
+	mux.Handle("/favicon-16x16.png", srv)
+	mux.Handle("/favicon-32x32.png", srv)
+	mux.Handle("/android-chrome-192x192.png", srv)
+	mux.Handle("/android-chrome-512x512.png", srv)
+	mux.Handle("/apple-touch-icon.png", srv)
+	mux.Handle("/site.webmanifest", srv)
+}

app.image.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"context"
+
+	"go.sour.is/paste/v2/image"
+	"go.sour.is/pkg/env"
+	"go.sour.is/pkg/lg"
+	"go.sour.is/pkg/service"
+)
+
+var _ = apps.Register(40, func(ctx context.Context, svc *service.Harness) error {
+	_, span := lg.Span(ctx)
+	defer span.End()
+
+	store := env.Default("IMAGE_STORE", "data/")
+
+	a, err := image.New(ctx, store, -1)
+	if err != nil {
+		return err
+	}
+	svc.Add(a)
+	span.AddEvent("register image")
+
+	return nil
+})

app.info.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"go.sour.is/pkg/lg"
+	"go.sour.is/pkg/service"
+)
+
+var _ = apps.Register(50, func(ctx context.Context, svc *service.Harness) error {
+	_, span := lg.Span(ctx)
+	defer span.End()
+
+	svc.Add(&info{})
+
+	return nil
+})
+
+type info struct{}
+
+func (info) RegisterHTTP(mux *http.ServeMux) {
+	mux.HandleFunc("/app-info", func(w http.ResponseWriter, r *http.Request) {
+		name, version := service.AppName()
+		fmt.Fprint(w, name, '@', version)
+	})
+
+}

app.paste.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"context"
+	"strconv"
+
+	"go.sour.is/pkg/env"
+	"go.sour.is/pkg/lg"
+	"go.sour.is/pkg/service"
+
+	"go.sour.is/paste/v2/paste"
+)
+
+var _ = apps.Register(50, func(ctx context.Context, svc *service.Harness) error {
+	_, span := lg.Span(ctx)
+	defer span.End()
+
+	store := env.Default("PASTE_STORE", "data/")
+	randBytes, err := strconv.ParseInt(env.Default("PASTE_RANDOM", "4096"), 10, 32)
+	if err != nil {
+		return err
+	}
+
+	srv, err := paste.NewService(store, randBytes)
+	if err != nil {
+		return err
+	}
+
+	svc.Add(srv)
+
+	return nil
+})

artifact/artifact.go

@@ -0,0 +1,316 @@
+package artifact
+
+import (
+	"archive/tar"
+	"crypto/sha256"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+
+	"go.sour.is/paste/src/pkg/readutil"
+	"golang.org/x/sys/unix"
+	"sour.is/x/toolbox/httpsrv"
+	"sour.is/x/toolbox/log"
+
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/html"
+	"github.com/gomarkdown/markdown/parser"
+)
+
+// artifact stores items to disk
+type artifact struct {
+	store   string
+	maxSize int64
+}
+
+const DefaultMaxSize = 500 * 1024 * 1024
+
+func New(store string, maxSize int64) (a *artifact, err error) {
+	a = &artifact{
+		store:   store,
+		maxSize: DefaultMaxSize,
+	}
+
+	if maxSize > 0 {
+		a.maxSize = maxSize
+	}
+
+	if !chkStore(a.store) {
+		return nil, fmt.Errorf("artifact Store location [%s] does not exist or is not writable", a.store)
+	}
+
+	return a, nil
+}
+
+func (a *artifact) RegisterHTTP(mux *http.ServeMux) {
+	mux.Handle("/a", http.StripPrefix("/a", a))
+	mux.Handle("/a/", http.StripPrefix("/a/", a))
+}
+func (a *artifact) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		if r.URL.Path == "" {
+			a.list(w)
+			return
+		}
+
+		name := strings.TrimPrefix(r.URL.Path, "/")
+		name, path, _ := strings.Cut(name, "/")
+
+		a.get(w, name, path)
+	case http.MethodPost:
+		length := 0
+		if h := r.Header.Get("Content-Length"); h != "" {
+			if i, err := strconv.Atoi(h); err != nil {
+				length = i
+			}
+		}
+		id, err := a.put(r.Body, length)
+		switch {
+		case errors.Is(err, ErrGone):
+			w.WriteHeader(http.StatusGone)
+		case errors.Is(err, ErrNotFound):
+			w.WriteHeader(http.StatusNotFound)
+		case errors.Is(err, ErrReadingContent):
+			w.WriteHeader(http.StatusInternalServerError)
+		}
+
+		fmt.Fprintf(w, "OK %s", id)
+
+	default:
+		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+	}
+}
+func (a *artifact) get(w http.ResponseWriter, name string, path string) error {
+	hasPath := path != ""
+
+	ext := filepath.Ext(name)
+	id := strings.TrimSuffix(name, ext)
+
+	fname := filepath.Join(a.store, id)
+
+	if !chkFile(fname) {
+		return fmt.Errorf("%w: %s", ErrNotFound, fname)
+	}
+
+	if chkGone(fname) {
+		return fmt.Errorf("%w: %s", ErrGone, fname)
+	}
+
+	f, err := os.Open(fname)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	if !hasPath {
+		pr := readutil.NewPreviewReader(f)
+
+		mime, err := readutil.ReadMIME(pr, name)
+		if err != nil {
+			return err
+		}
+		w.Header().Set("Content-Type", mime)
+		w.Header().Set("X-Content-Type-Options", "nosniff")
+
+		_, _ = io.Copy(w, pr.Drain())
+		return nil
+	}
+
+	rdr, err := readutil.Decompress(f)
+	if err != nil && err != readutil.ErrUnsupportedType {
+		return fmt.Errorf("%w: %w", ErrReadingContent, err)
+	}
+	if cl, ok := rdr.(io.ReadCloser); ok {
+		defer cl.Close()
+	}
+
+	tr := tar.NewReader(rdr)
+	if path == "@" {
+		var paths []string
+		for {
+			hdr, err := tr.Next()
+			if err == io.EOF {
+				break // End of archive
+			}
+			if err != nil {
+				log.Error(err)
+			}
+			paths = append(paths, hdr.Name)
+		}
+
+		httpsrv.WriteObject(w, http.StatusOK, paths)
+		return nil
+	}
+
+	for {
+		hdr, err := tr.Next()
+		if err == io.EOF {
+			break // End of archive
+		}
+		if err != nil {
+			log.Error(err)
+			break
+		}
+		if path == "~" && hdr.Name == "index.html" {
+			path = hdr.Name
+		}
+		if path == "~" && hdr.Name == "index.md" {
+			path = hdr.Name
+		}
+
+		if hdr.Name == path {
+			if strings.HasSuffix(hdr.Name, ".md") {
+				md, err := io.ReadAll(tr)
+				if err != nil {
+					return fmt.Errorf("%w: %w", ErrReadingContent, err)
+				}
+
+				w.Header().Set("Content-Type", "text/html")
+				extensions := parser.CommonExtensions | parser.AutoHeadingIDs
+				p := parser.NewWithExtensions(extensions)
+
+				htmlFlags := html.CommonFlags | html.HrefTargetBlank
+				opts := html.RendererOptions{Flags: htmlFlags}
+				renderer := html.NewRenderer(opts)
+
+				b := markdown.ToHTML(md, p, renderer)
+				_, _ = w.Write(b)
+				return nil
+			}
+
+			pr := readutil.NewPreviewReader(tr)
+
+			mime, err := readutil.ReadMIME(pr, hdr.Name)
+			if err != nil {
+				return fmt.Errorf("%w: %w", ErrReadingContent, err)
+			}
+			w.Header().Set("Content-Type", mime)
+
+			if _, err := io.Copy(w, pr.Drain()); err != nil {
+				log.Error(err)
+			}
+			return nil
+		}
+	}
+
+	http.Error(w, "Not Found in Archive", http.StatusNotFound)
+	return ErrNotFound
+}
+func (a *artifact) put(r io.ReadCloser, length int) (string, error) {
+	defer r.Close()
+
+	if length > 0 {
+		if int64(length) > a.maxSize {
+			return "", ErrSizeTooLarge
+		}
+	}
+
+	rdr := io.LimitReader(r, a.maxSize)
+	pr := readutil.NewPreviewReader(rdr)
+	rdr = pr.Drain()
+
+	s256 := sha256.New()
+	tmp, err := os.CreateTemp(a.store, "arch-")
+	if err != nil {
+		return "", fmt.Errorf("%w: %w", ErrBadInput, err)
+	}
+
+	defer os.Remove(tmp.Name())
+
+	m := io.MultiWriter(s256, tmp)
+	if _, err := io.Copy(m, rdr); err != nil {
+		return "", fmt.Errorf("%w: %w", ErrBadInput, err)
+	}
+	tmp.Close()
+
+	id := base64.RawURLEncoding.EncodeToString(s256.Sum(nil)[12:])
+	fname := filepath.Join(a.store, id)
+
+	// log.Debugs("Artifact: moving file", "src", tmp.Name(), "dst", fname)
+	_ = os.Rename(tmp.Name(), fname)
+
+	return id, nil
+}
+func (a *artifact) list(w io.Writer) error {
+	return filepath.Walk(a.store, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.IsDir() {
+			return nil
+		}
+
+		_, err = fmt.Fprintln(w, "FILE: ", info.Name())
+		return err
+	})
+}
+
+func chkStore(path string) bool {
+	file, err := os.Stat(path)
+
+	if err != nil && os.IsNotExist(err) {
+		err = os.MkdirAll(path, 0744)
+		if err != nil {
+			return false
+		}
+
+		file, err = os.Stat(path)
+	}
+
+	if err != nil {
+		return false
+	}
+
+	if !file.IsDir() {
+		return false
+	}
+
+	if unix.Access(path, unix.W_OK&unix.R_OK) != nil {
+		return false
+	}
+
+	return true
+}
+func chkFile(path string) bool {
+	file, err := os.Stat(path)
+	if err != nil {
+		return false
+	}
+
+	if file.IsDir() {
+		return false
+	}
+
+	if unix.Access(path, unix.W_OK&unix.R_OK) != nil {
+		return false
+	}
+
+	return true
+}
+func chkGone(path string) bool {
+	file, err := os.Stat(path)
+	if err != nil {
+		return true
+	}
+
+	if file.Size() == 0 {
+		return true
+	}
+
+	return false
+}
+
+var (
+	ErrNotFound       = errors.New("not found")
+	ErrGone           = errors.New("gone")
+	ErrReadingContent = errors.New("reading content")
+	ErrSizeTooLarge   = errors.New("size too large")
+	ErrBadInput       = errors.New("bad input")
+)

assets/.gitignore

@@ -6,9 +6,6 @@
 # testing
 /coverage
 
-# production
-/build
-
 # misc
 .DS_Store
 .env.local

assets/assets.go

@@ -0,0 +1,19 @@
+package assets
+
+import (
+	"embed"
+	"fmt"
+	"io/fs"
+)
+
+//go:embed build/*
+var ui embed.FS
+
+func GetUI() fs.FS {
+	dir, err := fs.Sub(ui, "build")
+	if err != nil {
+		fmt.Println(err)
+		panic(err)
+	}
+	return dir
+}

assets/build/asset-manifest.json

@@ -0,0 +1,13 @@
+{
+  "files": {
+    "main.css": "/ui/static/css/main.d4025777.css",
+    "main.js": "/ui/static/js/main.939bead5.js",
+    "index.html": "/ui/index.html",
+    "main.d4025777.css.map": "/ui/static/css/main.d4025777.css.map",
+    "main.939bead5.js.map": "/ui/static/js/main.939bead5.js.map"
+  },
+  "entrypoints": [
+    "static/css/main.d4025777.css",
+    "static/js/main.939bead5.js"
+  ]
+}

assets/build/index.html

@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/ui/manifest.json"><link rel="shortcut icon" href="/ui/favicon.ico"><title>DN42 Paste</title><script defer="defer" src="/ui/static/js/main.939bead5.js"></script><link href="/ui/static/css/main.d4025777.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

assets/build/manifest.json

@@ -0,0 +1,15 @@
+{
+  "short_name": "DN42 Paste",
+  "name": "Paste tool for DN42",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": "/ui/index.html",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#000000"
+}

assets/build/static/css/main.d4025777.css

@@ -0,0 +1,2 @@
+body{font-family:sans-serif;margin:0;padding:0}body,html{background-color:#272b30!important;color:#000!important}header+section{padding-bottom:2.1em;padding-top:52px}footer{background-color:#3e444c;border-top:1px solid #bbb;bottom:0;height:2em;padding:4px;position:fixed;width:100%}footer span.left{float:left}footer span.right{float:right}.breadcrumb label,pre{color:#000}.sidebar .list-group{font-size:75%}.sidebar .list-group-item{background:#111;border:0;color:#62c462;padding:2px}.main,.sidebar .list-group-item{font-family:Hack,monospace}.sidebar a.list-group-item.active,.sidebar li.list-group-item.active{background-color:#62c462;color:#111}@media (min-width:768px){.hide-sm{display:none!important}.sidebar{left:0;width:24vw}.main,.sidebar{bottom:30px;overflow:auto;position:fixed;top:52px}.main{left:25vw;right:0}}@media (min-width:992px){.sidebar{left:0;width:24vw}.main,.sidebar{bottom:30px;overflow:auto;position:fixed;top:52px}.main{left:25vw;right:0}}section.container{margin-bottom:2em}code,pre,textarea{font-family:Fira Code,hack,Anonymous Pro,monospace}pre.grey{background-color:#d3d3d3}label{color:#d3d3d3}table a:link{color:#666}table a:link,table a:visited{font-weight:700;text-decoration:none}table a:visited{color:#999}table a:active,table a:hover{color:#bd5a35;text-decoration:underline}table{background:#eaebec;border:1px solid #ccc;border-radius:3px;box-shadow:0 1px 2px #d1d1d1;color:#666;font-family:Arial,Helvetica,sans-serif;font-size:12px;margin:20px;text-shadow:1px 1px 0 #fff}table th{background:#ededed;background:-moz-linear-gradient(top,#ededed,#ebebeb);border-bottom:1px solid #e0e0e0;border-top:1px solid #fafafa;padding:21px 25px 22px}table th:first-child{padding-left:20px;text-align:left}table tr:first-child th:first-child{border-top-left-radius:3px}table tr:first-child th:last-child{border-top-right-radius:3px}table tr{padding-left:20px;text-align:center}table td:first-child{border-left:0;padding-left:20px;text-align:left}table td{background:#fafafa;background:-moz-linear-gradient(top,#fbfbfb,#fafafa);border-bottom:1px solid #e0e0e0;border-left:1px solid #e0e0e0;border-top:1px solid #fff;padding:18px}table tr.even td{background:#f6f6f6;background:-moz-linear-gradient(top,#f8f8f8,#f6f6f6)}table tr:last-child td{border-bottom:0}table tr:last-child td:first-child{border-bottom-left-radius:3px}table tr:last-child td:last-child{border-bottom-right-radius:3px}table tr:hover td{background:#f2f2f2;background:-moz-linear-gradient(top,#f2f2f2,#f0f0f0)}.hljs{background:#f8f8f8;color:#333;display:block;overflow-x:auto;padding:.5em}.hljs-comment,.hljs-quote{color:#998;font-style:italic}.hljs-keyword,.hljs-selector-tag,.hljs-subst{color:#333;font-weight:700}.hljs-literal,.hljs-number,.hljs-tag .hljs-attr,.hljs-template-variable,.hljs-variable{color:teal}.hljs-doctag,.hljs-string{color:#d14}.hljs-section,.hljs-selector-id,.hljs-title{color:#900;font-weight:700}.hljs-subst{font-weight:400}.hljs-class .hljs-title,.hljs-type{color:#458;font-weight:700}.hljs-attribute,.hljs-name,.hljs-tag{color:navy;font-weight:400}.hljs-link,.hljs-regexp{color:#009926}.hljs-bullet,.hljs-symbol{color:#990073}.hljs-built_in,.hljs-builtin-name{color:#0086b3}.hljs-meta{color:#999;font-weight:700}.hljs-deletion{background:#fdd}.hljs-addition{background:#dfd}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}
+/*# sourceMappingURL=main.d4025777.css.map*/

assets/build/static/js/main.939bead5.js.LICENSE.txt

@@ -0,0 +1,57 @@
+/*!
+    * Bootstrap v4.1.3 (https://getbootstrap.com/)
+    * Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+    * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+    */
+
+/*! jQuery v3.3.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/parseXML,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-event/ajax,-effects,-effects/Tween,-effects/animatedSelector | (c) JS Foundation and other contributors | jquery.org/license */
+
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @preserve
+  (c) 2012 by Cédric Mesnil. All rights reserved.
+  	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  	    - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+      - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+  	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */

assets/package.json

@@ -1,18 +1,20 @@
 {
   "name": "paste",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
   "homepage": "https://paste.dn42.us/ui",
   "dependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "bootstrap": "^4.5.2",
     "bootstrap-4-react": "0.0.59",
     "crypto-js": "^4.0.0",
-    "react": "^16.9.0",
+    "pako": "^2.1.0",
-    "react-dom": "^16.9.0",
+    "react": "^18.2.0",
-    "react-highlight": "^0.12.0",
+    "react-dom": "^18.2.0",
-    "react-markdown": "^4.3.1",
+    "react-highlight": "^0.15.0",
-    "react-router-dom": "^5.2.0",
+    "react-markdown": "^9.0.0",
-    "react-scripts": "^3.1.1",
+    "react-router-dom": "^6.17.0",
+    "react-scripts": "^5.0.1",
     "seedrandom": "^3.0.5"
   },
   "scripts": {

assets/src/App.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { BrowserRouter, Route, Switch } from 'react-router-dom';
+import { BrowserRouter, Route, Routes } from 'react-router-dom';
 
 import './paste/Framework.css';
 
@@ -20,7 +20,7 @@ class App extends Component {
   }
 
 componentDidMount() {
-  req('https://paste.dn42.us/app-info').get()
+  req('/app-info').get()
   .then((response) => {
     if (response.ok) return response.text().catch(()=>"");
     else return "Unknown API"; })
@@ -30,20 +30,16 @@ componentDidMount() {
   render() {
     const {api, name} = this.state;
     return (
-      <BrowserRouter basename={'/ui'}>
+        <>
-        <React.Fragment key={1}>
           <section className="container-responsive">
-            <Switch>
+            <Paste />
-              <Route path={`/`} component={Paste} />
-            </Switch>
           </section>
 
           <footer>
             <span className="left text-muted">{name}</span>
             <span className="right text-muted">{api}</span>
           </footer>
-        </React.Fragment>
+        </>
-      </BrowserRouter>
     );
   }
 }

assets/src/paste/Paste.js

@@ -91,7 +91,7 @@ const blength = (o) => {
     return utf8length;
 };
 
-const PASTE_API = "https://paste.dn42.us/paste"
+const PASTE_API = (''+window.location).replace(/ui\/.*$/, 'paste');
 
 const syntaxItems = [
   ["text", "Plain Text"],
@@ -133,9 +133,7 @@ class Paste extends Component {
   constructor(props) {
     super(props);
 
-    const { location } = props;
+    const [ hash, key ] = window.location.hash.substring(2).split("!");
-
-    const [ hash, key ] = location.hash.substring(2).split("!");
 
     this.state = {
       error:      "",
@@ -202,17 +200,17 @@ class Paste extends Component {
   onSubmit(event) {
     event.preventDefault();
     const { plain } = this.state;
-    const { history } = this.props;
+    // const { history } = this.props;
 
-    this.encrypt(plain).then(([hash, decryptKey]) => { history.push('/#/' + hash + '!' + decryptKey) });
+    this.encrypt(plain).then(([hash, decryptKey]) => { history.pushState({}, '', '/ui/#/' + hash + '!' + decryptKey) });
   }
   onNew(event) {
-    const { history } = this.props;
+    // const { history } = this.props;
-    this.setState({cipher:"", plain:"", hash: "", decryptKey: "", syntax: "text", expire: 604800, burn: false}, () => history.push('/'));
+    this.setState({cipher:"", plain:"", hash: "", decryptKey: "", syntax: "text", expire: 604800, burn: false}, () => history.pushState({}, '', '/ui'));
   }
   onCopy(event) {
-    const { history } = this.props;
+    // const { history } = this.props;
-    this.setState({hash: "", decryptKey: ""}, () => history.push('/'))
+    this.setState({hash: "", decryptKey: ""}, () => history.pushState({}, '', '/ui'))
   }
 
   decrypt(tx) {
@@ -290,8 +288,7 @@ class Paste extends Component {
       req(`${PASTE_API}/${hash}`).get().then((res)=> res.ok ? res.text() : "").then(this.decrypt).catch();
   }
   componentWillReceiveProps(nextProps) {
-    const { location } = nextProps;
+    const { hash:nextHash } = window.location;
-    const { hash:nextHash } = location;
     const [ hash='', key='' ] = nextHash.substring(2).split("!");
 
     if (hash === this.state.hash) return;

cmd/paste/config.go

@@ -1,125 +0,0 @@
-package main
-
-import (
-	"bytes"
-
-	"github.com/docopt/docopt.go"
-	"github.com/spf13/viper"
-	"sour.is/x/toolbox/log"
-	"sour.is/x/toolbox/log/event"
-	_ "sour.is/x/toolbox/stats"
-)
-
-var (
-	// AppVersion Application Version Number
-	AppVersion string
-
-	// AppBuild Application Build Number
-	AppBuild string
-)
-
-// AppName name of the application
-var AppName = "Paste API"
-
-// AppUsage displays runtime options
-var AppUsage = `Paste API
-
-Usage:
-  paste version
-  paste [ -v | -vv ] serve
-
-Options:
-  -v                                             Log info to console.
-  -vv                                            Log debug to console.
-  -l <ListenAddress>, --listen=<ListenAddress>   Address to listen on.
-  -c <ConfigDir>, --config=<ConfigDir>           Set Config Directory.
-
-Config:
-  The config file is read from the following locations:
-    - <ConfigDir>
-    - /etc/opt/sour.is/paste/
-    - Working Directory
-`
-var defaultConfig = `
-[http]
-listen   = ":9010"
-base_url = "https//paste.dn42.us"
-cors = [
-	"http://localhost",
-	"https://sour.is",
-]
-
-[module.paste]
-random = "4096"
-store = "data/paste"
-
-[module.artifact]
-store = "data/artifact"
-
-[module.image]
-store = "data/image"
-
-[module.short]
-index = "data/meta"
-value = "data/meta"
-
-`
-
-var args map[string]interface{}
-
-func init() {
-	var err error
-
-	viper.Set("app.name", AppName)
-	viper.SetDefault("app.version", "VERSION")
-	if AppVersion != "" {
-		viper.Set("app.version", AppVersion)
-	}
-	viper.SetDefault("app.build", "SNAPSHOT")
-	if AppBuild != "" {
-		viper.Set("app.build", AppBuild)
-	}
-
-	if args, err = docopt.ParseDoc(AppUsage); err != nil {
-		log.Fatal(err)
-	}
-
-	if args["-v"].(int) == 1 {
-		log.SetVerbose(event.VerbInfo)
-		log.Info("Verbose Logging.")
-	}
-	if args["-v"].(int) == 2 {
-		log.SetVerbose(event.VerbDebug)
-		log.Debug("Very Verbose Logging.")
-	}
-
-	log.Printf("%s (%s %s)\n",
-		viper.GetString("app.name"),
-		viper.GetString("app.version"),
-		viper.GetString("app.build"))
-
-	if args["serve"] == true {
-
-		viper.SetConfigName("config")
-		if args["--config"] != nil {
-			viper.AddConfigPath(args["--config"].(string))
-		}
-
-		viper.AddConfigPath("/etc/opt/sour.is/paste/")
-		viper.AddConfigPath(".")
-
-		viper.SetConfigType("toml")
-		_ = viper.ReadConfig(bytes.NewBuffer([]byte(defaultConfig)))
-
-		err = viper.MergeInConfig()
-		if err != nil { // Handle errors reading the config file
-			log.Warningf("config file not found: %s \n", err)
-		} else {
-			log.Notice("Read config from: ", viper.ConfigFileUsed())
-		}
-
-		if args["--listen"] != nil {
-			viper.Set("http.listen", args["--listen"].(string))
-		}
-	}
-}

cmd/paste/cors.go

@@ -1,35 +0,0 @@
-package main
-
-import (
-	"net/http"
-
-	"sour.is/x/toolbox/httpsrv"
-	"sour.is/x/toolbox/ident"
-)
-
-func init() {
-	httpsrv.NewMiddleware("cors", doCORS).
-		Register(httpsrv.EventPreAuth)
-}
-
-func doCORS(_ string, w httpsrv.ResponseWriter, r *http.Request, _ ident.Ident) bool {
-	origin := r.Header.Get("origin")
-	headers := r.Header.Get("access-control-request-headers")
-
-	if origin != "" {
-		w.Header().Add("access-control-allow-origin", origin)
-	}
-
-	w.Header().Add("access-control-allow-methods", "GET, POST, PUT, DELETE, OPTIONS")
-	w.Header().Add("access-control-allow-credentials", "true")
-	w.Header().Add("access-control-max-age", "3600")
-	if headers != "" {
-		w.Header().Add("access-control-allow-headers", headers)
-	}
-
-	if r.Method == "OPTIONS" {
-		return false
-	}
-
-	return true
-}

cmd/paste/main.go

@@ -1,55 +0,0 @@
-// Package Paste API.
-//
-// the purpose of this application is to provide an application
-// that is using plain go code to define a paste API
-//
-// Terms Of Service:
-//
-// there are no TOS at this moment, use at your own risk we take no responsibility
-//
-//     Schemes: http, https
-//     Host: paste.sour.is
-//     BasePath: /
-//     Version: 0.0.1
-//     License: MIT http://opensource.org/licenses/MIT
-//     Contact: Xuu <me@sour.is> https://sour.is
-//
-//     Consumes:
-//     - application/json
-//     - text/plain
-//
-//     Produces:
-//     - application/json
-//     - text/plain
-//
-//
-// swagger:meta
-package main // import "sour.is/x/paste/cmd/paste"
-
-import (
-	"os"
-	"os/signal"
-	"syscall"
-
-	_ "sour.is/x/paste/src/docs"
-	_ "sour.is/x/paste/src/routes"
-	"sour.is/x/toolbox/httpsrv"
-	"sour.is/x/toolbox/log"
-)
-
-func main() {
-	if args["serve"] == true {
-		httpsrv.Run()
-
-		c := make(chan os.Signal, 1)
-		signal.Notify(c, syscall.SIGINT, syscall.SIGTERM)
-
-		s := <-c
-		log.Debugf("Got Signal %d", s)
-
-		httpsrv.Shutdown()
-		log.Debug("DONE")
-	}
-}
-
-//go:generate go run github.com/go-swagger/go-swagger/cmd/swagger generate spec -o ../../src/docs/public/swagger.json

debian/BUILD/.gitignore

@@ -1,2 +0,0 @@
-*
-!.git*

debian/Makefile

@@ -1,39 +0,0 @@
-NAME=sour.is-paste
-VERSION:=$(shell ./inc_version.sh -p $(shell git describe --tags `git rev-list --tags --max-count=1`)|cut -b2-)
-DATE:=$(shell date -u +%FT%TZ)
-
-REPO_HOST="xuu@kapha"
-ANSIBLE_HOST="kapha"
-REPO_PATH="/opt/web/pub/sour.is/debian/"
-
-all: build copy tag
-
-clean:
-	rm -r BUILD/*
-
-tag:
-	git tag -a -m "release version $(VERSION)" "v$(VERSION)"
-	git push --tags
-
-build:
-	export BUILD="BUILD/$(NAME)_$(VERSION)"; \
-	rm -rf ./$${BUILD}; \
-	cp -r ROOT "$${BUILD}"; \
-	sed -i'.tmp' "s_Version:.*_Version: $(VERSION)_" "$${BUILD}/DEBIAN/control"
-
-	export DATE=`date -u +%FT%TZ`; \
-    export BUILD="BUILD/$(NAME)_$(VERSION)"; \
-    env GOOS=linux GOARCH=amd64 go build -v -o $${BUILD}/opt/sour.is/bin/paste \
-                -ldflags "-X main.AppVersion=$(VERSION) -X main.AppBuild=$(DATE)"\
-        sour.is/x/paste/cmd/paste && \
-	dpkg -b $${BUILD}
-
-copy:
-	export BUILD="BUILD/$(NAME)_$(VERSION)"; \
-	scp "$${BUILD}.deb" $(REPO_HOST):$(REPO_PATH); \
-	ssh $(REPO_HOST) -- $(REPO_PATH)scan.sh "$(REPO_PATH)$(NAME)_$(VERSION).deb";
-
-deploy:
-	ansible $(ANSIBLE_HOST) -u xuu -b -m apt -a "name=sour.is-paste update_cache=yes state=latest"
-
-.PHONY: clean tag build copy deploy

debian/ROOT/DEBIAN/control

@@ -1,8 +0,0 @@
-Package: sour.is-paste
-Version: 2.0.0-1
-Section: base
-Priority: optional
-Architecture: amd64
-Maintainer: xuu <me@sour.is>
-Description: Encrypted Paste Store
-  API and UI for storing encrypted pastes.

debian/ROOT/DEBIAN/postinst

@@ -1,17 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    configure)
-	systemctl daemon-reload
-
-	if systemctl is-enabled sour.is-paste.service; then
-                systemctl start sour.is-paste.service
-    fi
-
-	sudo chown -R root:root /opt/sour.is
-	sudo chown -R root:root /etc/opt/sour.is
-    ;;
-esac
-
-exit 0

debian/ROOT/DEBIAN/postrm

@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    remove)
-        if systemctl is-active sour.is-paste.service; then
-                systemctl stop sour.is-paste.service
-        fi
-    ;;
-
-    purge)
-        if systemctl is-enabled sour.is-paste.service; then
-                systemctl disable sour.is-paste.service
-        fi
-    ;;
-esac
-
-exit 0
-
-

debian/ROOT/DEBIAN/preinst

@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    install)
-        # do some magic
-        ;;
-
-    upgrade|abort-upgrade)
-        ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
-        ;;
-esac
-
-#DEBHELPER#
-
-exit 0

debian/ROOT/DEBIAN/prerm

@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-    remove|upgrade)
-        if systemctl is-active sour.is-paste.service; then
-                systemctl stop sour.is-paste.service
-        fi
-    ;;
-esac
-
-exit 0
-
-

debian/ROOT/etc/opt/sour.is/paste/config.toml-example

@@ -1,4 +0,0 @@
-[http]
-listen     = ":9010"
-
-

debian/ROOT/lib/systemd/system/sour.is-paste.service

@@ -1,16 +0,0 @@
-[Unit]
-Description=sour.is paste API
-After=syslog.target network.target
-  
-[Service]
-Type=simple
-User=www-data
-WorkingDirectory=/opt/sour.is/
-ExecStart=/opt/sour.is/bin/paste serve
-
-Restart=always
-RestartSec=30
-  
-[Install]
-WantedBy=multi-user.target
-

debian/inc_version.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# Increment a version string using Semantic Versioning (SemVer) terminology.
-
-# Parse command line options.
-
-while getopts ":Mmp" Option
-do
-  case $Option in
-    M ) major=true;;
-    m ) minor=true;;
-    p ) patch=true;;
-  esac
-done
-
-shift $(($OPTIND - 1))
-
-version=$1
-
-# Build array from version string.
-
-a=( ${version//./ } )
-
-# If version string is missing or has the wrong number of members, show usage message.
-
-if [ ${#a[@]} -ne 3 ]
-then
-  >&2 echo "usage: $(basename $0) [-Mmp] major.minor.patch"
-  exit 1
-fi
-
-# Increment version numbers as requested.
-
-if [ ! -z $major ]
-then
-  ((a[0]++))
-  a[1]=0
-  a[2]=0
-fi
-
-if [ ! -z $minor ]
-then
-  ((a[1]++))
-  a[2]=0
-fi
-
-if [ ! -z $patch ]
-then
-  ((a[2]++))
-fi
-
-echo "${a[0]}.${a[1]}.${a[2]}"

favicon/favicon.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following graphics from Twitter Twemoji:
+
+- Graphics Title: 1f4cb.svg
+- Graphics Author: Copyright 2020 Twitter, Inc and other contributors (https://github.com/twitter/twemoji)
+- Graphics Source: https://github.com/twitter/twemoji/blob/master/assets/svg/1f4cb.svg
+- Graphics License: CC-BY 4.0 (https://creativecommons.org/licenses/by/4.0/)

favicon/site.webmanifest

@@ -0,0 +1 @@
+{"name":"sour.is paste","short_name":"paste","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

go.mod

@@ -1,32 +1,65 @@
-module sour.is/x/paste
+module go.sour.is/paste/v2
 
-go 1.14
+go 1.21
 
 require (
-	github.com/99designs/gqlgen v0.12.2
+	github.com/gomarkdown/markdown v0.0.0-20230922105210-14b16010c2ee
-	github.com/andybalholm/brotli v1.0.0
-	github.com/dgraph-io/badger v1.6.2 // indirect
-	github.com/dgraph-io/ristretto v0.0.3 // indirect
-	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
-	github.com/docopt/docopt.go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/go-swagger/go-swagger v0.25.0
-	github.com/golang/gddo v0.0.0-20200831202555-721e228c7686 // indirect
-	github.com/golang/protobuf v1.4.3 // indirect
-	github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167
-	github.com/gorilla/mux v1.8.0
 	github.com/h2non/filetype v1.1.0
-	github.com/hashicorp/golang-lru v0.5.1
+	github.com/matryer/is v1.4.1
-	github.com/lucasb-eyer/go-colorful v1.0.3
+	github.com/rs/cors v1.6.0
-	github.com/remyoudompheng/go-liblzma v0.0.0-20190506200333-81bf2d431b96
+	go.opentelemetry.io/otel v1.18.0
-	github.com/sour-is/crypto v0.0.0-20201016232853-f42a24ba5a81
+	go.opentelemetry.io/otel/trace v1.18.0
-	github.com/sour-is/go-assetfs v1.0.0
+	go.sour.is/paste v0.0.0-20231022150928-96338f2f4441
-	github.com/spf13/viper v1.7.1
+	go.sour.is/pkg v0.0.6
-	github.com/timshannon/badgerhold v1.0.0
+	golang.org/x/sys v0.18.0
-	github.com/tv42/zbase32 v0.0.0-20190604154422-aacc64a8f915
-	github.com/vektah/dataloaden v0.3.0
-	go.uber.org/ratelimit v0.1.0
-	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
-	golang.org/x/net v0.0.0-20201029055024-942e2f445f3c // indirect
-	golang.org/x/sys v0.0.0-20201029080932-201ba4db2418
 	sour.is/x/toolbox v0.12.17
 )
+
+require (
+	github.com/andybalholm/brotli v1.0.4 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/magiconair/properties v1.8.1 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pelletier/go-toml v1.8.0 // indirect
+	github.com/prometheus/client_golang v1.17.0 // indirect
+	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/remyoudompheng/go-liblzma v0.0.0-20190506200333-81bf2d431b96 // indirect
+	github.com/spf13/afero v1.3.2 // indirect
+	github.com/spf13/cast v1.3.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.7.1 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/runtime v0.42.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.41.0 // indirect
+	go.opentelemetry.io/otel/metric v1.18.0
+	go.opentelemetry.io/otel/sdk v1.18.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v0.41.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/grpc v1.58.3 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
+	gopkg.in/ini.v1 v1.57.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)

go.sum

@@ -1,4 +1,3 @@
-cloud.google.com/go v0.16.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -13,284 +12,119 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2k
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/99designs/gqlgen v0.10.1/go.mod h1:IviubpnyI4gbBcj8IcxSSc/Q/+af5riwCmJmwF0uaPE=
-github.com/99designs/gqlgen v0.12.2 h1:aOdpsiCycFtCnAv8CAI1exnKrIDHMqtMzQoXeTziY4o=
-github.com/99designs/gqlgen v0.12.2/go.mod h1:7zdGo6ry9u1YBp/qlb2uxSU5Mt2jQKLcBETQiKk+Bxo=
-github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
-github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=
-github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
+github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/Masterminds/squirrel v0.0.0-20190511014652-b4b75d10d7bf/go.mod h1:yaPeOnPG5ZRwL9oKdTsO/prlkPbXWZlRVMQ/gGlzIuA=
-github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
-github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/agnivade/levenshtein v1.0.1 h1:3oJU7J3FGFmyhn8KHjmVaZCN5hxTr7GxgRue+sxIXdQ=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
-github.com/agnivade/levenshtein v1.0.3 h1:M5ZnqLOoZR8ygVq0FfkXsNOKzMCk0xRiow0R5+5VkQ0=
-github.com/agnivade/levenshtein v1.0.3/go.mod h1:4SFRZbbXWLF4MU1T9Qg0pGgH3Pjs+t6ie5efyrwRJXs=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
-github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDafo4=
+github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
-github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0 h1:jfIu9sQUG6Ig+0+Ap1h4unLjW6YQJpKZVmUzxsD4E/Q=
-github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdKJDJF9BV14lnkjHmOQgcvEKgtqs5a1N3LNdJhGE=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0=
-github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
-github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY=
-github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/bouk/monkey v1.0.0 h1:k6z8fLlPhETfn5l9rlWVE7Q6B23DoaqosTdArvNQRdc=
 github.com/bouk/monkey v1.0.0/go.mod h1:PG/63f4XEUlVyW1ttIeOJmJhhe1+t9EC/je3eTjvFhE=
-github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cgilling/dbstats v0.0.0-20150427045024-c9db8cf218e6/go.mod h1:fsf3+k/VvGOE9sF2B9d6PBcZOzQIlDJhn2LhBqF/4VY=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
-github.com/coreos/go-oidc v2.2.1+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
-github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgraph-io/badger v1.6.0 h1:DshxFxZWXUcO0xX476VJC07Xsr6ZCBVRHKZ93Oh7Evo=
-github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
-github.com/dgraph-io/badger v1.6.2 h1:mNw0qs90GVgGGWylh0umH5iag1j6n/PeJtNvL6KY/x8=
-github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE=
-github.com/dgraph-io/ristretto v0.0.2 h1:a5WaUrDa0qm0YrAAS1tUykT5El3kt62KNZZeMxQn3po=
-github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
-github.com/dgraph-io/ristretto v0.0.3 h1:jh22xisGBjrEVnRZ1DVTpBVQm0Xndu8sMl0CWDzSIBI=
-github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
-github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c h1:TUuUh0Xgj97tLMNtWtNvI9mIV6isjEb9lBMNv+77IGM=
-github.com/dgryski/trifles v0.0.0-20190318185328-a8d75aae118c/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
-github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docopt/docopt.go v0.0.0-20180111231733-ee0de3bc6815 h1:HMAfwOa33y82IaQEKQDfUCiwNlxtM1iw7HLM9ru0RNc=
-github.com/docopt/docopt.go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:l7JNRynTRuqe45tpIyItHNqZWTxywYjp87MWTOnU5cg=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fsnotify/fsnotify v1.4.3-0.20170329110642-4da3e2cfbabc/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-chi/chi v3.3.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik=
+github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU=
-github.com/go-openapi/analysis v0.19.10 h1:5BHISBAXOc/aJK25irLZnx2D3s6WyYaY9D4gmuz9fdE=
-github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ=
-github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
-github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-github.com/go-openapi/errors v0.19.6 h1:xZMThgv5SQ7SMbWtKFkCf9bBdvR2iEyw9k3zGZONuys=
-github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M=
-github.com/go-openapi/inflect v0.19.0 h1:9jCH9scKIbHeV9m12SmPilScz6krDxKRasNNSNPXu/4=
-github.com/go-openapi/inflect v0.19.0/go.mod h1:lHpZVlpIQqLyKwJ4N+YSc9hchQy/i12fJykb83CRBH4=
-github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
-github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
-github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
-github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
-github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
-github.com/go-openapi/jsonreference v0.19.4 h1:3Vw+rh13uq2JFNxgnMTGE1rnoieU9FmyE1gvnyylsYg=
-github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
-github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU=
-github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs=
-github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI=
-github.com/go-openapi/loads v0.19.5 h1:jZVYWawIQiA1NBnHla28ktg6hrcfTHsCE+3QLVRBIls=
-github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY=
-github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA=
-github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
-github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
-github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo=
-github.com/go-openapi/runtime v0.19.20 h1:J/t+QIjbcoq8WJvjGxRKiFBhqUE8slS9SbmD0Oi/raQ=
-github.com/go-openapi/runtime v0.19.20/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk=
-github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
-github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
-github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
-github.com/go-openapi/spec v0.19.8 h1:qAdZLh1r6QF/hI/gTq+TJTvsQUodZsM7KLqkAJdiJNg=
-github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
-github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU=
-github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY=
-github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
-github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
-github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
-github.com/go-openapi/strfmt v0.19.5 h1:0utjKrw+BAh8s57XE9Xz8DUBsVvPmRUB6styvl9wWIM=
-github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
-github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
-github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
-github.com/go-openapi/swag v0.19.9 h1:1IxuqvBUU3S2Bi4YC7tlP9SJF1gVpCvqN0T2Qof4azE=
-github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY=
-github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4=
-github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA=
-github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo=
-github.com/go-openapi/validate v0.19.10 h1:tG3SZ5DC5KF4cyt7nqLVcQXGj5A7mpaYkAcNPlDK+Yk=
-github.com/go-openapi/validate v0.19.10/go.mod h1:RKEZTUWDkxKQxN2jDT7ZnZi2bhZlbNMAuKvKB+IaGx8=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-stack/stack v1.6.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-swagger/go-swagger v0.25.0 h1:FxhyrWWV8V/A9P6GtI5szWordAdbb6Y0nqdY/y9So2w=
-github.com/go-swagger/go-swagger v0.25.0/go.mod h1:9639ioXrPX9E6BbnbaDklGXjNz7upAXoNBwL4Ok11Vk=
-github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 h1:l9rI6sNaZgNC0LnF3MiE+qTmyBA/tZAg1rtyrGbUMK0=
-github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013/go.mod h1:b65mBPzqzZWxOZGxSWrqs4GInLIn+u99Q9q7p+GKni0=
-github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
-github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
-github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
-github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
-github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
-github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
-github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
-github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
-github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
-github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
-github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
-github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
-github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
-github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
-github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
-github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
 github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/golang/gddo v0.0.0-20190815223733-287de01127ef/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4=
-github.com/golang/gddo v0.0.0-20200831202555-721e228c7686 h1:5vu7C+63KTbsSNnLhrgB98Sqy8MNVSW8FdhkcWA/3Rk=
-github.com/golang/gddo v0.0.0-20200831202555-721e228c7686/go.mod h1:sam69Hju0uq+5uvLJUMDlsKlQ21Vrs1Kd/1YFPNYdOU=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE=
+github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/lint v0.0.0-20170918230701-e5d664eb928e/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167 h1:LP/6EfrZ/LyCc+SXvANDrIJ4sP9u2NAtqyv6QknetNQ=
 github.com/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
+github.com/gomarkdown/markdown v0.0.0-20230922105210-14b16010c2ee h1:gvsnG+uIVkOue7HrYAG2ZnOdLoJTqsLyuBFJaU0kX4M=
+github.com/gomarkdown/markdown v0.0.0-20230922105210-14b16010c2ee/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.1.1-0.20171103154506-982329095285/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f h1:KMlcu9X58lhTA/KrfX8Bi1LQSO4pzoVjTiL3h4Jk+Zk=
 github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
-github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gregjones/httpcache v0.0.0-20170920190843-316c5e0ff04e/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
 github.com/h2non/filetype v1.1.0 h1:Or/gjocJrJRNK/Cri/TDEKFjAR+cfG6eK65NGYB6gBA=
 github.com/h2non/filetype v1.1.0/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
@@ -306,280 +140,191 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv
 github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
-github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/hcl v0.0.0-20170914154624-68e816d1c783/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
-github.com/inconshreveable/log15 v0.0.0-20170622235902-74a0988b5f80/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jmoiron/sqlx v0.0.0-20150110152746-69738bd20981/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
-github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
 github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/logrusorgru/aurora v0.0.0-20200102142835-e9ef32dff381/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
-github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac=
-github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/magiconair/properties v1.7.4-0.20170902060319-8d7837e64d3c/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/matryer/is v1.4.1 h1:55ehd8zaGABKLXQUe2awZ99BD/PTc2ls+KV/dXphgEQ=
-github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/matryer/is v1.4.1/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8=
-github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
-github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
-github.com/matryer/moq v0.0.0-20200106131100-75d0ddfc0007 h1:reVOUXwnhsYv/8UqjvhrMOu5CNT9UapHFLbQ2JcXsmg=
-github.com/matryer/moq v0.0.0-20200106131100-75d0ddfc0007/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.0.10-0.20170816031813-ad5389df28cd/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.2/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v0.0.0-20180203102830-a4e142e9c047/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/pelletier/go-toml v1.0.1-0.20170904195809-1d6b12b7cb29/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg=
-github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
 github.com/pelletier/go-toml v1.5.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
 github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw=
 github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
+github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
+github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/remyoudompheng/go-liblzma v0.0.0-20190506200333-81bf2d431b96 h1:J8J/cgLDRuqXJnwIrRDBvtl+LLsdg7De74znW/BRRq4=
 github.com/remyoudompheng/go-liblzma v0.0.0-20190506200333-81bf2d431b96/go.mod h1:90HvCY7+oHHUKkbeMCiHt1WuFR2/hPJ9QrljDG+v6ls=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
-github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
 github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
-github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/vfsgen v0.0.0-20180121065927-ffb13db8def0/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3 h1:hBSHahWMEgzwRyS6dRpxY0XyjZsHyQ61s084wo5PJe0=
 github.com/smartystreets/assertions v0.0.0-20190401211740-f487f9de1cd3/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v0.0.0-20170602164621-9e8dc3f972df h1:AawEzDdiSpy07QO9efSOHQ/BRincGLxilju4pOq3k8s=
 github.com/smartystreets/goconvey v0.0.0-20170602164621-9e8dc3f972df/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/sour-is/crypto v0.0.0-20201016232853-f42a24ba5a81 h1:7LadZJfye3tq1Dr5c46uy1ign6mQr2bAOlCJeAXpB1A=
-github.com/sour-is/crypto v0.0.0-20201016232853-f42a24ba5a81/go.mod h1:7/Of5cnNodFyJ6PH2C3STkdCRvqbhj9yA3BhQ/E62wA=
-github.com/sour-is/go-assetfs v1.0.0 h1:84Fd12qIAdZUOKjYIgsA1J27fcQF/JiSgiflz+2hqEA=
-github.com/sour-is/go-assetfs v1.0.0/go.mod h1:y4ShXMTRymi5OMvwbtfT3sxcRE72sx1ycYymT46JbRE=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
-github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/afero v0.0.0-20170901052352-ee1bd8ee15a1/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.3.2 h1:GDarE4TJQI52kYSbSAmLiId1Elfj+xgSDqrUZxFhxlU=
 github.com/spf13/afero v1.3.2/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/cast v1.1.0/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
-github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/jwalterweatherman v0.0.0-20170901151539-12bd96e66386/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.1-0.20170901120850-7aff26db30c1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.0.0/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
-github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
-github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
-github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk=
 github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
-github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/timshannon/badgerhold v1.0.0 h1:LtqnDRVP7294FWRiZCIfQa6Tt0bGmlzbO8c364QC2Y8=
-github.com/timshannon/badgerhold v1.0.0/go.mod h1:Vv2Jj0PAfzqViEpGvJzLP8PY07x1iXLgKRuLY7bqPOE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/toqueteos/webbrowser v1.2.0 h1:tVP/gpK69Fx+qMJKsLE7TD8LuGWPnEV71wBN9rrstGQ=
-github.com/toqueteos/webbrowser v1.2.0/go.mod h1:XWoZq4cyp9WeUeak7w7LXRUQf1F1ATJMir8RTqb4ayM=
-github.com/tv42/zbase32 v0.0.0-20190604154422-aacc64a8f915 h1:vX9DBbEHmrebYnVthUTzMO6Zc1vvConJdD2s0uvXrfw=
-github.com/tv42/zbase32 v0.0.0-20190604154422-aacc64a8f915/go.mod h1:Y5DJgF9Eou+hSWetC39Mns8E0PU7DykCLNWiYeOINrE=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
-github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k=
-github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
-github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e h1:+w0Zm/9gaWpEAyDlU1eKOuk5twTjAjuevXqcJJw8hrg=
 github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf/CZ089j8U=
-github.com/vektah/dataloaden v0.3.0 h1:ZfVN2QD6swgvp+tDqdH/OIT/wu3Dhu0cus0k5gIZS84=
-github.com/vektah/dataloaden v0.3.0/go.mod h1:/HUdMve7rvxZma+2ZELQeNh88+003LL7Pf/CZ089j8U=
-github.com/vektah/gqlparser v1.1.2 h1:ZsyLGn7/7jDNI+y4SEhI4yAxRChlv15pUHMjijT+e68=
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
-github.com/vektah/gqlparser v1.3.1 h1:8b0IcD3qZKWJQHSzynbDlrtP3IxVydZ2DZepCGofqfU=
-github.com/vektah/gqlparser v1.3.1/go.mod h1:bkVf0FX+Stjg/MHnm8mEyubuaArhNEqfQhF+OTiAL74=
-github.com/vektah/gqlparser/v2 v2.0.1 h1:xgl5abVnsd4hkN9rk65OJID9bfcLSMuTaTcZj777q1o=
-github.com/vektah/gqlparser/v2 v2.0.1/go.mod h1:SyUiHgLATUR8BiYURfTirrTcGpcE+4XkV2se04Px1Ms=
-github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
-github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yosssi/gmq v0.0.1 h1:GhlDVaAQoi3Mvjul/qJXXGfL4JBeE0GQwbWp3eIsja8=
 github.com/yosssi/gmq v0.0.1/go.mod h1:mReykazh0U1JabvuWh1PEbzzJftqOQWsjr0Lwg5jL1Y=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=
-go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE=
-go.mongodb.org/mongo-driver v1.3.5 h1:S0ZOruh4YGHjD7JoN7mIsTrNjnQbOjrmgrx6l6pZN7I=
-go.mongodb.org/mongo-driver v1.3.5/go.mod h1:Ual6Gkco7ZGQw8wE1t4tLnvBsf6yVSM60qW6TgOeJ5c=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 h1:KfYpVmrjI7JuToy5k8XV3nkapjWx48k4E4JOtVstzQI=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48=
+go.opentelemetry.io/contrib/instrumentation/runtime v0.42.0 h1:EbmAUG9hEAMXyfWEasIt2kmh/WmXUznUksChApTgBGc=
+go.opentelemetry.io/contrib/instrumentation/runtime v0.42.0/go.mod h1:rD9feqRYP24P14t5kmhNMqsqm1jvKmpx2H2rKVw52V8=
+go.opentelemetry.io/otel v1.18.0 h1:TgVozPGZ01nHyDZxK5WGPFB9QexeTMXEH7+tIClWfzs=
+go.opentelemetry.io/otel v1.18.0/go.mod h1:9lWqYO0Db579XzVuCKFNPDl4s73Voa+zEck3wHaAYQI=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 h1:IAtl+7gua134xcV3NieDhJHjjOVeJhXAnYf/0hswjUY=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0/go.mod h1:w+pXobnBzh95MNIkeIuAKcHe/Uu/CX2PKIvBP6ipKRA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0 h1:6pu8ttx76BxHf+xz/H77AUZkPF3cwWzXqAUsXhVKI18=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0/go.mod h1:IOmXxPrxoxFMXdNy7lfDmE8MzE61YPcurbUm0SMjerI=
+go.opentelemetry.io/otel/exporters/prometheus v0.41.0 h1:A3/bhjP5SmELy8dcpK+uttHeh9Qrh+YnS16/VzrztRQ=
+go.opentelemetry.io/otel/exporters/prometheus v0.41.0/go.mod h1:mKuXEMi9suyyNJQ99SZCO0mpWGFe0MIALtjd3r6uo7Q=
+go.opentelemetry.io/otel/metric v1.18.0 h1:JwVzw94UYmbx3ej++CwLUQZxEODDj/pOuTCvzhtRrSQ=
+go.opentelemetry.io/otel/metric v1.18.0/go.mod h1:nNSpsVDjWGfb7chbRLUNW+PBNdcSTHD4Uu5pfFMOI0k=
+go.opentelemetry.io/otel/sdk v1.18.0 h1:e3bAB0wB3MljH38sHzpV/qWrOTCFrdZF2ct9F8rBkcY=
+go.opentelemetry.io/otel/sdk v1.18.0/go.mod h1:1RCygWV7plY2KmdskZEDDBs4tJeHG92MdHZIluiYs/M=
+go.opentelemetry.io/otel/sdk/metric v0.41.0 h1:c3sAt9/pQ5fSIUfl0gPtClV3HhE18DCVzByD33R/zsk=
+go.opentelemetry.io/otel/sdk/metric v0.41.0/go.mod h1:PmOmSt+iOklKtIg5O4Vz9H/ttcRFSNTgii+E1KGyn1w=
+go.opentelemetry.io/otel/trace v1.18.0 h1:NY+czwbHbmndxojTEKiSMHkG2ClNH2PwmcHrdo0JY10=
+go.opentelemetry.io/otel/trace v1.18.0/go.mod h1:T2+SGJGuYZY3bjj5rgh/hN7KIrlpWC5nS8Mjvzckz+0=
+go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
+go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
+go.sour.is/paste v0.0.0-20231022150928-96338f2f4441 h1:9un6JVrufqnWGBKxYKSfgQlh1rV7HztT8Bns0YdyZDc=
+go.sour.is/paste v0.0.0-20231022150928-96338f2f4441/go.mod h1:ydiXZa7htkXTbifRHxUR+LppH3kXrN1XqPd19VSzPdI=
+go.sour.is/pkg v0.0.6 h1:tbE3zxl0WtCn7isPBWEEjZVzDhV8lWGU6qmfVR0t5gw=
+go.sour.is/pkg v0.0.6/go.mod h1:IKGL3C4IkY3HPA2txGjBi1JPOEU5PJOUzQwt+qYZBW0=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/ratelimit v0.1.0 h1:U2AruXqeTb4Eh9sYQSTrMhH8Cb7M0Ian2ibBOnBcnAw=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
-go.uber.org/ratelimit v0.1.0/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg=
-golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -598,12 +343,8 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -611,77 +352,56 @@ golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201029055024-942e2f445f3c h1:rpcgRPA7OvNEOdprt2Wx8/Re2cBTd8NPo/lvo3AyMqk=
-golang.org/x/net v0.0.0-20201029055024-942e2f445f3c/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/oauth2 v0.0.0-20170912212905-13449ad91cb2/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20170517211232-f52d1811a629/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.0.0-20201029080932-201ba4db2418 h1:HlFl4V6pEMziuLXyRkm5BIYq1y1GAbb02pRlWvI54OM=
-golang.org/x/sys v0.0.0-20201029080932-201ba4db2418/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/time v0.0.0-20170424234030-8be79e1e0910/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -689,33 +409,18 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd h1:oMEQDWVXVNpceQoVd1JN3CQ7LYJJzs5qWqZIUcxXHHw=
 golang.org/x/tools v0.0.0-20190515012406-7d7faa4812bd/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200114235610-7ae403b6b589/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6 h1:nULzSsKgihxFGLnQFv2T7lE5vIhOtg8ZPpJHapEt7o0=
-golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.0.0-20170921000349-586095a6e407/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -725,9 +430,6 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -737,54 +439,48 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWotvtrwxFNrNE9CUAGtplaDK5NNI/g=
-google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0=
+google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw=
+google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww=
 gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 sour.is/x/toolbox v0.12.17 h1:m+8fAl5dkuu2HsmkOuefb6tDFzpPq93xAAtZZvBxySk=

image/image.go

@@ -0,0 +1,364 @@
+package image
+
+import (
+	"context"
+	"crypto/sha256"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/h2non/filetype"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/trace"
+	"golang.org/x/sys/unix"
+
+	"go.sour.is/paste/src/pkg/readutil"
+	"go.sour.is/pkg/lg"
+)
+
+type image struct {
+	store   string
+	maxSize int64
+
+	m_image_get   metric.Int64Counter
+	m_image_post  metric.Int64Counter
+	m_image_error metric.Int64Counter
+}
+
+const DefaultMaxSize = 500 * 1024 * 1024
+
+func New(ctx context.Context, store string, maxSize int64) (a *image, err error) {
+	a = &image{
+		store:   store,
+		maxSize: DefaultMaxSize,
+	}
+
+	if maxSize > 0 {
+		a.maxSize = maxSize
+	}
+
+	if !chkStore(a.store) {
+		return nil, fmt.Errorf("image Store location [%s] does not exist or is not writable", a.store)
+	}
+
+	m := lg.Meter(ctx)
+
+	var merr error
+	a.m_image_get, merr = m.Int64Counter("m_image_get",
+		metric.WithDescription("retrieve image from store"),
+	)
+	err = errors.Join(err, merr)
+
+	a.m_image_post, merr = m.Int64Counter("m_image_post",
+		metric.WithDescription("save image to store"),
+	)
+	err = errors.Join(err, merr)
+
+	a.m_image_error, merr = m.Int64Counter("m_image_error",
+		metric.WithDescription("image api error"),
+	)
+	err = errors.Join(err, merr)
+
+	return a, err
+}
+func (a *image) RegisterHTTP(mux *http.ServeMux) {
+	mux.Handle("/i", http.StripPrefix("/i", a))
+	mux.Handle("/i/", http.StripPrefix("/i/", a))
+	mux.Handle("/3/upload", a)
+}
+func (a *image) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	ctx, span := lg.Span(ctx)
+	defer span.End()
+
+	switch r.Method {
+	case http.MethodGet, http.MethodHead:
+		a.m_image_get.Add(ctx, 1)
+
+		name := strings.TrimPrefix(r.URL.Path, "/")
+		if name != "" {
+			rdr, head, err := a.loadFile(ctx, name)
+			if err != nil {
+				a.m_image_error.Add(ctx, 1)
+				writeError(w, err)
+				span.RecordError(err)
+				return
+			}
+
+			defer rdr.Close()
+
+			w.Header().Set("X-Content-Type-Options", "nosniff")
+			w.Header().Set("Accept-Ranges", "bytes")
+			w.Header().Set("Content-Type", head.Mime)
+			w.Header().Set("ETag", head.ETag)
+			w.Header().Set("Last-Modified", head.Modified.Format(time.RFC850))
+
+			if r.Method == http.MethodHead {
+				return
+			}
+
+			// io.Copy(w, rdr)
+			http.ServeContent(w, r, "", head.Modified, rdr)
+
+			return
+		}
+
+	case http.MethodPost:
+		a.m_image_post.Add(ctx, 1)
+
+		var err error
+		defer r.Body.Close()
+
+		// var buf bytes.Buffer
+		// r.Body = io.NopCloser(io.TeeReader(r.Body, &buf))
+
+		var fd io.ReadCloser = r.Body
+		if r.URL.Path == "/3/upload" {
+			span.AddEvent("Imgur Emulation")
+			if data := r.FormValue("image"); data != "" {
+				var rdr io.Reader = strings.NewReader(data)
+				if t := r.FormValue("type"); t == "base64" {
+					rdr = base64.NewDecoder(base64.StdEncoding, rdr)
+				}
+				fd = io.NopCloser(rdr)
+			} else if mp, hd, err := r.FormFile("image"); err == nil {
+				defer mp.Close()
+				span.AddEvent(fmt.Sprint(hd))
+				fd = mp
+			} else if mp, hd, err := r.FormFile("file"); err == nil {
+				defer mp.Close()
+				span.AddEvent(fmt.Sprint(hd))
+				fd = mp
+			} else if err != nil {
+				span.RecordError(err)
+				w.WriteHeader(http.StatusBadRequest)
+				return
+			}
+		} else {
+			w.WriteHeader(http.StatusCreated)
+		}
+
+		length := 0
+		if h := r.Header.Get("Content-Length"); h != "" {
+			if i, err := strconv.Atoi(h); err != nil {
+				length = i
+			}
+		}
+		id, err := a.put(ctx, fd, length)
+		if err != nil {
+			a.m_image_error.Add(ctx, 1)
+			writeError(w, err)
+			span.RecordError(err)
+			return
+		}
+
+		type data struct {
+			Link       string `json:"link"`
+			DeleteHash string `json:"deletehash"`
+		}
+		var resp = struct {
+			Data    data `json:"data"`
+			Success bool `json:"success"`
+			Status  int  `json:"status"`
+		}{
+			Data: data{
+				Link: fmt.Sprintf("https://%s/i/%s", r.Host, id),
+			},
+			Success: true,
+			Status:  200,
+		}
+
+		err = json.NewEncoder(w).Encode(resp)
+		span.RecordError(err)
+
+	default:
+		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+	}
+}
+
+func (a *image) loadFile(ctx context.Context, name string) (io.ReadSeekCloser, *Header, error) {
+	_, span := lg.Span(ctx)
+	defer span.End()
+
+	ext := filepath.Ext(name)
+	id := strings.TrimSuffix(name, ext)
+
+	fname := filepath.Join(a.store, id)
+
+	if !chkFile(fname) {
+		return nil, nil, fmt.Errorf("%w: %s", ErrNotFound, fname)
+	}
+
+	if chkGone(fname) {
+		return nil, nil, fmt.Errorf("%w: %s", ErrGone, fname)
+	}
+
+	f, err := os.Open(fname)
+	if err != nil {
+		return nil, nil, err
+	}
+	stat, err := f.Stat()
+	if err != nil {
+		return nil, nil, err
+	}
+
+	pr := readutil.NewPreviewReader(f)
+
+	mime, err := readutil.ReadMIME(pr, name)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	f.Seek(0, 0)
+
+	return f,
+		&Header{Mime: mime, Modified: stat.ModTime(), ETag: name},
+		nil
+}
+
+func (a *image) put(ctx context.Context, r io.ReadCloser, length int) (string, error) {
+	_, span := lg.Span(ctx)
+	defer span.End()
+
+	defer r.Close()
+
+	span.AddEvent("content length", trace.WithAttributes(attribute.Int64("max-size", a.maxSize), attribute.Int("length", length)))
+
+	if length > 0 {
+		if int64(length) > a.maxSize {
+			return "", ErrSizeTooLarge
+		}
+	}
+
+	rdr := io.LimitReader(r, a.maxSize)
+	pr := readutil.NewPreviewReader(rdr)
+	if !isImageOrVideo(pr) {
+		span.AddEvent("not image")
+		return "", ErrUnsupportedType
+	}
+	rdr = pr.Drain()
+
+	s256 := sha256.New()
+	tmp, err := os.CreateTemp(a.store, "image-")
+	if err != nil {
+		span.RecordError(err)
+		return "", fmt.Errorf("%w: %w", ErrBadInput, err)
+	}
+
+	defer os.Remove(tmp.Name())
+
+	m := io.MultiWriter(s256, tmp)
+	if _, err := io.Copy(m, rdr); err != nil {
+		span.RecordError(err)
+		return "", fmt.Errorf("%w: %w", ErrBadInput, err)
+	}
+	tmp.Close()
+
+	id := base64.RawURLEncoding.EncodeToString(s256.Sum(nil)[12:])
+	fname := filepath.Join(a.store, id)
+
+	span.AddEvent("image: moving file", trace.WithAttributes(attribute.String("image-src", tmp.Name()), attribute.String("image-dst", fname)))
+	_ = os.Rename(tmp.Name(), fname)
+
+	return id, nil
+}
+
+func isImageOrVideo(in io.Reader) bool {
+	buf := make([]byte, 320)
+	_, err := in.Read(buf)
+	if err != nil {
+		return false
+	}
+	return filetype.IsImage(buf) || filetype.IsVideo(buf)
+}
+
+func chkStore(path string) bool {
+	file, err := os.Stat(path)
+
+	if err != nil && os.IsNotExist(err) {
+		err = os.MkdirAll(path, 0744)
+		if err != nil {
+			return false
+		}
+
+		file, err = os.Stat(path)
+	}
+
+	if err != nil {
+		return false
+	}
+
+	if !file.IsDir() {
+		return false
+	}
+
+	if unix.Access(path, unix.W_OK&unix.R_OK) != nil {
+		return false
+	}
+
+	return true
+}
+func chkFile(path string) bool {
+	file, err := os.Stat(path)
+	if err != nil {
+		return false
+	}
+
+	if file.IsDir() {
+		return false
+	}
+
+	if unix.Access(path, unix.W_OK&unix.R_OK) != nil {
+		return false
+	}
+
+	return true
+}
+func chkGone(path string) bool {
+	file, err := os.Stat(path)
+	if err != nil {
+		return true
+	}
+
+	if file.Size() == 0 {
+		return true
+	}
+
+	return false
+}
+func writeError(w http.ResponseWriter, err error) {
+	switch {
+	case errors.Is(err, ErrGone):
+		w.WriteHeader(http.StatusGone)
+	case errors.Is(err, ErrNotFound):
+		w.WriteHeader(http.StatusNotFound)
+	case errors.Is(err, ErrReadingContent):
+		w.WriteHeader(http.StatusInternalServerError)
+	case errors.Is(err, ErrUnsupportedType):
+		w.WriteHeader(http.StatusUnsupportedMediaType)
+	}
+}
+
+type Header struct {
+	Mime     string
+	Modified time.Time
+	ETag     string
+}
+
+var (
+	ErrNotFound        = errors.New("not found")
+	ErrGone            = errors.New("gone")
+	ErrReadingContent  = errors.New("reading content")
+	ErrSizeTooLarge    = errors.New("size too large")
+	ErrBadInput        = errors.New("bad input")
+	ErrUnsupportedType = errors.New("unsupported type")
+)

image/image_test.go

@@ -0,0 +1,118 @@
+package image_test
+
+import (
+	"bytes"
+	"context"
+	"encoding/base64"
+	"fmt"
+	"mime/multipart"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/matryer/is"
+	"go.sour.is/paste/v2/image"
+)
+
+var testImage = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z/C/HgAGgwJ/lK3Q6wAAAABJRU5ErkJggg=="
+
+
+func TestPostImgur(t *testing.T) {
+	is := is.New(t)
+
+	ctx := context.Background()
+
+	dir, err := os.MkdirTemp("", "image")
+	is.NoErr(err)
+
+	im, err := image.New(ctx, dir, 0)
+	is.NoErr(err)
+
+	{
+		body := &bytes.Buffer{}
+		wr := multipart.NewWriter(body)
+		w, err := wr.CreateFormField("type")
+		is.NoErr(err)
+
+		fmt.Fprint(w, "base64")
+
+		w, err = wr.CreateFormField("image")
+		is.NoErr(err)
+
+		fmt.Fprint(w, testImage)
+
+		err = wr.Close()
+		is.NoErr(err)
+
+		t.Log(body.String())
+
+		req := httptest.NewRequest("POST", "/3/upload", body)
+		req.Header.Set("Content-Type", "multipart/form-data; boundary="+wr.Boundary())
+		res := httptest.NewRecorder()
+
+		im.ServeHTTP(res, req)
+
+		is.Equal(res.Code, http.StatusOK)
+		is.Equal(res.Body.String(), `{"data":{"link":"https://example.com/i/Igg59VTi6JNuXVriXMR3U_lzfAc","deletehash":""},"success":true,"status":200}
+`)	
+	}
+
+	{
+		req := httptest.NewRequest("GET", "/Igg59VTi6JNuXVriXMR3U_lzfAc", nil)
+		res := httptest.NewRecorder()
+	
+		im.ServeHTTP(res, req)
+
+		is.Equal(res.Code, http.StatusOK)
+
+		s := base64.StdEncoding.EncodeToString(res.Body.Bytes())
+		is.Equal(s, testImage)
+		t.Log(res.Header())
+		is.Equal(res.Header().Get("ETag"), "Igg59VTi6JNuXVriXMR3U_lzfAc")
+
+	}
+
+	err = os.RemoveAll(dir)
+	is.NoErr(err)
+}
+
+func TestPost(t *testing.T) {
+	is := is.New(t)
+
+	ctx := context.Background()
+
+	dir, err := os.MkdirTemp("", "image")
+	is.NoErr(err)
+
+	im, err := image.New(ctx, dir, 0)
+	is.NoErr(err)
+
+	{
+		req := httptest.NewRequest("POST", "/i", base64.NewDecoder(base64.StdEncoding, strings.NewReader(testImage)))
+		res := httptest.NewRecorder()
+
+		im.ServeHTTP(res, req)
+
+		is.Equal(res.Code, http.StatusCreated)
+		is.Equal(res.Body.String(), `{"data":{"link":"https://example.com/i/Igg59VTi6JNuXVriXMR3U_lzfAc","deletehash":""},"success":true,"status":200}
+`)
+
+	}
+
+	{
+		req := httptest.NewRequest("GET", "/Igg59VTi6JNuXVriXMR3U_lzfAc", nil)
+		res := httptest.NewRecorder()
+	
+		im.ServeHTTP(res, req)
+
+		is.Equal(res.Code, http.StatusOK)
+
+		s := base64.StdEncoding.EncodeToString(res.Body.Bytes())
+		is.Equal(s, testImage)
+	}
+
+	err = os.RemoveAll(dir)
+	is.NoErr(err)
+}

main.go

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"log"
+	"log/slog"
+	"net/http"
+	"os"
+	"os/signal"
+	"strconv"
+
+	"go.sour.is/pkg/lg"
+	"go.sour.is/pkg/service"
+)
+
+var apps service.Apps
+var appName, version = service.AppName()
+
+func main() {
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
+	go func() {
+		<-ctx.Done()
+		defer cancel() // restore interrupt function
+	}()
+	if err := run(ctx); err != nil {
+		log.Fatal(err)
+		os.Exit(1)
+	}
+}
+func run(ctx context.Context) error {
+	// TODO: make this configurable.
+	level := slog.LevelInfo
+	if ok, _ := strconv.ParseBool(os.Getenv("LOG_DEBUG")); ok {
+		level = slog.LevelDebug
+	}
+	slog.SetDefault(slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})))
+
+	svc := &service.Harness{}
+	ctx, stop := lg.Init(ctx, appName)
+	svc.OnStop(stop)
+	svc.Add(lg.NewHTTP(ctx))
+	svc.Setup(ctx, apps.Apps()...)
+
+	// Run application
+	if err := svc.Run(ctx, appName, version); err != nil && !errors.Is(err, http.ErrServerClosed) {
+		return err
+	}
+	return nil
+}

paste/paste.go

@@ -0,0 +1,188 @@
+package paste
+
+import (
+	"bufio"
+	"crypto/sha256"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
+	"go.sour.is/paste/src/pkg/readutil"
+	"golang.org/x/sys/unix"
+	"sour.is/x/toolbox/log"
+)
+
+type Paste struct {
+	store string
+}
+
+func New(store string) (p *Paste, err error) {
+	p = &Paste{}
+	p.store = store
+
+	if !chkStore(p.store) {
+		err = fmt.Errorf("paste: store location [%s] does not exist or is not writable", p.store)
+		return
+	}
+	return
+}
+
+func chkStore(path string) bool {
+	file, err := os.Stat(path)
+
+	if err != nil && os.IsNotExist(err) {
+		err = os.MkdirAll(path, 0744)
+		if err != nil {
+			return false
+		}
+
+		file, err = os.Stat(path)
+	}
+
+	if err != nil {
+		return false
+	}
+
+	if !file.IsDir() {
+		return false
+	}
+
+	if unix.Access(path, unix.W_OK&unix.R_OK) != nil {
+		return false
+	}
+
+	return true
+}
+
+func chkFile(path string) bool {
+	file, err := os.Stat(path)
+	if err != nil {
+		return false
+	}
+
+	if file.IsDir() {
+		return false
+	}
+
+	if unix.Access(path, unix.W_OK&unix.R_OK) != nil {
+		return false
+	}
+
+	return true
+}
+
+func chkGone(path string) bool {
+	file, err := os.Stat(path)
+	if err != nil {
+		return true
+	}
+
+	if file.Size() == 0 {
+		return true
+	}
+
+	return false
+}
+
+func (p *Paste) Get(w io.Writer, id string) error {
+	fname := filepath.Join(p.store, id)
+
+	if !chkFile(fname) {
+		return ErrNotFound
+	}
+
+	if chkGone(fname) {
+		return ErrGone
+	}
+
+	f, err := os.Open(fname)
+	if err != nil {
+		return fmt.Errorf("%w: %w", ErrReadingContent, err)
+	}
+	defer f.Close()
+
+	pr := readutil.NewPreviewReader(f)
+
+	keep := true
+	scanner := bufio.NewScanner(pr)
+	for scanner.Scan() {
+		txt := scanner.Text()
+		log.Debug(txt)
+
+		// End of header found
+		if txt == "" {
+			break
+		}
+
+		if strings.HasPrefix(txt, "exp:") {
+			now := time.Now().Unix()
+			exp, err := strconv.ParseInt(strings.TrimSpace(strings.TrimPrefix(txt, "exp:")), 10, 64)
+			if err != nil {
+				return fmt.Errorf("%w: %w", ErrReadingContent, err)
+			}
+
+			log.Debugf("%d > %d", now, exp)
+			if now > exp {
+				deleteFile(fname)
+				return ErrGone
+			}
+		}
+
+		if strings.HasPrefix(txt, "burn:") {
+			burn := strings.TrimSpace(strings.TrimPrefix(txt, "burn:"))
+
+			if burn == "true" {
+				keep = false
+			}
+		}
+	}
+
+	_, _ = io.Copy(w, pr.Drain())
+
+	if !keep {
+		deleteFile(fname)
+	}
+
+	return nil
+}
+
+func (p *Paste) Set(r io.ReadCloser) (string, error) {
+	defer r.Close()
+
+	rdr := io.LimitReader(r, 1048576)
+
+	s256 := sha256.New()
+	tmp, _ := os.CreateTemp(p.store, "arch-")
+	defer os.Remove(tmp.Name())
+
+	m := io.MultiWriter(s256, tmp)
+	if _, err := io.Copy(m, rdr); err != nil {
+		return "", fmt.Errorf("%w: %w", ErrBadInput, err)
+	}
+	tmp.Close()
+
+	id := base64.RawURLEncoding.EncodeToString(s256.Sum(nil)[12:])
+	fname := filepath.Join(p.store, id)
+
+	_ = os.Rename(tmp.Name(), fname)
+
+	return id, nil
+}
+
+func deleteFile(path string) {
+	_ = ioutil.WriteFile(path, nil, 0644)
+}
+
+var (
+	ErrNotFound       = errors.New("not found")
+	ErrGone           = errors.New("gone")
+	ErrReadingContent = errors.New("reading content")
+	ErrBadInput       = errors.New("bad input")
+)

paste/public/index.html

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no">
+        <meta name="theme-color" content="#000000">
+        
+        <link rel="manifest" href="/ui/manifest.json">
+        <link rel="shortcut icon" href="/ui/favicon.ico">
+        
+        <title>DN42 Paste</title>
+
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
+        <link href="paste.css" rel="stylesheet">
+    </head>
+    <body>
+        <noscript>You need to enable JavaScript to run this app.</noscript>
+    </body>
+</html>

paste/service.go

@@ -0,0 +1,114 @@
+package paste
+
+import (
+	"crypto/rand"
+	"errors"
+	"fmt"
+	"log"
+	"net/http"
+	"strings"
+
+	"go.sour.is/paste/v2/assets"
+	"go.sour.is/pkg/lg"
+)
+
+type service struct {
+	ui        http.Handler
+	paste     *Paste
+	randBytes int
+}
+
+func NewService(store string, randBytes int64) (*service, error) {
+	p, err := New(store)
+	if err != nil {
+		return nil, err
+	}
+
+	return &service{
+		ui:        http.FileServer(http.FS(assets.GetUI())),
+		paste:     p,
+		randBytes: int(randBytes),
+	}, nil
+}
+
+func (a *service) RegisterHTTP(mux *http.ServeMux) {
+	mux.Handle("/ui/", lg.Htrace(http.StripPrefix("/ui/", a.ui), "paste-assets"))
+
+	mux.Handle("/api", http.StripPrefix("/api", a))
+	mux.Handle("/api/", http.StripPrefix("/api/", a))
+
+	mux.Handle("/paste", http.StripPrefix("/paste", a))
+	mux.Handle("/paste/", http.StripPrefix("/paste/", a))
+}
+
+func (p *service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		switch {
+		case strings.HasPrefix(r.URL.Path, "rng"):
+			p.getRandom(w)
+
+		case strings.HasPrefix(r.URL.Path, "get"), r.URL.Path != "":
+			p.getPaste(w, strings.TrimPrefix(r.URL.Path, "get/"))
+
+		default:
+			http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+		}
+
+	case http.MethodPost:
+		switch {
+		case r.URL.Path == "":
+			p.postPaste(w, r)
+
+		default:
+			http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+		}
+
+	default:
+		http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
+	}
+}
+
+func (p *service) getRandom(w http.ResponseWriter) {
+	log.Println("get random")
+	s := make([]byte, p.randBytes)
+	_, _ = rand.Read(s)
+
+	w.Header().Set("content-type", "application/octet-stream")
+	w.WriteHeader(http.StatusOK)
+	_, _ = w.Write(s)
+}
+
+func (p *service) getPaste(w http.ResponseWriter, id string) {
+	log.Println("get paste", id)
+	w.Header().Set("content-type", "application/octet-stream")
+
+	err := p.paste.Get(w, id)
+	if err != nil {
+		switch {
+		case errors.Is(err, ErrGone):
+			w.WriteHeader(http.StatusGone)
+		case errors.Is(err, ErrNotFound):
+			w.WriteHeader(http.StatusNotFound)
+		case errors.Is(err, ErrReadingContent):
+			w.WriteHeader(http.StatusInternalServerError)
+		}
+
+		fmt.Fprintf(w, "ERR %s", err)
+		return
+	}
+}
+
+func (p *service) postPaste(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("content-type", "application/octet-stream")
+
+	id, err := p.paste.Set(r.Body)
+	if err != nil {
+		fmt.Fprintf(w, "ERR %s", err)
+		return
+
+	}
+
+	log.Println("post paste", id)
+	fmt.Fprint(w, "OK ", id)
+}

src/docs/.gitignore

@@ -1 +0,0 @@
-public/swagger.json

src/docs/public.go

@@ -1,11 +0,0 @@
-package docs
-
-import "sour.is/x/toolbox/httpsrv"
-
-func init() {
-	httpsrv.AssetRegister("docs", httpsrv.AssetRoutes{
-		{Name: "Assets", Path: "/docs/", HandlerFunc: httpsrv.FsHtml5(assetFS())},
-	})
-}
-
-//go:generate go run github.com/sour-is/go-assetfs/cmd/assetfs -pkg docs public/

src/docs/public/index.html

@@ -1,95 +0,0 @@
-<!-- HTML for static distribution bundle build -->
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Swagger UI</title>
-  <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
-  <link rel="stylesheet" type="text/css" href="./swagger-ui.css" >
-  <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
-  <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
-  <style>
-    html
-    {
-      box-sizing: border-box;
-      overflow: -moz-scrollbars-vertical;
-      overflow-y: scroll;
-    }
-    *,
-    *:before,
-    *:after
-    {
-      box-sizing: inherit;
-    }
-
-    body {
-      margin:0;
-      background: #fafafa;
-    }
-  </style>
-</head>
-
-<body>
-
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
-  <defs>
-    <symbol viewBox="0 0 20 20" id="unlocked">
-          <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="locked">
-      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="close">
-      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="large-arrow">
-      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 20 20" id="large-arrow-down">
-      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
-    </symbol>
-
-
-    <symbol viewBox="0 0 24 24" id="jump-to">
-      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
-    </symbol>
-
-    <symbol viewBox="0 0 24 24" id="expand">
-      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
-    </symbol>
-
-  </defs>
-</svg>
-
-<div id="swagger-ui"></div>
-
-<script src="./swagger-ui-bundle.js"> </script>
-<script src="./swagger-ui-standalone-preset.js"> </script>
-<script>
-window.onload = function() {
-
-  // Build a system
-  const ui = SwaggerUIBundle({
-    url: "/docs/swagger.json",
-    dom_id: '#swagger-ui',
-    deepLinking: true,
-    presets: [
-      SwaggerUIBundle.presets.apis,
-      SwaggerUIStandalonePreset
-    ],
-    plugins: [
-      SwaggerUIBundle.plugins.DownloadUrl
-    ],
-    layout: "StandaloneLayout"
-  })
-
-  window.ui = ui
-}
-</script>
-</body>
-
-</html>

src/docs/public/oauth2-redirect.html

@@ -1,67 +0,0 @@
-<!doctype html>
-<html lang="en-US">
-<body onload="run()">
-</body>
-</html>
-<script>
-    'use strict';
-    function run () {
-        var oauth2 = window.opener.swaggerUIRedirectOauth2;
-        var sentState = oauth2.state;
-        var redirectUrl = oauth2.redirectUrl;
-        var isValid, qp, arr;
-
-        if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
-        } else {
-            qp = location.search.substring(1);
-        }
-
-        arr = qp.split("&")
-        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
-        qp = qp ? JSON.parse('{' + arr.join() + '}',
-                function (key, value) {
-                    return key === "" ? value : decodeURIComponent(value)
-                }
-        ) : {}
-
-        isValid = qp.state === sentState
-
-        if ((
-          oauth2.auth.schema.get("flow") === "accessCode"||
-          oauth2.auth.schema.get("flow") === "authorizationCode"
-        ) && !oauth2.auth.code) {
-            if (!isValid) {
-                oauth2.errCb({
-                    authId: oauth2.auth.name,
-                    source: "auth",
-                    level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
-                });
-            }
-
-            if (qp.code) {
-                delete oauth2.state;
-                oauth2.auth.code = qp.code;
-                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
-            } else {
-                let oauthErrorMsg
-                if (qp.error) {
-                    oauthErrorMsg = "["+qp.error+"]: " +
-                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
-                        (qp.error_uri ? "More info: "+qp.error_uri : "");
-                }
-
-                oauth2.errCb({
-                    authId: oauth2.auth.name,
-                    source: "auth",
-                    level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
-                });
-            }
-        } else {
-            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
-        }
-        window.close();
-    }
-</script>

src/pkg/cache/cache.go

@@ -1,77 +0,0 @@
-package cache
-
-import (
-	"time"
-
-	lru "github.com/hashicorp/golang-lru"
-)
-
-type Key interface {
-	Key() interface{}
-}
-type Value interface {
-	Stale() bool
-	Value() interface{}
-}
-type item struct {
-	key      interface{}
-	value    interface{}
-	expireOn time.Time
-}
-
-func NewItem(key, value interface{}, expires time.Duration) *item {
-	return &item{
-		key:      key,
-		value:    value,
-		expireOn: time.Now().Add(expires),
-	}
-}
-func (e *item) Stale() bool {
-	if e == nil || e.value == nil {
-		return true
-	}
-
-	return time.Now().After(e.expireOn)
-}
-func (s *item) Value() interface{} {
-	return s.value
-}
-
-type Cacher interface {
-	Add(Key, Value)
-	Has(Key) bool
-	Get(Key) (Value, bool)
-	Remove(Key)
-}
-
-type arcCache struct {
-	cache *lru.ARCCache
-}
-
-func NewARC(size int) (Cacher, error) {
-	arc, err := lru.NewARC(size)
-	if err != nil {
-		return nil, err
-	}
-
-	return &arcCache{cache: arc}, nil
-}
-func (c *arcCache) Add(key Key, value Value) {
-	c.cache.Add(key.Key(), value)
-}
-func (c *arcCache) Get(key Key) (Value, bool) {
-	if v, ok := c.cache.Get(key.Key()); ok {
-		if value, ok := v.(Value); ok && !value.Stale() {
-			return value, true
-		}
-		c.cache.Remove(key.Key())
-	}
-	return nil, false
-}
-func (c *arcCache) Has(key Key) bool {
-	_, ok := c.Get(key)
-	return ok
-}
-func (c *arcCache) Remove(key Key) {
-	c.cache.Remove(key.Key())
-}

src/pkg/promise/promise.go

@@ -1,225 +0,0 @@
-package promise
-
-import (
-	"context"
-	"fmt"
-	"sync"
-	"time"
-
-	"go.uber.org/ratelimit"
-	"sour.is/x/paste/src/pkg/cache"
-	"sour.is/x/toolbox/log"
-)
-
-type Q interface {
-	Key() interface{}
-	Context() context.Context
-	Resolve(interface{})
-	Reject(error)
-
-	Tasker
-}
-type Fn func(Q)
-type Key interface {
-	Key() interface{}
-}
-
-type qTask struct {
-	key Key
-
-	fn  Fn
-	ctx context.Context
-
-	cancel func()
-	done   chan struct{}
-
-	result interface{}
-	err    error
-
-	Tasker
-}
-
-func (t *qTask) Key() interface{}         { return t.key }
-func (t *qTask) Context() context.Context { return t.ctx }
-func (t *qTask) Resolve(r interface{})    { t.result = r; t.finish() }
-func (t *qTask) Reject(err error)         { t.err = err; t.finish() }
-
-func (t *qTask) Await() <-chan struct{} { return t.done }
-func (t *qTask) Cancel()                { t.err = fmt.Errorf("task cancelled"); t.finish() }
-
-func (t *qTask) Result() interface{} { return t.result }
-func (t *qTask) Err() error          { return t.err }
-
-func (t *qTask) finish() {
-	if t.done == nil {
-		return
-	}
-
-	t.cancel()
-	close(t.done)
-	t.done = nil
-}
-
-type Option interface {
-	Apply(*qTask)
-}
-type OptionFn func(*qTask)
-
-func (fn OptionFn) Apply(t *qTask) { fn(t) }
-
-type Tasker interface {
-	Run(Key, Fn, ...Option) *qTask
-}
-
-type Runner struct {
-	defaultOpts []Option
-	queue       map[interface{}]*qTask
-	mu          sync.RWMutex
-	ctx         context.Context
-	cancel      func()
-	pause       chan struct{}
-	limiter     ratelimit.Limiter
-}
-
-type Timeout time.Duration
-
-func (d Timeout) Apply(task *qTask) {
-	task.ctx, task.cancel = context.WithTimeout(task.ctx, time.Duration(d))
-}
-
-func (tr *Runner) Run(key Key, fn Fn, opts ...Option) *qTask {
-	tr.mu.RLock()
-	log.Infos("task to run", fmt.Sprintf("%T", key), key.Key())
-
-	if task, ok := tr.queue[key.Key()]; ok {
-		tr.mu.RUnlock()
-		log.Infos("task found running", fmt.Sprintf("%T", key), key.Key())
-
-		return task
-	}
-	tr.mu.RUnlock()
-
-	task := &qTask{
-		key:    key,
-		fn:     fn,
-		cancel: func() {},
-		ctx:    tr.ctx,
-		done:   make(chan struct{}),
-		Tasker: tr,
-	}
-
-	for _, opt := range tr.defaultOpts {
-		opt.Apply(task)
-	}
-
-	for _, opt := range opts {
-		opt.Apply(task)
-	}
-
-	tr.mu.Lock()
-	tr.queue[key.Key()] = task
-	tr.mu.Unlock()
-
-	log.Debug("Waiting for limiter")
-	tr.limiter.Take()
-	log.Debug("Got tag from limiter")
-
-	go func() {
-		defer func() {
-			if r := recover(); r != nil {
-				task.err = fmt.Errorf("PANIC: %v", r)
-			}
-
-			if err := task.Err(); err == nil {
-				log.Infos("task complete", fmt.Sprintf("%T", task.Key()), task.Key())
-			} else {
-				log.Errors("task Failed", fmt.Sprintf("%T", task.Key()), task.Key(), "err", err)
-			}
-		}()
-
-		log.Infos("task Running", fmt.Sprintf("%T", task.Key()), task.Key())
-
-		task.fn(task)
-
-		tr.mu.Lock()
-		delete(tr.queue, task.Key())
-		tr.mu.Unlock()
-	}()
-
-	return task
-}
-
-func NewRunner(ctx context.Context, defaultOpts ...Option) *Runner {
-	ctx, cancel := context.WithCancel(ctx)
-
-	tr := &Runner{
-		defaultOpts: defaultOpts,
-		queue:       make(map[interface{}]*qTask),
-		ctx:         ctx,
-		cancel:      cancel,
-		pause:       make(chan struct{}),
-		limiter:     ratelimit.New(10),
-	}
-
-	return tr
-}
-
-func (tr *Runner) List() []*qTask {
-	tr.mu.RLock()
-	defer tr.mu.RUnlock()
-
-	lis := make([]*qTask, 0, len(tr.queue))
-
-	for _, task := range tr.queue {
-		lis = append(lis, task)
-	}
-
-	return lis
-}
-
-func (tr *Runner) Stop() {
-	tr.cancel()
-}
-
-func (tr *Runner) Len() int {
-	tr.mu.RLock()
-	defer tr.mu.RUnlock()
-
-	return len(tr.queue)
-}
-
-func WithCache(c cache.Cacher, expireAfter time.Duration) OptionFn {
-	return func(task *qTask) {
-		innerFn := task.fn
-		task.fn = func(q Q) {
-			cacheKey, ok := q.Key().(cache.Key)
-			if !ok {
-				log.Infos("not a cache key", fmt.Sprintf("%T", q.Key()), q.Key())
-				innerFn(q)
-
-				return
-			}
-
-			if v, ok := c.Get(cacheKey); ok {
-				log.Infos("value in cache", fmt.Sprintf("%T", cacheKey), cacheKey.Key())
-				q.Resolve(v.Value())
-
-				return
-			}
-
-			log.Infos("not in cache", fmt.Sprintf("%T", cacheKey), cacheKey.Key())
-			innerFn(q)
-
-			if err := task.Err(); err != nil {
-				log.Error(err)
-
-				return
-			}
-
-			result := cache.NewItem(cacheKey, task.Result(), expireAfter)
-
-			log.Infos("result to cache", fmt.Sprintf("%T", cacheKey), cacheKey.Key())
-			c.Add(cacheKey, result)
-		}
-	}
-}

src/pkg/readutil/decompress.go

@@ -1,43 +0,0 @@
-package readutil
-
-import (
-	"compress/bzip2"
-	"compress/gzip"
-	"errors"
-	"io"
-
-	"github.com/andybalholm/brotli"
-	xz "github.com/remyoudompheng/go-liblzma"
-	"sour.is/x/toolbox/log"
-)
-
-// Decompress varius types of compression types
-func Decompress(in io.Reader) (io.Reader, error) {
-	rdr := NewPreviewReader(in)
-	mime, err := ReadMIMEWithSize(rdr, "", 32768)
-	if err != nil {
-		return rdr.Drain(), err
-	}
-	r := rdr.Drain()
-
-	switch mime {
-	case "application/gzip":
-		r, err = gzip.NewReader(r)
-
-	case "application/x-bzip2":
-		r = bzip2.NewReader(r)
-
-	case "application/x-xz":
-		r, err = xz.NewReader(r)
-
-	case "application/brotli":
-		r = brotli.NewReader(r)
-	default:
-		return r, ErrUnsupportedType
-	}
-	log.Debugs("Decompress:", "mime", mime)
-
-	return r, err
-}
-
-var ErrUnsupportedType = errors.New("Unsupported decompression type")

src/pkg/readutil/preview-reader.go

@@ -1,89 +0,0 @@
-package readutil
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-
-	"sour.is/x/toolbox/log"
-)
-
-// PreviewReader allows for seeking into a stream that does not support rewind
-type PreviewReader struct {
-	r   io.Reader
-	buf bytes.Buffer
-}
-
-// NewPreviewReader wrapps a reader with PreviewReader
-func NewPreviewReader(r io.Reader) *PreviewReader {
-	return &PreviewReader{r: r}
-}
-
-// ErrReaderDrained if reading from a drained PreviewReader
-var ErrReaderDrained = errors.New("io.Reader has been drained")
-
-func (pr *PreviewReader) Read(p []byte) (n int, err error) {
-	if pr.r == nil {
-		return 0, ErrReaderDrained
-	}
-
-	i, err := pr.r.Read(p)
-
-	log.Debugf("PreviewReader: buffer %d bytes", i)
-	_, berr := pr.buf.Write(p[:i])
-	if berr != nil {
-		return i, berr
-	}
-
-	return i, err
-}
-
-// Drain returns reader that is reset
-func (pr *PreviewReader) Drain() io.Reader {
-	dr := &drainReader{r: pr.r, buf: &pr.buf}
-	pr.r = nil
-	return dr
-}
-
-type drainReader struct {
-	r   io.Reader
-	buf *bytes.Buffer
-}
-
-var _ io.Seeker = (*drainReader)(nil)
-
-func (dr *drainReader) Read(p []byte) (n int, err error) {
-	i := 0
-	if dr.buf.Len() > 0 {
-		i, err = dr.buf.Read(p)
-		if err != nil && err != io.EOF {
-			return i, err
-		}
-
-		if err != nil && err == io.EOF {
-			err = nil
-		}
-
-		if err != nil {
-			return i, err
-		}
-	}
-
-	ri, err := dr.r.Read(p[i:])
-
-	// log.Debugs("drainReader:", "drain", i, "read", ri, "cap", len(p), "err", err)
-
-	return ri + i, err
-}
-
-// Seek attempt if the underlying reader supports it.
-func (dr *drainReader) Seek(offset int64, whence int) (int64, error) {
-	if dr.buf.Len() > 0 {
-		return 0, fmt.Errorf("unable to seek")
-	}
-	if r, ok := dr.r.(io.Seeker); ok {
-		return r.Seek(offset, whence)
-	}
-	return 0, fmt.Errorf("unable to seek")
-}

src/routes/artifact.go

@@ -1,246 +0,0 @@
-package routes
-
-import (
-	"archive/tar"
-	"crypto/sha256"
-	"encoding/base64"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/gorilla/mux"
-	"sour.is/x/paste/src/pkg/readutil"
-	"sour.is/x/toolbox/httpsrv"
-	"sour.is/x/toolbox/log"
-
-	"github.com/gomarkdown/markdown"
-	"github.com/gomarkdown/markdown/html"
-	"github.com/gomarkdown/markdown/parser"
-)
-
-func init() {
-	a := &Artifact{}
-	httpsrv.RegisterModule("artifact", a.config)
-
-	httpsrv.HttpRegister("artifact", httpsrv.HttpRoutes{
-		{Name: "get-path", Method: "GET", Pattern: "/a/{name}/{path:.*}", HandlerFunc: a.get},
-		{Name: "get", Method: "GET", Pattern: "/a/{name}", HandlerFunc: a.get},
-		{Name: "put", Method: "PUT", Pattern: "/a", HandlerFunc: a.put},
-		{Name: "get", Method: "GET", Pattern: "/a", HandlerFunc: a.list},
-	})
-}
-
-// Artifact stores items to disk
-type Artifact struct {
-	store   string
-	maxSize int64
-}
-
-func (a *Artifact) config(config map[string]string) {
-	a.store = "data/"
-	if config["store"] != "" {
-		a.store = config["store"]
-	}
-
-	if !chkStore(a.store) {
-		log.Criticalf("Artifact Store location [%s] does not exist or is not writable.", a.store)
-	}
-	log.Noticef("Artifact Store location set to [%s]", a.store)
-
-	a.maxSize = 50 * 1024 * 1024
-	if s, ok := config["max-size"]; ok {
-		if i, err := strconv.Atoi(s); err == nil {
-			a.maxSize = int64(i)
-		}
-	}
-	log.Noticef("Artifact: store max-size set to [%d]", a.maxSize)
-}
-
-func (a *Artifact) get(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-
-	name := vars["name"]
-	path, hasPath := vars["path"]
-
-	ext := filepath.Ext(name)
-	id := strings.TrimSuffix(name, ext)
-
-	fname := filepath.Join(a.store, id)
-
-	if !chkFile(fname) {
-		httpsrv.WriteError(w, http.StatusNotFound, "Not Found")
-
-		return
-	}
-
-	if chkGone(fname) {
-		httpsrv.WriteError(w, http.StatusGone, "Gone")
-
-		return
-	}
-
-	f, err := os.Open(fname)
-	if err != nil {
-		log.Error(err)
-	}
-	defer f.Close()
-
-	if !hasPath {
-		pr := readutil.NewPreviewReader(f)
-
-		mime, err := readutil.ReadMIME(pr, name)
-		if err != nil {
-			httpsrv.WriteError(w, http.StatusInternalServerError, err.Error())
-			return
-		}
-		w.Header().Set("Content-Type", mime)
-		w.Header().Set("X-Content-Type-Options", "nosniff")
-
-		_, _ = io.Copy(w, pr.Drain())
-		return
-	}
-
-	rdr, err := readutil.Decompress(f)
-	if err != nil && err != readutil.ErrUnsupportedType {
-		httpsrv.WriteError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-	if cl, ok := rdr.(io.ReadCloser); ok {
-		defer cl.Close()
-	}
-
-	tr := tar.NewReader(rdr)
-	if path == "@" {
-		var paths []string
-		for {
-			hdr, err := tr.Next()
-			if err == io.EOF {
-				break // End of archive
-			}
-			if err != nil {
-				log.Error(err)
-			}
-			paths = append(paths, hdr.Name)
-		}
-
-		httpsrv.WriteObject(w, http.StatusOK, paths)
-		return
-	}
-
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break // End of archive
-		}
-		if err != nil {
-			log.Error(err)
-		}
-		if path == "~" && hdr.Name == "index.html" {
-			path = hdr.Name
-		}
-		if path == "~" && hdr.Name == "index.md" {
-			path = hdr.Name
-		}
-
-		if hdr.Name == path {
-			if strings.HasSuffix(hdr.Name, ".md") {
-				md, err := ioutil.ReadAll(tr)
-				if err != nil {
-					httpsrv.WriteError(w, http.StatusInternalServerError, err.Error())
-					return
-				}
-
-				w.Header().Set("Content-Type", "text/html")
-				extensions := parser.CommonExtensions | parser.AutoHeadingIDs
-				p := parser.NewWithExtensions(extensions)
-
-				htmlFlags := html.CommonFlags | html.HrefTargetBlank
-				opts := html.RendererOptions{Flags: htmlFlags}
-				renderer := html.NewRenderer(opts)
-
-				b := markdown.ToHTML(md, p, renderer)
-				_, _ = w.Write(b)
-				w.WriteHeader(http.StatusOK)
-				return
-			}
-
-			pr := readutil.NewPreviewReader(tr)
-
-			mime, err := readutil.ReadMIME(pr, hdr.Name)
-			if err != nil {
-				httpsrv.WriteError(w, http.StatusInternalServerError, err.Error())
-				return
-			}
-			w.Header().Set("Content-Type", mime)
-
-			if _, err := io.Copy(w, pr.Drain()); err != nil {
-				log.Error(err)
-			}
-			w.WriteHeader(http.StatusOK)
-			return
-		}
-	}
-
-	httpsrv.WriteError(w, http.StatusNotFound, "Not Found in Archive")
-}
-func (a *Artifact) put(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-
-	if h := r.Header.Get("Content-Length"); h != "" {
-		if i, err := strconv.Atoi(h); err == nil {
-			if int64(i) > a.maxSize {
-				http.Error(w, "ERR Size Too Large", http.StatusRequestEntityTooLarge)
-				return
-			}
-		}
-	}
-
-	rdr := io.LimitReader(r.Body, 500*1024*1024)
-	pr := readutil.NewPreviewReader(rdr)
-	rdr = pr.Drain()
-
-	s256 := sha256.New()
-	tmp, err := ioutil.TempFile(a.store, "arch-")
-	if err != nil {
-		httpsrv.WriteError(w, 400, err.Error())
-		return
-	}
-
-	defer os.Remove(tmp.Name())
-
-	m := io.MultiWriter(s256, tmp)
-	if _, err := io.Copy(m, rdr); err != nil {
-		httpsrv.WriteError(w, 400, err.Error())
-	}
-	tmp.Close()
-
-	id := base64.RawURLEncoding.EncodeToString(s256.Sum(nil)[12:])
-	fname := filepath.Join(a.store, id)
-
-	log.Debugs("Artifact: moving file", "src", tmp.Name(), "dst", fname)
-	_ = os.Rename(tmp.Name(), fname)
-
-	httpsrv.WriteText(w, http.StatusCreated, id)
-}
-func (a *Artifact) list(w http.ResponseWriter, r *http.Request) {
-	err := filepath.Walk(a.store, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if info.IsDir() {
-			return nil
-		}
-
-		_, err = fmt.Fprintln(w, "FILE: ", info.Name())
-		return err
-	})
-	if err != nil {
-		httpsrv.WriteError(w, http.StatusInternalServerError, err.Error())
-		return
-	}
-}

src/routes/identity.go

@@ -1,698 +0,0 @@
-package routes
-
-import (
-	"bytes"
-	"context"
-	"crypto/md5"
-	"crypto/sha1"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/mail"
-	"net/url"
-	"strings"
-	"text/template"
-	"time"
-
-	"github.com/gorilla/mux"
-	"github.com/lucasb-eyer/go-colorful"
-	"github.com/sour-is/crypto/openpgp"
-	"github.com/tv42/zbase32"
-	"golang.org/x/crypto/openpgp/armor"
-
-	"sour.is/x/paste/src/pkg/cache"
-	"sour.is/x/paste/src/pkg/promise"
-	"sour.is/x/toolbox/httpsrv"
-	"sour.is/x/toolbox/log"
-)
-
-var expireAfter = 20 * time.Minute
-
-func init() {
-	cache, err := cache.NewARC(2048)
-	if err != nil {
-		panic(err)
-	}
-	tasker := promise.NewRunner(context.TODO(), promise.Timeout(30*time.Second), promise.WithCache(cache, expireAfter))
-
-	s := &identity{
-		cache:  cache,
-		tasker: tasker,
-	}
-
-	httpsrv.RegisterModule("identity", s.config)
-
-	httpsrv.HttpRegister("identity", httpsrv.HttpRoutes{
-		{Name: "get", Method: "GET", Pattern: "/id/{id}", HandlerFunc: s.get},
-	})
-}
-
-var pixl = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="
-
-var defaultStyle = &Style{
-	Avatar:     pixl,
-	Cover:      pixl,
-	Background: pixl,
-	Palette:    getPalette("#93CCEA"),
-}
-
-type identity struct {
-	cache  cache.Cacher
-	tasker promise.Tasker
-}
-
-type page struct {
-	Entity *Entity
-	Style  *Style
-	Proofs *Proofs
-
-	IsComplete bool
-	Err        error
-}
-type Proofs map[string]*Proof
-
-func (s *identity) config(config map[string]string) {}
-
-// func (s *identity) runtoCache()
-
-func (s *identity) get(w http.ResponseWriter, r *http.Request) {
-	secHeaders(w)
-
-	vars := mux.Vars(r)
-	id := vars["id"]
-
-	ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second)
-	defer cancel()
-
-	task := s.tasker.Run(EntityKey(id), func(q promise.Q) {
-		ctx := q.Context()
-		key := q.Key().(EntityKey)
-
-		log.Infos("start task", fmt.Sprintf("%T", key), key)
-
-		entity, err := s.getOpenPGPkey(ctx, string(key))
-		if err != nil {
-			q.Reject(err)
-			return
-		}
-
-		log.Infos("Scheduling Style", "email", entity.Primary.Address)
-		q.Run(StyleKey(entity.Primary.Address), func(q promise.Q) {
-			ctx := q.Context()
-			key := q.Key().(StyleKey)
-
-			log.Infos("start task", fmt.Sprintf("%T", key), key)
-			style, err := s.getStyle(ctx, string(key))
-			if err != nil {
-				q.Reject(err)
-				return
-			}
-
-			log.Notice("Resolving Style")
-			q.Resolve(style)
-		})
-
-		go func() {
-
-			log.Infos("Scheduling Proofs", "num", len(entity.Proofs))
-			for i := range entity.Proofs {
-				q.Run(ProofKey(entity.Proofs[i]), func(q promise.Q) {
-					key := q.Key().(ProofKey)
-					proof := NewProof(string(key))
-					proof.Checked = true
-					proof.Verified = true
-					log.Notice("Resolving Proof")
-					q.Resolve(proof)
-				})
-			}
-		}()
-
-		log.Notice("Resolving Entity")
-		q.Resolve(entity)
-	})
-
-	page := page{Style: defaultStyle}
-
-	select {
-	case <-task.Await():
-		log.Info("Tasks Competed")
-		if err := task.Err(); err != nil {
-			page.Err = err
-			page.IsComplete = true
-			break
-		}
-		page.Entity = task.Result().(*Entity)
-
-	case <-ctx.Done():
-		log.Info("Deadline Timeout")
-		if e, ok := s.cache.Get(EntityKey(id)); ok {
-			page.Entity = e.Value().(*Entity)
-		}
-	}
-
-	if page.Entity != nil {
-		var gotStyle, gotProofs bool
-
-		if s, ok := s.cache.Get(StyleKey(page.Entity.Primary.Address)); ok {
-			page.Style = s.Value().(*Style)
-			gotStyle = true
-		}
-
-		// TODO: Proofs
-		gotProofs = true
-		if len(page.Entity.Proofs) > 0 {
-			proofs := make(Proofs, len(page.Entity.Proofs))
-			for i := range page.Entity.Proofs {
-				p := page.Entity.Proofs[i]
-
-				proofs[p] = NewProof(p)
-				if s, ok := s.cache.Get(ProofKey(p)); ok {
-					proofs[p] = s.Value().(*Proof)
-				} else {
-					log.Info("Missing proof", p)
-					gotProofs = false
-				}
-			}
-			page.Proofs = &proofs
-		}
-
-		page.IsComplete = gotStyle && gotProofs
-	}
-
-	// e := json.NewEncoder(w)
-	// e.SetIndent("", "  ")
-	// e.Encode(entity)
-
-	t, err := template.New("identity").Parse(identityTPL)
-	if err != nil {
-		httpsrv.WriteText(w, 500, err.Error())
-		return
-	}
-	err = t.Execute(w, page)
-	if err != nil {
-		httpsrv.WriteText(w, 500, err.Error())
-		return
-	}
-}
-
-func (s *identity) getOpenPGPkey(ctx context.Context, id string) (entity *Entity, err error) {
-	useArmored := false
-	addr := ""
-
-	if isFingerprint(id) {
-		addr = "https://keys.openpgp.org/vks/v1/by-fingerprint/" + strings.ToUpper(id)
-		useArmored = true
-	} else if email, err := mail.ParseAddress(id); err == nil {
-		addr = getWKDPubKeyAddr(email)
-		useArmored = false
-	} else {
-		return entity, fmt.Errorf("Parse address: %w", err)
-	}
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, addr, nil)
-	if err != nil {
-		return entity, err
-	}
-	cl := http.Client{}
-	resp, err := cl.Do(req)
-	if err != nil {
-		return entity, fmt.Errorf("Requesting key: %w\nRemote URL: %v", err, addr)
-	}
-
-	if resp.StatusCode != 200 {
-		return entity, fmt.Errorf("bad response from remote: %s\nRemote URL: %v", resp.Status, addr)
-	}
-
-	defer resp.Body.Close()
-
-	if resp.Header.Get("Content-Type") == "application/pgp-keys" {
-		useArmored = true
-	}
-	log.Infos("getIdentity", "id", id, "useArmored", useArmored, "status", resp.Status, "addr", addr)
-
-	entity, err = ReadKey(resp.Body, useArmored)
-
-	return entity, err
-}
-
-type EntityKey string
-
-func (k EntityKey) Key() interface{} {
-	return k
-}
-
-type Entity struct {
-	Primary     *mail.Address
-	Emails      []*mail.Address
-	Fingerprint string
-	Proofs      []string
-	ArmorText   string
-}
-
-func getEntity(lis openpgp.EntityList) (*Entity, error) {
-	entity := &Entity{}
-	var err error
-
-	for _, e := range lis {
-		if e == nil {
-			continue
-		}
-		if e.PrimaryKey == nil {
-			continue
-		}
-
-		entity.Fingerprint = fmt.Sprintf("%X", e.PrimaryKey.Fingerprint)
-
-		for name, ident := range e.Identities {
-			// Pick first identity
-			if entity.Primary == nil {
-				entity.Primary, err = mail.ParseAddress(name)
-				if err != nil {
-					return entity, err
-				}
-			}
-			// If one is marked primary use that
-			if ident.SelfSignature != nil && ident.SelfSignature.IsPrimaryId != nil && *ident.SelfSignature.IsPrimaryId {
-				entity.Primary, err = mail.ParseAddress(name)
-				if err != nil {
-					return entity, err
-				}
-
-			} else {
-				var email *mail.Address
-				if email, err = mail.ParseAddress(name); err != nil {
-					return entity, err
-				}
-
-				entity.Emails = append(entity.Emails, email)
-			}
-
-			// If identity is self signed read notation data.
-			if ident.SelfSignature != nil && ident.SelfSignature.NotationData != nil {
-				// Get proofs and append to list.
-				if proofs, ok := ident.SelfSignature.NotationData["proof@metacode.biz"]; ok {
-					entity.Proofs = append(entity.Proofs, proofs...)
-				}
-			}
-		}
-		break
-	}
-
-	if entity.Primary == nil {
-		entity.Primary, _ = mail.ParseAddress("nobody@nodomain.xyz")
-	}
-
-	return entity, err
-}
-
-func ReadKey(r io.Reader, useArmored bool) (e *Entity, err error) {
-	var buf bytes.Buffer
-
-	var w io.Writer = &buf
-
-	if !useArmored {
-		var aw io.WriteCloser
-		aw, err = armor.Encode(&buf, "PGP PUBLIC KEY BLOCK", nil)
-		if err != nil {
-			return e, fmt.Errorf("Read key: %w", err)
-		}
-		defer func() { aw.Close(); e.ArmorText = buf.String() }()
-		w = aw
-	} else {
-		defer func() { e.ArmorText = buf.String() }()
-	}
-
-	r = io.TeeReader(r, w)
-
-	var lis openpgp.EntityList
-
-	if useArmored {
-		lis, err = openpgp.ReadArmoredKeyRing(r)
-	} else {
-		lis, err = openpgp.ReadKeyRing(r)
-	}
-	if err != nil {
-		return e, fmt.Errorf("Read key: %w", err)
-	}
-
-	e, err = getEntity(lis)
-	if err != nil {
-		return e, fmt.Errorf("Parse key: %w", err)
-	}
-
-	return
-}
-
-func isFingerprint(s string) bool {
-	for _, r := range s {
-		switch r {
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'A', 'B', 'C', 'D', 'E', 'F':
-		default:
-			return false
-		}
-	}
-
-	return true
-}
-
-func getWKDPubKeyAddr(email *mail.Address) string {
-	parts := strings.SplitN(email.Address, "@", 2)
-
-	hash := sha1.Sum([]byte(parts[0]))
-	lp := zbase32.EncodeToString(hash[:])
-
-	return fmt.Sprintf("https://%s/.well-known/openpgpkey/hu/%s", parts[1], lp)
-}
-
-type StyleKey string
-
-func (s StyleKey) Key() interface{} {
-	return s
-}
-
-type Style struct {
-	Avatar,
-	Cover,
-	Background string
-
-	Palette []string
-}
-
-func (s *identity) getStyle(ctx context.Context, email string) (*Style, error) {
-	avatarHost, styleHost, err := styleSRV(ctx, email)
-	if err != nil {
-		return nil, err
-	}
-	log.Infos("getStyle", "avatar", avatarHost, "style", styleHost)
-
-	hash := md5.New()
-	email = strings.TrimSpace(strings.ToLower(email))
-	_, _ = hash.Write([]byte(email))
-
-	id := hash.Sum(nil)
-
-	style := &Style{}
-
-	style.Palette = getPalette(fmt.Sprintf("#%x", id[:3]))
-	style.Avatar = fmt.Sprintf("https://%s/avatar/%x", avatarHost, id)
-	style.Cover = pixl
-	style.Background = "https://lavana.sour.is/bg/52548b3dcb032882675afe1e4bcba0e9"
-
-	if styleHost != "" {
-		style.Cover = fmt.Sprintf("https://%s/cover/%x", styleHost, id)
-		style.Background = fmt.Sprintf("https://%s/bg/%x", styleHost, id)
-	}
-
-	return style, err
-}
-
-func styleSRV(ctx context.Context, email string) (avatar string, style string, err error) {
-
-	// Defaults
-	style = ""
-	avatar = "www.gravatar.com"
-
-	parts := strings.SplitN(email, "@", 2)
-	if _, srv, err := net.DefaultResolver.LookupSRV(ctx, "style-sec", "tcp", parts[1]); err == nil {
-		if len(srv) > 0 {
-			style = strings.TrimSuffix(srv[0].Target, ".")
-			avatar = strings.TrimSuffix(srv[0].Target, ".")
-
-			return avatar, style, err
-		}
-	}
-
-	if _, srv, err := net.DefaultResolver.LookupSRV(ctx, "avatars-sec", "tcp", parts[1]); err == nil {
-		if len(srv) > 0 {
-			avatar = strings.TrimSuffix(srv[0].Target, ".")
-
-			return avatar, style, err
-		}
-	}
-
-	return
-}
-
-// getPalette maes a complementary color palette. https://play.golang.org/p/nBXLUocGsU5
-func getPalette(hex string) []string {
-	reference, _ := colorful.Hex(hex)
-	reference = sat(lum(reference, 0, .5), 0, .5)
-
-	white := colorful.Color{R: 1, G: 1, B: 1}
-	black := colorful.Color{R: 0, G: 0, B: 0}
-	accentA := hue(reference, 60)
-	accentB := hue(reference, -60)
-	accentC := hue(reference, -180)
-
-	return append(
-		[]string{},
-
-		white.Hex(),
-		lum(reference, .4, .6).Hex(),
-		reference.Hex(),
-		lum(reference, .4, 0).Hex(),
-		black.Hex(),
-
-		lum(accentA, .4, .6).Hex(),
-		accentA.Hex(),
-		lum(accentA, .4, 0).Hex(),
-
-		lum(accentB, .4, .6).Hex(),
-		accentB.Hex(),
-		lum(accentB, .4, 0).Hex(),
-
-		lum(accentC, .4, .6).Hex(),
-		accentC.Hex(),
-		lum(accentC, .4, 0).Hex(),
-	)
-}
-func hue(in colorful.Color, H float64) colorful.Color {
-	h, s, l := in.Hsl()
-	return colorful.Hsl(h+H, s, l)
-}
-func sat(in colorful.Color, S, V float64) colorful.Color {
-	h, s, l := in.Hsl()
-	return colorful.Hsl(h, V+s*S, l)
-}
-func lum(in colorful.Color, L, V float64) colorful.Color {
-	h, s, l := in.Hsl()
-	return colorful.Hsl(h, s, V+l*L)
-}
-
-type ProofKey string
-
-func (k ProofKey) Key() interface{} {
-	return k
-}
-
-type Proof struct {
-	Icon     string
-	Service  string
-	Name     string
-	URI      string
-	Link     string
-	Checked  bool
-	Verified bool
-}
-
-func NewProof(uri string) *Proof {
-	p := &Proof{URI: uri}
-
-	u, err := url.Parse(uri)
-	if err != nil {
-		p.Icon = "exclamation-triangle"
-		p.Service = "error"
-		p.Name = err.Error()
-
-		return p
-	}
-
-	p.Service = u.Scheme
-
-	switch u.Scheme {
-	case "dns":
-		p.Icon = "fas fa-globe"
-		p.Name = u.Opaque
-		p.Link = fmt.Sprintf("https://%s", u.Hostname())
-
-	case "xmpp":
-		p.Icon = "fas fa-comments"
-		p.Name = u.Opaque
-
-	case "https":
-		p.Icon = "fas fa-atlas"
-		p.Name = u.Hostname()
-		p.Link = fmt.Sprintf("https://%s", u.Hostname())
-
-		switch {
-		case strings.HasPrefix(u.Host, "twitter.com"):
-			p.Icon = "fab fa-twitter"
-			p.Service = "Twitter"
-		case strings.HasPrefix(u.Host, "news.ycombinator.com"):
-			p.Icon = "fab fa-hacker-news"
-			p.Service = "HackerNews"
-		case strings.HasPrefix(u.Host, "dev.to"):
-			p.Icon = "fab fa-dev"
-			p.Service = "dev.to"
-		case strings.HasPrefix(u.Host, "reddit.com"), strings.HasPrefix(u.Host, "www.reddit.com"):
-			p.Icon = "fab fa-reddit"
-			p.Service = "Reddit"
-		case strings.HasPrefix(u.Host, "gist.github.com"):
-			p.Icon = "fab fa-github"
-			p.Service = "GitHub"
-		case strings.HasPrefix(u.Host, "lobste.rs"):
-			p.Icon = "fas fa-list-ul"
-			p.Service = "Lobsters"
-		case strings.HasSuffix(u.Host, "/gitlab_proof/"):
-			p.Icon = "fab fa-gitlab"
-			p.Service = "GetLab"
-		case strings.HasSuffix(u.Host, "/gitea_proof/"):
-			p.Icon = "fas fa-mug-hot"
-			p.Service = "Gitea"
-		default:
-			p.Icon = "fas fa-project-diagram"
-			p.Service = "fediverse"
-		}
-	}
-
-	return p
-}
-
-func secHeaders(w http.ResponseWriter) {
-	w.Header().Set("X-XSS-Protection", "1; mode=block")
-	w.Header().Set("X-Frame-Options", "DENY")
-	w.Header().Set("X-Content-Type-Options", "nosniff")
-	// w.Header().Set("Content-Security-Policy", "default-src 'self';")
-	w.Header().Set("X-Content-Type-Options", "nosniff")
-}
-
-var identityTPL = `
-<html>
-<head>
-	{{if not .IsComplete}}<meta http-equiv="refresh" content="1">{{end}}
-	<script src="https://pagecdn.io/lib/font-awesome/5.14.0/js/fontawesome.min.js"                   crossorigin="anonymous" integrity="sha256-dNZKI9qQEpJG03MLdR2Rg9Dva1o+50fN3zmlDP+3I+Y="></script>
-
-	<link href="https://pagecdn.io/lib/bootstrap/4.5.1/css/bootstrap.min.css"       rel="stylesheet" crossorigin="anonymous" integrity="sha256-VoFZSlmyTXsegReQCNmbXrS4hBBUl/cexZvPmPWoJsY=" >
-	<link href="https://pagecdn.io/lib/font-awesome/5.14.0/css/fontawesome.min.css" rel="stylesheet" crossorigin="anonymous" integrity="sha256-7YMlwkILTJEm0TSengNDszUuNSeZu4KTN3z7XrhUQvc=" >
-	<link href="https://pagecdn.io/lib/font-awesome/5.14.0/css/solid.min.css"       rel="stylesheet" crossorigin="anonymous" integrity="sha256-s0DhrAmIsT5gZ3X4f+9wIXUbH52CMiqFAwgqCmdPoec=" >
-	<link href="https://pagecdn.io/lib/font-awesome/5.14.0/css/regular.min.css"     rel="stylesheet" crossorigin="anonymous" integrity="sha256-FAKIbnpfWhK6v5Re+NAi9n+5+dXanJvXVFohtH6WAuw=" >
-	<link href="https://pagecdn.io/lib/font-awesome/5.14.0/css/brands.min.css"      rel="stylesheet" crossorigin="anonymous" integrity="sha256-xN44ju35FR+kTO/TP/UkqrVbM3LpqUI1VJCWDGbG1ew=" >
-
-{{ with .Style }}
-	<style>
-		{{range $i, $val := .Palette}}.fg-color-{{$i}} { color: {{$val}}; }
-		{{end}}
-
-		{{range $i, $val := .Palette}}.bg-color-{{$i}} { background-color: {{$val}}; }
-		{{end}}
-
-		body {
-			background-image: url('{{.Background}}');
-			background-repeat: repeat;
-			background-color: {{index .Palette 7}};
-			padding-top: 1em;
-		}
-		.heading {
-			background-image: url('{{.Cover}}');
-			background-size: cover;
-			background-repeat: no-repeat;
-			background-color: {{index .Palette 3}};
-		}
-		.shade { background-color: {{index .Palette 3}}80; border-radius: .25rem;}
-		.lead { padding:0; margin:0;  }
-
-		//  (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)
-		 @media only screen and (max-width: 576px) {
-			 .h1, .h2, .h3, .h4, .h5, h6 { font-size: 50% }
-		 }
-	</style>
-{{end}}
-</head>
-
-<body>
-	<div class="container">
-	<div class="card">
-		<div class="jumbotron heading">
-		<div class="container">
-			<div class="row shade">
-
-				{{ with .Err }}
-					<div class="col-xs">
-						<i class="fas fa-exclamation-triangle fa-4x fg-color-11"></i>
-					</div>
-
-					<div class="col-lg">
-						<h1 class="display-8 fg-color-8">Something went wrong...</h1>
-						<pre class="fg-color-11">{{.}}</pre>
-					</div>
-				{{else}}
-					{{ with .Style }}
-						<div class="col-xs">
-							<img src="{{.Avatar}}" class="img-thumbnail" alt="avatar" style="width:88px; height:88px">
-						</div>
-					{{end}}
-
-
-					{{with .Entity}}
-					<div class="col-lg">
-						<h1 class="display-8 fg-color-8">{{.Primary.Name}}</h1>
-						<p class="lead fg-color-11"><i class="fas fa-fingerprint"></i> {{.Fingerprint}}</p>
-					</div>
-					{{else}}
-					<div class="col-lg">
-						<h1 class="display-8 fg-color-8">Loading...</h1>
-						<p class="lead fg-color-11">Reading key from remote service.</p>
-					</div>
-					{{end}}
-				{{end}}
-			</div>
-		</div>
-		</div>
-
-		<div class="container">
-		{{ with .Entity }}
-		 	<div class="card">
-				<div class="card-header">Contact</div>
-				<div class="list-group list-group-flush">
-					{{with .Primary}}<a href="mailto:{{.Address}}" class="list-group-item list-group-item-action"><i class="fas fa-envelope"></i> <b>{{.Name}} &lt;{{.Address}}&gt;</b> <span class="badge badge-secondary">Primary</span></a>{{end}}
-					{{range .Emails}}<a href="mailto:{{.Address}}" class="list-group-item list-group-item-action"><i class="far fa-envelope"></i> {{.Name}} &lt;{{.Address}}&gt;</a>{{end}}
-				</div>
-			</div>
-			<br />
-		{{end}}
-
-		{{with .Proofs}}
-			<div class="card">
-				<div class="card-header">Proofs</div>
-				<ul class="list-group list-group-flush">
-					{{range .}}
-					<li class="list-group-item">
-						<i class="{{.Icon}}"></i>
-						<span class="badge badge-secondary">{{.Service}}</span>
-						{{.Name}}
-						{{if .Checked}}
-							{{if .Verified}}Verified{{else}}Invalid{{end}}
-						{{else}}Checking...{{end}}
-					</li>
-					{{end}}
-				</ul>
-			</div>
-			<br/>
-		{{else}}
-			<div class="card">
-				<div class="card-header">Proofs</div>
-				<div class="card-body">Loading...</div>
-			</div>
-			<br/>
-		{{end}}
-		</div>
-
-		<div class="card-footer text-muted text-center">
-			&copy; 2020 Sour.is
-		</div>
-	</div>
-	</div>
-</body>
-</html>
-`

src/routes/image.go

@@ -1,156 +0,0 @@
-package routes
-
-import (
-	"crypto/sha256"
-	"encoding/base64"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/gorilla/mux"
-	"github.com/h2non/filetype"
-	"sour.is/x/toolbox/httpsrv"
-	"sour.is/x/toolbox/log"
-
-	"sour.is/x/paste/src/pkg/readutil"
-)
-
-func init() {
-	a := &image{}
-	httpsrv.RegisterModule("image", a.config)
-
-	httpsrv.HttpRegister("image", httpsrv.HttpRoutes{
-		{Name: "getImage", Method: "GET", Pattern: "/i/{name}", HandlerFunc: a.get},
-		{Name: "putImage", Method: "PUT", Pattern: "/i", HandlerFunc: a.put},
-		{Name: "getStyle", Method: "GET", Pattern: "/{style:avatar|bg|cover}/", HandlerFunc: a.getStyle},
-	})
-}
-
-type image struct {
-	store   string
-	maxSize int64
-}
-
-func (a *image) config(config map[string]string) {
-	a.store = "data/"
-	if config["store"] != "" {
-		a.store = config["store"]
-	}
-
-	if !chkStore(a.store) {
-		log.Criticalf("Image: store location [%s] does not exist or is not writable.", a.store)
-	}
-	log.Noticef("Image: store location set to [%s]", a.store)
-
-	a.maxSize = 10 * 1024 * 1024
-	if s, ok := config["max-size"]; ok {
-		if i, err := strconv.Atoi(s); err == nil {
-			a.maxSize = int64(i)
-		}
-	}
-	log.Noticef("Image: store max-size set to [%d]", a.maxSize)
-}
-
-func (a *image) get(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-
-	name := vars["name"]
-
-	ext := filepath.Ext(name)
-	id := strings.TrimSuffix(name, ext)
-
-	fname := filepath.Join(a.store, id)
-
-	if !chkFile(fname) {
-		httpsrv.WriteError(w, http.StatusNotFound, "Not Found")
-
-		return
-	}
-
-	if chkGone(fname) {
-		httpsrv.WriteError(w, http.StatusGone, "Gone")
-
-		return
-	}
-
-	f, err := os.Open(fname)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer f.Close()
-
-	pr := readutil.NewPreviewReader(f)
-
-	mime, _ := readutil.ReadMIME(pr, name)
-	w.Header().Set("Content-Type", mime)
-	w.Header().Set("X-Content-Type-Options", "nosniff")
-
-	_, _ = io.Copy(w, pr.Drain())
-}
-
-func (a *image) put(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-
-	if h := r.Header.Get("Content-Length"); h != "" {
-		log.Debugs("Artifact:", "content-length", h, "max-length", a.maxSize)
-		if i, err := strconv.Atoi(h); err == nil {
-			if int64(i) > a.maxSize {
-				log.Error("ERR Size Too Large")
-				http.Error(w, "ERR Size Too Large", http.StatusRequestEntityTooLarge)
-				return
-			}
-		}
-	}
-
-	rdr := io.LimitReader(r.Body, a.maxSize)
-	pr := readutil.NewPreviewReader(rdr)
-	if !isImageOrVideo(pr) {
-		httpsrv.WriteError(w, http.StatusUnsupportedMediaType, "ERR Not Image")
-		return
-	}
-	rdr = pr.Drain()
-
-	s256 := sha256.New()
-	tmp, err := ioutil.TempFile(a.store, "image-")
-	if err != nil {
-		httpsrv.WriteError(w, 400, err.Error())
-		return
-	}
-	defer os.Remove(tmp.Name())
-
-	m := io.MultiWriter(s256, tmp)
-	if _, err = io.Copy(m, rdr); err != nil {
-		httpsrv.WriteError(w, 400, err.Error())
-		return
-	}
-	tmp.Close()
-
-	id := base64.RawURLEncoding.EncodeToString(s256.Sum(nil)[12:])
-	fname := filepath.Join(a.store, id)
-
-	log.Debugs("Image: moving file", "src", tmp.Name(), "dst", fname)
-	err = os.Rename(tmp.Name(), fname)
-	if err != nil {
-		httpsrv.WriteError(w, 400, err.Error())
-		return
-	}
-
-	httpsrv.WriteText(w, http.StatusCreated, id)
-}
-
-func isImageOrVideo(in io.Reader) bool {
-	buf := make([]byte, 320)
-	_, err := in.Read(buf)
-	if err != nil {
-		return false
-	}
-	return filetype.IsImage(buf) || filetype.IsVideo(buf)
-}
-
-func (a *image) getStyle(w http.ResponseWriter, r *http.Request) {
-
-}

src/routes/paste.go

@@ -1,236 +0,0 @@
-package routes
-
-import (
-	"bufio"
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/base64"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/gorilla/mux"
-	"golang.org/x/sys/unix"
-	"sour.is/x/paste/src/pkg/readutil"
-	"sour.is/x/toolbox/httpsrv"
-	"sour.is/x/toolbox/log"
-)
-
-func init() {
-	p := &Paste{}
-
-	httpsrv.RegisterModule("paste", p.setConfig)
-
-	httpsrv.HttpRegister("paste", httpsrv.HttpRoutes{
-		{Name: "getRandom", Method: "GET", Pattern: "/paste/rng", HandlerFunc: p.getRandom},
-		{Name: "getPaste", Method: "GET", Pattern: "/paste/{id}", HandlerFunc: p.getPaste},
-		{Name: "getPaste", Method: "GET", Pattern: "/paste/get/{id}", HandlerFunc: p.getPaste},
-		{Name: "postPaste", Method: "POST", Pattern: "/paste", HandlerFunc: p.postPaste},
-
-		{Name: "getRandom", Method: "GET", Pattern: "/api/rng", HandlerFunc: p.getRandom},
-		{Name: "getPaste", Method: "GET", Pattern: "/api/{id}", HandlerFunc: p.getPaste},
-		{Name: "getPaste", Method: "GET", Pattern: "/api/get/{id}", HandlerFunc: p.getPaste},
-		{Name: "postPaste", Method: "POST", Pattern: "/api", HandlerFunc: p.postPaste},
-	})
-}
-
-type Paste struct {
-	store     string
-	randBytes int
-}
-
-func (p *Paste) setConfig(config map[string]string) {
-	p.store = "data/"
-	if config["store"] != "" {
-		p.store = config["store"]
-	}
-
-	if !chkStore(p.store) {
-		log.Criticalf("Paste: store location [%s] does not exist or is not writable.", p.store)
-	}
-	log.Noticef("Paste: store location set to [%s]", p.store)
-
-	p.randBytes = 1024
-	if config["random"] != "" {
-		p.randBytes, _ = strconv.Atoi(config["random"])
-		log.Noticef("Paste: set random size to %d bytes", p.randBytes)
-	}
-}
-
-func chkStore(path string) bool {
-	file, err := os.Stat(path)
-
-	if err != nil && os.IsNotExist(err) {
-		err = os.MkdirAll(path, 0744)
-		if err != nil {
-			return false
-		}
-
-		file, err = os.Stat(path)
-	}
-
-	if err != nil {
-		return false
-	}
-
-	if !file.IsDir() {
-		return false
-	}
-
-	if unix.Access(path, unix.W_OK&unix.R_OK) != nil {
-		return false
-	}
-
-	return true
-}
-
-func chkFile(path string) bool {
-	file, err := os.Stat(path)
-	if err != nil {
-		return false
-	}
-
-	if file.IsDir() {
-		return false
-	}
-
-	if unix.Access(path, unix.W_OK&unix.R_OK) != nil {
-		return false
-	}
-
-	return true
-}
-
-func chkGone(path string) bool {
-	file, err := os.Stat(path)
-	if err != nil {
-		return true
-	}
-
-	if file.Size() == 0 {
-		return true
-	}
-
-	return false
-}
-
-func (p *Paste) getRandom(w http.ResponseWriter, _ *http.Request) {
-	s := make([]byte, p.randBytes)
-	_, _ = rand.Read(s)
-
-	w.Header().Set("content-type", "application/octet-stream")
-	w.WriteHeader(http.StatusOK)
-	_, _ = w.Write(s)
-}
-
-func (p *Paste) getPaste(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	id := vars["id"]
-
-	fname := filepath.Join(p.store, id)
-
-	if !chkFile(fname) {
-		httpsrv.WriteText(w, http.StatusNotFound, "ERR Not Found")
-		return
-	}
-
-	if chkGone(fname) {
-		httpsrv.WriteText(w, http.StatusGone, "ERR Gone")
-		return
-	}
-
-	f, err := os.Open(fname)
-	if err != nil {
-		log.Fatal(err)
-		httpsrv.WriteText(w, http.StatusInternalServerError, "ERR Reading Content")
-	}
-	defer f.Close()
-
-	pr := readutil.NewPreviewReader(f)
-
-	keep := true
-	scanner := bufio.NewScanner(pr)
-	for scanner.Scan() {
-		txt := scanner.Text()
-		log.Debug(txt)
-
-		// End of header found
-		if txt == "" {
-			break
-		}
-
-		if strings.HasPrefix(txt, "exp:") {
-			now := time.Now().Unix()
-			exp, err := strconv.ParseInt(strings.TrimSpace(strings.TrimPrefix(txt, "exp:")), 10, 64)
-			if err != nil {
-				log.Warning(err)
-			}
-
-			log.Debugf("%d > %d", now, exp)
-			if now > exp {
-				w.WriteHeader(http.StatusGone)
-				_, _ = w.Write([]byte("ERR Gone"))
-
-				deleteFile(fname)
-
-				return
-			}
-		}
-
-		if strings.HasPrefix(txt, "burn:") {
-			burn := strings.TrimSpace(strings.TrimPrefix(txt, "burn:"))
-
-			if burn == "true" {
-				keep = false
-			}
-		}
-	}
-
-	w.WriteHeader(http.StatusOK)
-	_, _ = io.Copy(w, pr.Drain())
-
-	if !keep {
-		deleteFile(fname)
-	}
-}
-
-func (p *Paste) postPaste(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-
-	rdr := io.LimitReader(r.Body, 1048576)
-
-	s256 := sha256.New()
-	tmp, _ := ioutil.TempFile(p.store, "arch-")
-	defer os.Remove(tmp.Name())
-
-	m := io.MultiWriter(s256, tmp)
-	if _, err := io.Copy(m, rdr); err != nil {
-		httpsrv.WriteError(w, 400, err.Error())
-	}
-	tmp.Close()
-
-	id := base64.RawURLEncoding.EncodeToString(s256.Sum(nil)[12:])
-	fname := filepath.Join(p.store, id)
-
-	_ = os.Rename(tmp.Name(), fname)
-
-	httpsrv.WriteText(w, http.StatusCreated, "OK "+id)
-}
-
-// func checkErr(err error, w http.ResponseWriter) bool {
-// 	if err != nil {
-// 		httpsrv.WriteObject(w, http.StatusBadRequest, err)
-// 		return true
-// 	}
-
-// 	return false
-// }
-
-func deleteFile(path string) {
-	_ = ioutil.WriteFile(path, nil, 0644)
-}

src/routes/public.go

@@ -1,26 +0,0 @@
-package routes
-
-import (
-	"fmt"
-	"net/http"
-
-	"sour.is/x/toolbox/httpsrv"
-)
-
-func init() {
-	asset := assetFS()
-	fmt.Printf("%#v\n", asset)
-
-	httpsrv.HttpRegister("ui", httpsrv.HttpRoutes{
-		{
-			Name:        "Assets",
-			Method:      "GET",
-			Pattern:     "/ui{path:.*}",
-			HandlerFunc: http.StripPrefix("/ui", http.FileServer(httpsrv.FsHtml5(asset))).ServeHTTP,
-		},
-
-		{Name: "Root", Method: "GET", Pattern: "/", HandlerFunc: http.RedirectHandler("/ui/", http.StatusFound).ServeHTTP},
-	})
-}
-
-//go:generate go run github.com/sour-is/go-assetfs/cmd/assetfs -pkg routes  -prefix ../../ ../../public/...

src/routes/shorturl.go

@@ -1,167 +0,0 @@
-package routes
-
-import (
-	"net/http"
-	"net/url"
-	"regexp"
-
-	"github.com/gorilla/mux"
-	"github.com/timshannon/badgerhold"
-
-	"sour.is/x/toolbox/httpsrv"
-	"sour.is/x/toolbox/log"
-	"sour.is/x/toolbox/uuid"
-)
-
-type logger struct{}
-
-func (logger) Errorf(s string, o ...interface{})   { log.Errorf(s, o...) }
-func (logger) Warningf(s string, o ...interface{}) { log.Warningf(s, o...) }
-func (logger) Infof(s string, o ...interface{})    { log.Infof(s, o...) }
-func (logger) Debugf(s string, o ...interface{})   { log.Debugf(s, o...) }
-
-func init() {
-	s := &shortDB{}
-	httpsrv.RegisterModule("short", s.config)
-
-	httpsrv.HttpRegister("short", httpsrv.HttpRoutes{
-		{Name: "get", Method: "GET", Pattern: "/s/{id}", HandlerFunc: s.get},
-		{Name: "put", Method: "PUT", Pattern: "/s/{id}", HandlerFunc: s.put},
-	})
-}
-
-type shortDB struct {
-	options badgerhold.Options
-}
-
-func (s *shortDB) config(config map[string]string) {
-	s.options = badgerhold.DefaultOptions
-	s.options.Options = s.options.WithLogger(logger{})
-
-	var ok bool
-	if s.options.Dir, ok = config["index"]; !ok {
-		s.options.Dir = "data"
-	}
-
-	if s.options.ValueDir, ok = config["value"]; !ok {
-		s.options.ValueDir = "data"
-	}
-
-	store, err := badgerhold.Open(s.options)
-	defer func() {
-		if err = store.Close(); err != nil {
-			log.Fatal(err)
-		}
-	}()
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-func (s *shortDB) get(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-
-	id := vars["id"]
-
-	store, err := badgerhold.Open(s.options)
-	defer func() {
-		if err = store.Close(); err != nil {
-			log.Fatal(err)
-		}
-	}()
-	if err != nil {
-		httpsrv.WriteText(w, 500, err.Error())
-		return
-	}
-
-	var url shortURL
-	err = store.Get(id, &url)
-	if err != nil && err != badgerhold.ErrNotFound {
-		httpsrv.WriteText(w, 500, err.Error())
-		return
-	}
-	if err == badgerhold.ErrNotFound {
-		httpsrv.WriteText(w, 404, "not found")
-		return
-	}
-
-	w.Header().Set("Location", url.URL)
-	w.WriteHeader(http.StatusFound)
-}
-func (s *shortDB) put(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-
-	id := vars["id"]
-	secret := r.FormValue("secret")
-	u, err := url.Parse(r.FormValue("url"))
-	if err != nil {
-		httpsrv.WriteText(w, 400, "bad url")
-		return
-	}
-
-	store, err := badgerhold.Open(s.options)
-	defer func() {
-		if err = store.Close(); err != nil {
-			log.Fatal(err)
-		}
-	}()
-	if err != nil {
-		httpsrv.WriteText(w, 500, err.Error())
-		return
-	}
-
-	url := &shortURL{}
-	err = store.Get(id, url)
-	if err != nil && err != badgerhold.ErrNotFound {
-		httpsrv.WriteText(w, 500, err.Error())
-		return
-	}
-
-	if err == badgerhold.ErrNotFound {
-		url = newShortURL(id, secret, u.String())
-
-		err := store.Insert(url.ID, url)
-		if err != nil {
-			httpsrv.WriteText(w, 500, err.Error())
-			return
-		}
-
-		httpsrv.WriteObject(w, 200, url)
-		return
-	}
-
-	if secret == "" {
-		httpsrv.WriteError(w, 401, "no auth")
-		return
-	}
-
-	if secret != url.Secret {
-		httpsrv.WriteError(w, 403, "forbidden")
-		return
-	}
-
-	err = store.Upsert(url.ID, url)
-	if err != nil {
-		httpsrv.WriteText(w, 500, err.Error())
-		return
-	}
-
-	httpsrv.WriteObject(w, 200, url)
-}
-
-type shortURL struct {
-	ID     string `badgerhold:"unique"`
-	URL    string
-	Secret string
-}
-
-func newShortURL(id, secret, u string) *shortURL {
-	m, err := regexp.MatchString("[a-z-]{1,64}", id)
-	if id == "" || !m || err != nil {
-		id = uuid.V4()
-	}
-	m, err = regexp.MatchString("[a-z-]{1,64}", secret)
-	if secret == "" || !m || err != nil {
-		secret = uuid.V4()
-	}
-	return &shortURL{ID: id, Secret: secret, URL: u}
-}

svc.http.go

@@ -0,0 +1,49 @@
+package main
+
+import (
+	"context"
+	"log"
+	"net/http"
+	"strings"
+
+	"github.com/rs/cors"
+
+	"go.sour.is/pkg/env"
+	"go.sour.is/pkg/lg"
+	"go.sour.is/pkg/mux"
+	"go.sour.is/pkg/service"
+	"go.sour.is/pkg/slice"
+)
+
+var _ = apps.Register(20, func(ctx context.Context, svc *service.Harness) error {
+	s := &http.Server{}
+	svc.Add(s)
+
+	mux := mux.New()
+
+	s.Handler = cors.AllowAll().Handler(mux)
+	
+	hdlr := s.Handler
+	s.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		log.Println(r.Method, r.URL.Path)
+		hdlr.ServeHTTP(w, r)
+	})
+
+	s.Addr = env.Default("HTTP_LISTEN", ":8080")
+	if strings.HasPrefix(s.Addr, ":") {
+		s.Addr = "[::]" + s.Addr
+	}
+	svc.OnStart(func(ctx context.Context) error {
+		_, span := lg.Span(ctx)
+		defer span.End()
+
+		log.Print("Listen on ", s.Addr)
+		span.AddEvent("begin listen and serve on " + s.Addr)
+
+		mux.Add(slice.FilterType[interface{ RegisterHTTP(*http.ServeMux) }](svc.Services...)...)
+		return s.ListenAndServe()
+	})
+	svc.OnStop(s.Shutdown)
+
+	return nil
+})

tools/tools.go

@@ -1,15 +0,0 @@
-// +build tools
-
-package tools
-
-import (
-	_ "github.com/99designs/gqlgen"
-
-	_ "github.com/go-swagger/go-swagger/cmd/swagger"
-
-	_ "github.com/sour-is/go-assetfs/cmd/assetfs"
-	_ "github.com/sour-is/go-assetfs/cmd/bindata"
-	_ "github.com/sour-is/go-assetfs/pkg/assetfs"
-
-	_ "github.com/vektah/dataloaden"
-)