fix missing files
This commit is contained in:
Jon Lundy
parent
7e3eee56e0
commit
8f48e36da8
GPG Key ID:
C63E6D61F3035024
2
Makefile
2
Makefile
|
|
@ -1,7 +1,7 @@
|
|||
NAME=sour.is-keyproofs
|
||||
BUMP?=current
|
||||
DATE:=$(shell date -u +%FT%TZ)
|
||||
HASH:=$(shell git rev-pars HEAD 2> /dev/null)
|
||||
HASH:=$(shell git rev-parse HEAD 2> /dev/null)
|
||||
VERSION:=$(shell BUMP=$(BUMP) ./version.sh)
|
||||
|
||||
|
||||
|
|
|
|||
230
pkg/keyproofs/routes-avatar.go
Normal file
230
pkg/keyproofs/routes-avatar.go
Normal file
|
|
@ -0,0 +1,230 @@
|
|||
package keyproofs
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/md5"
|
||||
"crypto/sha1"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/fsnotify/fsnotify"
|
||||
"github.com/go-chi/chi"
|
||||
"github.com/rs/zerolog/log"
|
||||
"github.com/sour-is/keyproofs/pkg/graceful"
|
||||
)
|
||||
|
||||
type avatarApp struct {
|
||||
path string
|
||||
}
|
||||
|
||||
func NewAvatarApp(ctx context.Context, path string) (*avatarApp, error) {
|
||||
log := log.Ctx(ctx)
|
||||
|
||||
path = filepath.Clean(path)
|
||||
app := &avatarApp{path: path}
|
||||
err := app.CheckFiles(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
watch, err := fsnotify.NewWatcher()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, typ := range []string{"avatar", "bg", "cover"} {
|
||||
err = watch.Add(filepath.Join(path, typ))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
log.Debug().Msg("startup avatar watcher")
|
||||
wg := graceful.WaitGroup(ctx)
|
||||
wg.Go(func() error {
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
log.Debug().Msg("shutdown avatar watcher")
|
||||
return nil
|
||||
case op := <-watch.Events:
|
||||
log.Print(op)
|
||||
switch op.Op {
|
||||
case fsnotify.Create:
|
||||
path = filepath.Dir(op.Name)
|
||||
kind := filepath.Base(path)
|
||||
name := filepath.Base(op.Name)
|
||||
if err := createLinks(app.path, kind, name); err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
case fsnotify.Remove, fsnotify.Rename:
|
||||
path = filepath.Dir(op.Name)
|
||||
kind := filepath.Base(path)
|
||||
name := filepath.Base(op.Name)
|
||||
if err := removeLinks(app.path, kind, name); err != nil {
|
||||
log.Error().Err(err).Send()
|
||||
}
|
||||
default:
|
||||
}
|
||||
case err := <-watch.Errors:
|
||||
fmt.Println(err)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return app, nil
|
||||
}
|
||||
|
||||
func (app *avatarApp) CheckFiles(ctx context.Context) error {
|
||||
log := log.Ctx(ctx)
|
||||
|
||||
for _, name := range []string{".links", "avatar", "bg", "cover"} {
|
||||
log.Debug().Msgf("mkdir: %s", filepath.Join(app.path, name))
|
||||
err := os.MkdirAll(filepath.Join(app.path, name), 0700)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return filepath.Walk(app.path, func(path string, info os.FileInfo, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if info.IsDir() {
|
||||
if info.Name() == ".links" {
|
||||
return filepath.SkipDir
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
path = filepath.Dir(path)
|
||||
kind := filepath.Base(path)
|
||||
name := info.Name()
|
||||
|
||||
log.Debug().Msgf("link: %s %s %s", app.path, kind, name)
|
||||
|
||||
return createLinks(app.path, kind, name)
|
||||
})
|
||||
}
|
||||
|
||||
func (app *avatarApp) get(w http.ResponseWriter, r *http.Request) {
|
||||
log := log.Ctx(r.Context())
|
||||
|
||||
log.Print(r.Host)
|
||||
|
||||
kind := chi.URLParam(r, "kind")
|
||||
hash := chi.URLParam(r, "hash")
|
||||
|
||||
if strings.ContainsRune(hash, '@') {
|
||||
avatarHost, _, err := styleSRV(r.Context(), hash)
|
||||
if err != nil {
|
||||
writeText(w, 500, err.Error())
|
||||
return
|
||||
}
|
||||
hash = hashSHA1(strings.ToLower(hash))
|
||||
http.Redirect(w, r, fmt.Sprintf("https://%s/%s/%s?%s", avatarHost, kind, hash, r.URL.RawQuery), 301)
|
||||
return
|
||||
}
|
||||
|
||||
fname := filepath.Join(app.path, ".links", strings.Join([]string{kind, hash}, "-"))
|
||||
log.Debug().Msgf("path: %s", fname)
|
||||
|
||||
f, err := os.Open(fname)
|
||||
if err != nil {
|
||||
writeText(w, 500, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
_, err = io.Copy(w, f)
|
||||
if err != nil {
|
||||
writeText(w, 500, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (app *avatarApp) Routes(r *chi.Mux) {
|
||||
r.MethodFunc("GET", "/{kind:avatar|bg|cover}/{hash}", app.get)
|
||||
}
|
||||
|
||||
func hashMD5(name string) string {
|
||||
h := md5.New()
|
||||
_, _ = h.Write([]byte(name))
|
||||
|
||||
return fmt.Sprintf("%x", h.Sum(nil))
|
||||
}
|
||||
func hashSHA1(name string) string {
|
||||
h := sha1.New()
|
||||
_, _ = h.Write([]byte(name))
|
||||
|
||||
return fmt.Sprintf("%x", h.Sum(nil))
|
||||
}
|
||||
|
||||
func createLinks(path, kind, name string) error {
|
||||
if !strings.ContainsRune(name, '@') {
|
||||
return nil
|
||||
}
|
||||
|
||||
src := filepath.Join("..", kind, name)
|
||||
name = strings.ToLower(name)
|
||||
|
||||
hash := hashMD5(name)
|
||||
link := filepath.Join(path, ".links", strings.Join([]string{kind, hash}, "-"))
|
||||
err := replaceLink(src, link)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
hash = hashSHA1(name)
|
||||
link = filepath.Join(path, ".links", strings.Join([]string{kind, hash}, "-"))
|
||||
err = replaceLink(src, link)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func removeLinks(path, kind, name string) error {
|
||||
if !strings.ContainsRune(name, '@') {
|
||||
return nil
|
||||
}
|
||||
name = strings.ToLower(name)
|
||||
|
||||
hash := hashMD5(name)
|
||||
link := filepath.Join(path, ".links", strings.Join([]string{kind, hash}, "-"))
|
||||
err := os.Remove(link)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
hash = hashSHA1(name)
|
||||
link = filepath.Join(path, ".links", strings.Join([]string{kind, hash}, "-"))
|
||||
err = os.Remove(link)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func replaceLink(src, link string) error {
|
||||
if dst, err := os.Readlink(link); err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
err = os.Symlink(src, link)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if dst != src {
|
||||
err = os.Remove(link)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = os.Symlink(src, link)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -147,6 +147,7 @@ func (app *keyproofApp) getProofs(w http.ResponseWriter, r *http.Request) {
|
|||
|
||||
page := page{Style: defaultStyle}
|
||||
page.AppName = fmt.Sprintf("%s v%s", cfg.GetString("app-name"), cfg.GetString("app-version"))
|
||||
page.AppBuild = fmt.Sprintf("%s %s", cfg.GetString("build-date"), cfg.GetString("build-hash"))
|
||||
|
||||
// Wait for either entity to resolve or timeout
|
||||
select {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
package keyproofs
|
||||
|
||||
type page struct {
|
||||
AppName string
|
||||
Entity *Entity
|
||||
Style *Style
|
||||
Proofs *Proofs
|
||||
AppName string
|
||||
AppBuild string
|
||||
Entity *Entity
|
||||
Style *Style
|
||||
Proofs *Proofs
|
||||
|
||||
Markdown string
|
||||
HasProofs bool
|
||||
|
|
@ -81,7 +82,7 @@ var pageTPL = `
|
|||
{{template "content" .}}
|
||||
|
||||
<div class="card-footer text-muted text-center">
|
||||
<a href="/">{{.AppName}}</a>
|
||||
<a href="/" alt="{{.AppBuild}}">{{.AppName}}</a>
|
||||
| © 2020 Sour.is
|
||||
| <a href="/id/me@sour.is">About me</a>
|
||||
| <a href="https://github.com/sour-is/keyproofs">GitHub</a>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user