updates to identity site

.drone.yml

@@ -39,10 +39,10 @@ steps:
 - name: Build Release
   commands:
     - cd debian
+    - make tag
     - make build
     - make copy
     - make deploy
-    - make tag
 trigger:
   event:
   - promote

Makefile

@@ -3,8 +3,12 @@ DOCS_ASSET=src/docs/bindata.go
 
 SOURCE=$(wildcard cmd/paste/*.go) $(filter-out src/routes/bindata.go, $(wildcard src/routes/*.go))
 BINARY=paste
+PKG=./cmd/paste
 
-VERSION:=$(shell debian/inc_version.sh -p $(shell git describe --tags `git rev-list --tags --max-count=1`))
+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
@@ -26,8 +30,10 @@ fmt:
 test: $(ROUTE_ASSET) $(DOCS_ASSET)
 	go test ./...
 	go vet ./...
-run: $(BINARY)
+run:
-	./$(BINARY) -vv serve
+	go run \
+	  -ldflags "-X main.AppVersion=$(VERSION_PAT) -X main.AppBuild=$(DATE)" \
+	  $(PKG) -vv serve
 
 $(BINARY): $(SOURCE) $(ROUTE_ASSET) $(DOCS_ASSET)
 	go build -v \
@@ -48,6 +54,7 @@ $(DOCS_ASSET):
 	echo "$$DUMMY_BINDATA" > src/docs/bindata.go
 	go generate "sour.is/x/paste/cmd/paste"
 	go generate "sour.is/x/paste/src/docs"
+
 deploy: $(SOURCE) $(ROUTE_ASSET)
 	cd debian && make
 

cmd/paste/config.go

@@ -54,6 +54,8 @@ store = "data/artifact"
 [module.image]
 store = "data/image"
 
+[module.short]
+store = "data/meta.db"
 `
 
 var args map[string]interface{}

debian/Makefile

@@ -25,8 +25,8 @@ build:
     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; \
+        sour.is/x/paste/cmd/paste && \
-	dpkg -b $${BUILD};
+	dpkg -b $${BUILD}
 
 copy:
 	export BUILD="BUILD/$(NAME)_$(VERSION)"; \

go.mod

@@ -5,16 +5,24 @@ go 1.14
 require (
 	github.com/99designs/gqlgen v0.12.2
 	github.com/andybalholm/brotli v1.0.0
+	github.com/coreos/bbolt v1.3.2
 	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/gomarkdown/markdown v0.0.0-20200824053859-8c8b3816f167
 	github.com/gorilla/mux v1.8.0
 	github.com/h2non/filetype v1.1.0
-	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/hashicorp/golang-lru v0.5.1
+	github.com/lucasb-eyer/go-colorful v1.0.3
 	github.com/remyoudompheng/go-liblzma v0.0.0-20190506200333-81bf2d431b96
+	github.com/sour-is/crypto v0.0.0-20201016232853-f42a24ba5a81
 	github.com/sour-is/go-assetfs v1.0.0
 	github.com/spf13/viper v1.7.1
+	github.com/tv42/zbase32 v0.0.0-20190604154422-aacc64a8f915
 	github.com/vektah/dataloaden v0.3.0
+	go.etcd.io/bbolt v1.3.5 // indirect
+	go.uber.org/ratelimit v0.1.0
+	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
 	golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a
 	sour.is/x/toolbox v0.12.17
 )

go.sum

@@ -58,6 +58,7 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 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=
@@ -221,6 +222,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/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/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=
@@ -324,6 +327,7 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtB
 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/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=
@@ -432,6 +436,8 @@ github.com/smartystreets/goconvey v0.0.0-20170602164621-9e8dc3f972df/go.mod h1:X
 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=
@@ -481,6 +487,8 @@ github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhV
 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/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=
@@ -504,6 +512,8 @@ 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.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
+go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 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=
@@ -514,7 +524,10 @@ 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/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/ratelimit v0.1.0/go.mod h1:2X8KaoNd1J0lZV+PxJk/5+DGbO/tpwLR1m++a7FnB/Y=
 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-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -528,6 +541,7 @@ golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8U
 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=
@@ -610,6 +624,7 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w
 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.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a h1:i47hUS795cOydZI4AwJQCKXOr4BvxzvikwDoDtHhP2Y=

src/pkg/cache/cache.go

@@ -0,0 +1,77 @@
+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

@@ -0,0 +1,223 @@
+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()
+
+	tr.limiter.Take()
+
+	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(1),
+	}
+
+	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/routes/artifact.go

@@ -15,6 +15,10 @@ import (
 	"github.com/gorilla/mux"
 	"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() {
@@ -78,7 +82,7 @@ func (a *Artifact) get(w http.ResponseWriter, r *http.Request) {
 
 	f, err := os.Open(fname)
 	if err != nil {
-		log.Fatal(err)
+		log.Error(err)
 	}
 	defer f.Close()
 
@@ -93,7 +97,7 @@ func (a *Artifact) get(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", mime)
 		w.Header().Set("X-Content-Type-Options", "nosniff")
 
-		io.Copy(w, pr.Drain())
+		_, _ = io.Copy(w, pr.Drain())
 		return
 	}
 
@@ -107,7 +111,7 @@ func (a *Artifact) get(w http.ResponseWriter, r *http.Request) {
 	}
 
 	tr := tar.NewReader(rdr)
-	if path == "..." {
+	if path == "@" {
 		var paths []string
 		for {
 			hdr, err := tr.Next()
@@ -115,7 +119,7 @@ func (a *Artifact) get(w http.ResponseWriter, r *http.Request) {
 				break // End of archive
 			}
 			if err != nil {
-				log.Fatal(err)
+				log.Error(err)
 			}
 			paths = append(paths, hdr.Name)
 		}
@@ -130,9 +134,37 @@ func (a *Artifact) get(w http.ResponseWriter, r *http.Request) {
 			break // End of archive
 		}
 		if err != nil {
-			log.Fatal(err)
+			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 := NewPreviewReader(tr)
 
 			mime, err := ReadMIME(pr, hdr.Name)
@@ -143,7 +175,7 @@ func (a *Artifact) get(w http.ResponseWriter, r *http.Request) {
 			w.Header().Set("Content-Type", mime)
 
 			if _, err := io.Copy(w, pr.Drain()); err != nil {
-				log.Fatal(err)
+				log.Error(err)
 			}
 			w.WriteHeader(http.StatusOK)
 			return

src/routes/identity.go

@@ -0,0 +1,635 @@
+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
+		}
+
+		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
+			}
+
+			q.Resolve(style)
+		})
+
+		for i := range entity.Proofs {
+			q.Run(ProofKey(entity.Proofs[i]), func(q promise.Q) {
+				proof := NewProof(entity.Proofs[i])
+
+				q.Resolve(proof)
+			})
+		}
+
+		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 _, p := range page.Entity.Proofs {
+				proofs[p] = NewProof(p)
+				if s, ok := s.cache.Get(ProofKey(p)); ok {
+					proofs[p] = s.Value().(*Proof)
+				} else {
+					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 = pixl
+
+	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 = "cdn.libravatar.org"
+
+	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 = "link"
+		p.Name = u.Opaque
+		p.Link = fmt.Sprintf("https://%s", u.Hostname())
+
+	case "https":
+		p.Icon = "link"
+		p.Name = u.Hostname()
+		p.Link = fmt.Sprintf("https://%s", u.Hostname())
+
+	case "xmpp":
+		p.Icon = "comments"
+		p.Name = u.Hostname()
+	}
+
+	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>
+					{{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="fas fa-{{.Icon}}"></i> <span class="badge badge-secondary">{{.Service}}</span> {{.Name}}</li>{{end}}
+				</ul>
+			</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

@@ -24,6 +24,7 @@ func init() {
 	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},
 	})
 }
 
@@ -147,3 +148,7 @@ func isImageOrVideo(in io.Reader) bool {
 	}
 	return filetype.IsImage(buf) || filetype.IsVideo(buf)
 }
+
+func (a *Image) getStyle(w http.ResponseWriter, r *http.Request) {
+
+}

src/routes/preview-reader.go

@@ -3,6 +3,7 @@ package routes
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"io"
 
 	"sour.is/x/toolbox/log"
@@ -46,9 +47,10 @@ type drainReader struct {
 	buf *bytes.Buffer
 }
 
+var _ io.Seeker = (*drainReader)(nil)
+
 func (dr *drainReader) Read(p []byte) (n int, err error) {
 	i := 0
-	// log.Debugs("drainReader:", "buf", dr.buf.Len(), "p", len(p))
 	if dr.buf.Len() > 0 {
 		i, err = dr.buf.Read(p)
 		if err != nil && err != io.EOF {
@@ -70,3 +72,14 @@ func (dr *drainReader) Read(p []byte) (n int, err error) {
 
 	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/shorturl.go

@@ -1,19 +1,23 @@
 package routes
 
 import (
+	"bytes"
+	"encoding/json"
 	"net/http"
 	"net/url"
 	"regexp"
-	"time"
 
+	"github.com/coreos/bbolt"
 	"github.com/gorilla/mux"
-	"github.com/patrickmn/go-cache"
+
 	"sour.is/x/toolbox/httpsrv"
+	"sour.is/x/toolbox/log"
 	"sour.is/x/toolbox/uuid"
 )
 
 func init() {
-	s := NewShortManager(365 * 24 * time.Hour)
+	s := &shortDB{}
+	httpsrv.RegisterModule("short", s.config)
 
 	httpsrv.HttpRegister("short", httpsrv.HttpRoutes{
 		{Name: "getShort", Method: "GET", Pattern: "/s/{id}", HandlerFunc: s.getShort},
@@ -21,38 +25,40 @@ func init() {
 	})
 }
 
-type shortManager struct {
+type shortDB struct {
-	defaultExpire time.Duration
+	path   string
-	db            *cache.Cache
+	bucket string
 }
 
-type shortURL struct {
+func (s *shortDB) config(config map[string]string) {
-	ID     string
+	s.bucket = "shortURL"
-	URL    string
+	if config["bucket"] != "" {
-	Secret string
+		s.bucket = config["bucket"]
 	}
 
-func NewShortManager(defaultExpire time.Duration) *shortManager {
+	s.path = "data/meta.db"
-	return &shortManager{
+	if config["store"] != "" {
-		defaultExpire: defaultExpire,
+		s.path = config["store"]
-		db:            cache.New(defaultExpire, defaultExpire/10),
-	}
 	}
 
-func (s *shortManager) GetURL(id string) *shortURL {
+	db, err := bbolt.Open(s.path, 0666, nil)
-	if u, ok := s.db.Get(id); ok {
+	if err != nil {
-		if url, ok := u.(*shortURL); ok {
+		log.Fatalf("ShortURL: failed to open db at [%s]", s.path)
-			return url
-		}
 	}
+	defer db.Close()
 
+	db.Update(func(tx *bbolt.Tx) error {
+		_, err := tx.CreateBucketIfNotExists([]byte(s.bucket))
+		if err != nil {
+			log.Fatalf("ShortURL: create bucket: %s", err)
+		}
 		return nil
-}
+	})
-func (s *shortManager) PutURL(id string, url *shortURL) {
+
-	s.db.SetDefault(id, url)
+	log.Noticef("ShortURL: opened db at [%s] bucket [%s]", s.path, s.bucket)
 }
 
-func (s *shortManager) getShort(w http.ResponseWriter, r *http.Request) {
+func (s *shortDB) getShort(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 
 	id := vars["id"]
@@ -67,7 +73,7 @@ func (s *shortManager) getShort(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusFound)
 }
 
-func (s *shortManager) putShort(w http.ResponseWriter, r *http.Request) {
+func (s *shortDB) putShort(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 
 	vars := mux.Vars(r)
@@ -107,6 +113,12 @@ func (s *shortManager) putShort(w http.ResponseWriter, r *http.Request) {
 	httpsrv.WriteObject(w, 200, short)
 }
 
+type shortURL struct {
+	ID     string
+	URL    string
+	Secret string
+}
+
 func newshort(id, secret, u string) *shortURL {
 	m, err := regexp.MatchString("[a-z-]{1,64}", id)
 	if id == "" || !m || err != nil {
@@ -118,3 +130,64 @@ func newshort(id, secret, u string) *shortURL {
 	}
 	return &shortURL{ID: id, Secret: secret, URL: u}
 }
+
+func (s *shortURL) Bytes() []byte {
+	if s == nil {
+		return nil
+	}
+
+	var w bytes.Buffer
+	json.NewEncoder(&w).Encode(*s)
+	return w.Bytes()
+}
+
+func URLFromBytes(b []byte) *shortURL {
+	if len(b) == 0 {
+		return nil
+	}
+	var s shortURL
+	json.Unmarshal(b, &s)
+
+	log.Debug(s)
+	return &s
+}
+
+func (s *shortDB) GetURL(id string) *shortURL {
+	db, err := bbolt.Open(s.path, 0666, nil)
+	if err != nil {
+		log.Errorf("ShortURL: failed to open db at [%s]", s.path)
+		return nil
+	}
+	defer db.Close()
+
+	var url *shortURL
+
+	err = db.View(func(tx *bbolt.Tx) error {
+		b := tx.Bucket([]byte(s.bucket))
+		v := b.Get([]byte(id))
+
+		url = URLFromBytes(v)
+
+		return nil
+	})
+	if err != nil {
+		log.Errorf("ShortURL: failed to open db at [%s]", s.path)
+	}
+	return url
+}
+func (s *shortDB) PutURL(id string, url *shortURL) {
+	db, err := bbolt.Open(s.path, 0666, nil)
+	if err != nil {
+		log.Errorf("ShortURL: failed to open db at [%s]", s.path)
+		return
+	}
+	defer db.Close()
+
+	err = db.Update(func(tx *bbolt.Tx) error {
+		b := tx.Bucket([]byte(s.bucket))
+		return b.Put([]byte(id), url.Bytes())
+	})
+	if err != nil {
+		log.Errorf("ShortURL: failed to write db at [%s]", s.path)
+	}
+}