sour-is/keyproofs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor out into packages for easier unit test writing

Browse Source
This commit is contained in:
Jon Lundy
2020-12-04 11:36:24 -07:00
parent 9db6377526
commit c00d091ed2
18 changed files with 559 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/keyproofs/routes-avatar.go → pkg/app/avatar/avatar.go
View File

@@ -1,4 +1,4 @@
package keyproofs
package app_avatar
import (
"context"
@@ -21,17 +21,20 @@ import (
"github.com/rs/zerolog/log"
"github.com/sour-is/keyproofs/pkg/graceful"
"github.com/sour-is/keyproofs/pkg/style"
)
type avatarApp struct {
var pixl = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="
type avatar struct {
path string
}
func NewAvatarApp(ctx context.Context, path string) (*avatarApp, error) {
func New(ctx context.Context, path string) (*avatar, error) {
log := log.Ctx(ctx)
path = filepath.Clean(path)
app := &avatarApp{path: path}
app := &avatar{path: path}
err := app.CheckFiles(ctx)
if err != nil {
return nil, fmt.Errorf("check files: %w", err)
@@ -84,7 +87,7 @@ func NewAvatarApp(ctx context.Context, path string) (*avatarApp, error) {
return app, nil
}
func (app *avatarApp) CheckFiles(ctx context.Context) error {
func (app *avatar) CheckFiles(ctx context.Context) error {
log := log.Ctx(ctx)
for _, name := range []string{".links", "avatar", "bg", "cover"} {
@@ -118,7 +121,7 @@ func (app *avatarApp) CheckFiles(ctx context.Context) error {
})
}
func (app *avatarApp) get(w http.ResponseWriter, r *http.Request) {
func (app *avatar) get(w http.ResponseWriter, r *http.Request) {
log := log.Ctx(r.Context())
log.Print(r.Host)
@@ -133,7 +136,7 @@ func (app *avatarApp) get(w http.ResponseWriter, r *http.Request) {
log.Debug().Int("width", sizeW).Int("height", sizeH).Bool("resize", resize).Str("kind", kind).Msg("Get Image")
if strings.ContainsRune(hash, '@') {
avatarHost, _, err := styleSRV(r.Context(), hash)
avatarHost, _, err := style.GetSRV(r.Context(), hash)
if err != nil {
writeText(w, 500, err.Error())
return
@@ -213,7 +216,7 @@ func (app *avatarApp) get(w http.ResponseWriter, r *http.Request) {
}
}
func (app *avatarApp) Routes(r *chi.Mux) {
func (app *avatar) Routes(r *chi.Mux) {
r.MethodFunc("GET", "/{kind:avatar|bg|cover}/{hash}", app.get)
}
@@ -228,7 +231,7 @@ func hashSHA256(name string) string {
return hashString(name, sha256.New())
}
func (app *avatarApp) createLinks(kind, name string) error {
func (app *avatar) createLinks(kind, name string) error {
if !strings.ContainsRune(name, '@') {
return nil
}
@@ -250,7 +253,7 @@ func (app *avatarApp) createLinks(kind, name string) error {
return err
}
func (app *avatarApp) removeLinks(kind, name string) error {
func (app *avatar) removeLinks(kind, name string) error {
if !strings.ContainsRune(name, '@') {
return nil
}
@@ -270,7 +273,7 @@ func (app *avatarApp) removeLinks(kind, name string) error {
return err
}
func (app *avatarApp) replaceLink(src, link string) error {
func (app *avatar) replaceLink(src, link string) error {
if dst, err := os.Readlink(link); err != nil {
if os.IsNotExist(err) {
err = os.Symlink(src, link)
@@ -342,3 +345,10 @@ func clamp(min, max, size int) int {
return size
}
// WriteText writes plain text
func writeText(w http.ResponseWriter, code int, o string) {
w.Header().Set("Content-Type", "text/plain")
w.WriteHeader(code)
_, _ = w.Write([]byte(o))
}

37
pkg/app/dns/dns.go Normal file
View File

@@ -0,0 +1,37 @@
package app_dns
import (
"context"
"fmt"
"net"
"net/http"
"strings"
"github.com/go-chi/chi"
)
type app struct {
resolver *net.Resolver
}
func New(ctx context.Context) *app {
return &app{resolver: net.DefaultResolver}
}
func (app *app) getDNS(w http.ResponseWriter, r *http.Request) {
domain := chi.URLParam(r, "domain")
w.Header().Set("Content-Type", "text/plain")
res, err := app.resolver.LookupTXT(r.Context(), domain)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
fmt.Fprintln(w, err)
return
}
fmt.Fprintln(w, strings.Join(res, "\n"))
}
func (app *app) Routes(r *chi.Mux) {
r.MethodFunc("GET", "/dns/{domain}", app.getDNS)
}

37
pkg/keyproofs/routes-keyproofs.go → pkg/app/keyproofs/app.go
View File

@@ -1,4 +1,4 @@
package keyproofs
package app_keyproofs
import (
"context"
@@ -16,7 +16,10 @@ import (
"github.com/sour-is/keyproofs/pkg/cache"
"github.com/sour-is/keyproofs/pkg/config"
"github.com/sour-is/keyproofs/pkg/opgp"
"github.com/sour-is/keyproofs/pkg/opgp/entity"
"github.com/sour-is/keyproofs/pkg/promise"
"github.com/sour-is/keyproofs/pkg/style"
)
var expireAfter = 20 * time.Minute
@@ -26,11 +29,11 @@ var runnerTimeout = 30 * time.Second
var pixl = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="
var keypng, _ = base64.StdEncoding.DecodeString("iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABKUlEQVQ4jZ2SvUoDURCFUy/Y2Fv4BoKIiFgLSWbmCWw0e3cmNgGfwacQsbCxUEFEEIVkxsQulaK1kheIiFVW1mJXiZv904FbXb5zzvzUaiWlPqyYwIkyvRjjqwmeaauxUcbFMKOvTKEJRVPv05hCY9wrhHt+fckEJ79gxg9rweJN8qdSkESZjlLOkQm+Xe9szlubFkxwYoznuQIm9DgrQJEyjZXpPU5Eo6L+H7IEUmJFAnBQJmAMp5nw0IFnjFoiEGrQXJuBLx14JtgtiR5qAO2c4aFLAffGeGiMT8b0rAEe96WxnBlbGbbia/vZ+2CwjXO5g0pN/TZ1NNXgoQPPHO2aJLsViu4E+xdVnXsOOtPOMbxeDY6jw/6/nL+r6+qryjQyhqs/OSf1Bf+pJC1wKqO/AAAAAElFTkSuQmCC")
var defaultStyle = &Style{
var defaultStyle = &style.Style{
Avatar: pixl,
Cover: pixl,
Background: pixl,
Palette: getPalette("#93CCEA"),
Palette: style.GetPalette("#93CCEA"),
}
type keyproofApp struct {
@@ -70,24 +73,24 @@ func (app *keyproofApp) getProofs(w http.ResponseWriter, r *http.Request) {
defer cancel()
// Run tasks to resolve entity, style, and proofs.
task := app.tasker.Run(EntityKey(id), func(q promise.Q) {
task := app.tasker.Run(entity.Key(id), func(q promise.Q) {
ctx := q.Context()
log := zlog.Ctx(ctx).With().Interface(fmtKey(q), q.Key()).Logger()
key := q.Key().(EntityKey)
key := q.Key().(entity.Key)
entity, err := getOpenPGPkey(ctx, string(key))
e, err := opgp.GetKey(ctx, string(key))
if err != nil {
q.Reject(err)
return
}
log.Debug().Msg("Resolving Entity")
q.Resolve(entity)
q.Resolve(e)
})
task.After(func(q promise.ResultQ) {
entity := q.Result().(*Entity)
entity := q.Result().(*entity.Entity)
zlog.Ctx(q.Context()).
Info().
@@ -95,14 +98,14 @@ func (app *keyproofApp) getProofs(w http.ResponseWriter, r *http.Request) {
Interface(fmtKey(q), q.Key()).
Msg("Do Style ")
q.Run(StyleKey(entity.Primary.Address), func(q promise.Q) {
q.Run(style.Key(entity.Primary.Address), func(q promise.Q) {
ctx := q.Context()
log := zlog.Ctx(ctx).With().Interface(fmtKey(q), q.Key()).Logger()
key := q.Key().(StyleKey)
key := q.Key().(style.Key)
log.Debug().Msg("start task")
style, err := getStyle(ctx, string(key))
style, err := style.GetStyle(ctx, string(key))
if err != nil {
q.Reject(err)
return
@@ -114,7 +117,7 @@ func (app *keyproofApp) getProofs(w http.ResponseWriter, r *http.Request) {
})
task.After(func(q promise.ResultQ) {
entity := q.Result().(*Entity)
entity := q.Result().(*entity.Entity)
log := zlog.Ctx(ctx).
With().
Interface(fmtKey(q), q.Key()).
@@ -158,12 +161,12 @@ func (app *keyproofApp) getProofs(w http.ResponseWriter, r *http.Request) {
page.IsComplete = true
break
}
page.Entity = task.Result().(*Entity)
page.Entity = task.Result().(*entity.Entity)
case <-ctx.Done():
log.Print("Deadline Timeout")
if e, ok := app.cache.Get(EntityKey(id)); ok {
page.Entity = e.Value().(*Entity)
if e, ok := app.cache.Get(entity.Key(id)); ok {
page.Entity = e.Value().(*entity.Entity)
}
}
@@ -171,8 +174,8 @@ func (app *keyproofApp) getProofs(w http.ResponseWriter, r *http.Request) {
if page.Entity != nil {
var gotStyle, gotProofs bool
if s, ok := app.cache.Get(StyleKey(page.Entity.Primary.Address)); ok {
page.Style = s.Value().(*Style)
if s, ok := app.cache.Get(style.Key(page.Entity.Primary.Address)); ok {
page.Style = s.Value().(*style.Style)
gotStyle = true
}

2
pkg/keyproofs/proofs.go → pkg/app/keyproofs/proofs.go
View File

@@ -1,4 +1,4 @@
package keyproofs
package app_keyproofs
import (
"bufio"

17
pkg/keyproofs/template.go → pkg/app/keyproofs/template.go
View File

@@ -1,10 +1,15 @@
package keyproofs
package app_keyproofs
import (
"github.com/sour-is/keyproofs/pkg/opgp/entity"
"github.com/sour-is/keyproofs/pkg/style"
)
type page struct {
AppName string
AppBuild string
Entity *Entity
Style *Style
Entity *entity.Entity
Style *style.Style
Proofs *Proofs
Markdown string
@@ -228,7 +233,11 @@ var proofTPL = `
<div class="card">
<div class="card-header">Public Key</div>
<div class="card-body scroll">
<pre><code>{{.Entity.ArmorText}}</code></pre>
<pre><code>
Last Updated {{.Entity.SelfSignature.CreationTime}}
{{.Entity.ArmorText}}
</code></pre>
</div>
</div>
</div>

48
pkg/app/vcard/app.go Normal file
View File

@@ -0,0 +1,48 @@
package app_vcard
import (
"context"
"fmt"
"net/http"
"net/mail"
"github.com/go-chi/chi"
"gosrc.io/xmpp"
)
type app struct {
conn *connection
}
func New(ctx context.Context, xmppConfig *xmpp.Config) (*app, error) {
conn, err := NewXMPP(ctx, xmppConfig)
if err != nil {
return nil, err
}
return &app{conn: conn}, nil
}
func (app *app) Routes(r *chi.Mux) {
r.MethodFunc("GET", "/vcard/{jid}", app.getVCard)
}
func (app *app) getVCard(w http.ResponseWriter, r *http.Request) {
jid := chi.URLParam(r, "jid")
if _, err := mail.ParseAddress(jid); err != nil {
w.WriteHeader(http.StatusBadRequest)
fmt.Fprint(w, err)
return
}
vcard, err := app.conn.GetXMPPVCard(r.Context(), jid)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
fmt.Fprint(w, err)
return
}
w.Header().Set("Content-Type", "text/xml")
w.WriteHeader(200)
fmt.Fprint(w, vcard)
}

36
pkg/app/vcard/vcard.go Normal file
View File

@@ -0,0 +1,36 @@
package app_vcard
import (
"encoding/xml"
"gosrc.io/xmpp/stanza"
)
type VCard struct {
XMLName xml.Name `xml:"vcard-temp vCard"`
FullName string `xml:"FN"`
NickName string `xml:"NICKNAME"`
Description string `xml:"DESC"`
URL string `xml:"URL"`
}
func NewVCard() *VCard {
return &VCard{}
}
func (c *VCard) Namespace() string {
return c.XMLName.Space
}
func (c *VCard) GetSet() *stanza.ResultSet {
return nil
}
func (c *VCard) String() string {
b, _ := xml.MarshalIndent(c, "", " ")
return string(b)
}
func init() {
stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{Space: "vcard-temp", Local: "vCard"}, VCard{})
}

31
pkg/keyproofs/vcard.go → pkg/app/vcard/xmpp.go
View File

@@ -1,4 +1,4 @@
package keyproofs
package app_vcard
import (
"context"
@@ -11,35 +11,6 @@ import (
"gosrc.io/xmpp/stanza"
)
type VCard struct {
XMLName xml.Name `xml:"vcard-temp vCard"`
FullName string `xml:"FN"`
NickName string `xml:"NICKNAME"`
Description string `xml:"DESC"`
URL string `xml:"URL"`
}
func NewVCard() *VCard {
return &VCard{}
}
func (c *VCard) Namespace() string {
return c.XMLName.Space
}
func (c *VCard) GetSet() *stanza.ResultSet {
return nil
}
func (c *VCard) String() string {
b, _ := xml.MarshalIndent(c, "", " ")
return string(b)
}
func init() {
stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{Space: "vcard-temp", Local: "vCard"}, VCard{})
}
type connection struct {
client xmpp.StreamClient
}

33
pkg/keyproofs/routes-wkd.go → pkg/app/wkd/app.go
View File

@@ -1,4 +1,4 @@
package keyproofs
package app_wkd
import (
"context"
@@ -17,8 +17,10 @@ import (
"github.com/go-chi/chi"
"github.com/rs/zerolog/log"
"github.com/sour-is/crypto/openpgp"
"github.com/sour-is/keyproofs/pkg/graceful"
"github.com/tv42/zbase32"
"github.com/sour-is/keyproofs/pkg/graceful"
"github.com/sour-is/keyproofs/pkg/opgp/entity"
)
type wkdApp struct {
@@ -26,7 +28,7 @@ type wkdApp struct {
domain string
}
func NewWKDApp(ctx context.Context, path, domain string) (*wkdApp, error) {
func New(ctx context.Context, path, domain string) (*wkdApp, error) {
log := log.Ctx(ctx)
log.Debug().Str("domain", domain).Str("path", path).Msg("NewWKDApp")
@@ -291,7 +293,7 @@ func (app *wkdApp) postKey(w http.ResponseWriter, r *http.Request) {
return
}
entity, err := getEntity(lis)
e, err := entity.GetOne(lis)
if err != nil {
log.Err(err).Send()
writeText(w, http.StatusBadRequest, "ERR ENTITY")
@@ -299,7 +301,7 @@ func (app *wkdApp) postKey(w http.ResponseWriter, r *http.Request) {
return
}
fname := filepath.Join(app.path, "keys", entity.Primary.Address)
fname := filepath.Join(app.path, "keys", e.Primary.Address)
f, err := os.Open(fname)
if os.IsNotExist(err) {
@@ -311,7 +313,7 @@ func (app *wkdApp) postKey(w http.ResponseWriter, r *http.Request) {
return
}
err = entity.Serialize(out)
err = e.Serialize(out)
if err != nil {
log.Err(err).Send()
writeText(w, http.StatusInternalServerError, "ERR WRITE")
@@ -332,7 +334,7 @@ func (app *wkdApp) postKey(w http.ResponseWriter, r *http.Request) {
}
f.Close()
compare, err := getEntity(current)
compare, err := entity.GetOne(current)
if err != nil {
log.Err(err).Send()
writeText(w, http.StatusInternalServerError, "ERR PARSE")
@@ -340,20 +342,20 @@ func (app *wkdApp) postKey(w http.ResponseWriter, r *http.Request) {
return
}
if entity.Fingerprint != compare.Fingerprint {
if e.Fingerprint != compare.Fingerprint {
w.Header().Set("X-HKP-Status", "Mismatch fingerprint")
writeText(w, http.StatusBadRequest, "ERR FINGERPRINT")
return
}
if entity.SelfSignature == nil || compare.SelfSignature == nil {
if e.SelfSignature == nil || compare.SelfSignature == nil {
w.Header().Set("X-HKP-Status", "Missing signature")
writeText(w, http.StatusBadRequest, "ERR SIGNATURE")
return
}
log.Debug().Msgf("%v < %v", entity.SelfSignature.CreationTime, compare.SelfSignature.CreationTime)
log.Debug().Msgf("%v < %v", e.SelfSignature.CreationTime, compare.SelfSignature.CreationTime)
if !compare.SelfSignature.CreationTime.Before(entity.SelfSignature.CreationTime) {
if !compare.SelfSignature.CreationTime.Before(e.SelfSignature.CreationTime) {
w.Header().Set("X-HKP-Status", "out of date")
writeText(w, http.StatusBadRequest, "ERR OUT OF DATE")
@@ -368,7 +370,7 @@ func (app *wkdApp) postKey(w http.ResponseWriter, r *http.Request) {
return
}
err = entity.Serialize(out)
err = e.Serialize(out)
if err != nil {
log.Err(err).Send()
writeText(w, http.StatusInternalServerError, "ERR WRITE")
@@ -379,3 +381,10 @@ func (app *wkdApp) postKey(w http.ResponseWriter, r *http.Request) {
w.Header().Set("X-HKP-Status", "Updated key")
writeText(w, http.StatusOK, "OK UPDATED")
}
// WriteText writes plain text
func writeText(w http.ResponseWriter, code int, o string) {
w.Header().Set("Content-Type", "text/plain")
w.WriteHeader(code)
_, _ = w.Write([]byte(o))
}

46
pkg/httpsrv/server.go Normal file
View File

@@ -0,0 +1,46 @@
package httpsrv
import (
"context"
"net/http"
"time"
"github.com/rs/zerolog/log"
"github.com/sour-is/keyproofs/pkg/graceful"
)
type Server struct {
srv *http.Server
}
func New(s *http.Server) *Server {
return &Server{srv: s}
}
func (s *Server) Run(ctx context.Context) error {
log := log.Ctx(ctx)
wg := graceful.WaitGroup(ctx)
wg.Go(func() error {
<-ctx.Done()
log.Info().Msg("Shutdown HTTP")
ctx := context.Background()
ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
defer cancel()
err := s.srv.Shutdown(ctx)
if err != nil && err != http.ErrServerClosed {
return err
}
log.Info().Msg("Stopped HTTP")
return nil
})
err := s.srv.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
return err
}
return nil
}

32
pkg/keyproofs/routes-dns.go
View File

@@ -1,32 +0,0 @@
package keyproofs
import (
"context"
"net"
"net/http"
"strings"
"github.com/go-chi/chi"
)
type dnsApp struct {
resolver *net.Resolver
}
func NewDNSApp(ctx context.Context) *dnsApp {
return &dnsApp{resolver: net.DefaultResolver}
}
func (app *dnsApp) getDNS(w http.ResponseWriter, r *http.Request) {
domain := chi.URLParam(r, "domain")
res, err := app.resolver.LookupTXT(r.Context(), domain)
if err != nil {
writeText(w, 400, err.Error())
return
}
writeText(w, 200, strings.Join(res, "\n"))
}
func (app *dnsApp) Routes(r *chi.Mux) {
r.MethodFunc("GET", "/dns/{domain}", app.getDNS)
}

56
pkg/keyproofs/routes-vcard.go
View File

@@ -1,56 +0,0 @@
package keyproofs
import (
"context"
"fmt"
"net/http"
"net/mail"
"github.com/go-chi/chi"
zlog "github.com/rs/zerolog/log"
"github.com/sour-is/keyproofs/pkg/config"
"gosrc.io/xmpp"
)
type vcardApp struct {
conn *connection
}
func NewVCardApp(ctx context.Context) (*vcardApp, error) {
log := zlog.Ctx(ctx)
var ok bool
var xmppConfig *xmpp.Config
if xmppConfig, ok = config.FromContext(ctx).Get("xmpp-config").(*xmpp.Config); !ok {
log.Error().Msg("no xmpp-config")
return nil, fmt.Errorf("no xmpp config")
}
conn, err := NewXMPP(ctx, xmppConfig)
if err != nil {
return nil, err
}
return &vcardApp{conn: conn}, nil
}
func (app *vcardApp) Routes(r *chi.Mux) {
r.MethodFunc("GET", "/vcard/{jid}", app.getVCard)
}
func (app *vcardApp) getVCard(w http.ResponseWriter, r *http.Request) {
jid := chi.URLParam(r, "jid")
if _, err := mail.ParseAddress(jid); err != nil {
fmt.Fprint(w, err)
w.WriteHeader(400)
}
vcard, err := app.conn.GetXMPPVCard(r.Context(), jid)
if err != nil {
fmt.Fprint(w, err)
w.WriteHeader(500)
}
w.Header().Set("Content-Type", "text/xml")
w.WriteHeader(200)
fmt.Fprint(w, vcard)
}

89
pkg/opgp/entity/entity.go Normal file
View File

@@ -0,0 +1,89 @@
package entity
import (
"fmt"
"io"
"net/mail"
"github.com/sour-is/crypto/openpgp"
"github.com/sour-is/crypto/openpgp/packet"
)
type Key string
func (k Key) Key() interface{} {
return k
}
type Entity struct {
Primary *mail.Address
SelfSignature *packet.Signature
Emails []*mail.Address
Fingerprint string
Proofs []string
ArmorText string
entity *openpgp.Entity
}
func (e *Entity) Serialize(f io.Writer) error {
return e.entity.Serialize(f)
}
func GetOne(lis openpgp.EntityList) (*Entity, error) {
entity := &Entity{}
var err error
for _, e := range lis {
if e == nil {
continue
}
if e.PrimaryKey == nil {
continue
}
entity.entity = e
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
}
if email.Address != entity.Primary.Address {
entity.Emails = append(entity.Emails, email)
}
}
// If identity is self signed read notation data.
if ident.SelfSignature != nil && ident.SelfSignature.NotationData != nil {
entity.SelfSignature = ident.SelfSignature
// 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
}

93
pkg/keyproofs/opengpg.go → pkg/opgp/util.go
View File

@@ -1,4 +1,4 @@
package keyproofs
package opgp
import (
"bytes"
@@ -13,12 +13,12 @@ import (
"github.com/rs/zerolog/log"
"github.com/sour-is/crypto/openpgp"
"github.com/sour-is/crypto/openpgp/packet"
"github.com/sour-is/keyproofs/pkg/opgp/entity"
"github.com/tv42/zbase32"
"golang.org/x/crypto/openpgp/armor"
)
func getOpenPGPkey(ctx context.Context, id string) (entity *Entity, err error) {
func GetKey(ctx context.Context, id string) (entity *entity.Entity, err error) {
if isFingerprint(id) {
addr := "https://keys.openpgp.org/vks/v1/by-fingerprint/" + strings.ToUpper(id)
return getEntityHTTP(ctx, addr, true)
@@ -41,7 +41,7 @@ func getOpenPGPkey(ctx context.Context, id string) (entity *Entity, err error) {
}
}
func getEntityHTTP(ctx context.Context, url string, useArmored bool) (entity *Entity, err error) {
func getEntityHTTP(ctx context.Context, url string, useArmored bool) (entity *entity.Entity, err error) {
log := log.Ctx(ctx)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
@@ -72,90 +72,11 @@ func getEntityHTTP(ctx context.Context, url string, useArmored bool) (entity *En
return ReadKey(resp.Body, useArmored)
}
type EntityKey string
func (k EntityKey) Key() interface{} {
return k
}
type Entity struct {
Primary *mail.Address
SelfSignature *packet.Signature
Emails []*mail.Address
Fingerprint string
Proofs []string
ArmorText string
entity *openpgp.Entity
}
func (e *Entity) Serialize(f io.Writer) error {
return e.entity.Serialize(f)
}
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.entity = e
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
}
if email.Address != entity.Primary.Address {
entity.Emails = append(entity.Emails, email)
}
}
// If identity is self signed read notation data.
if ident.SelfSignature != nil && ident.SelfSignature.NotationData != nil {
entity.SelfSignature = ident.SelfSignature
// 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) {
func ReadKey(r io.Reader, useArmored bool) (e *entity.Entity, err error) {
var buf bytes.Buffer
var w io.Writer = &buf
e = &Entity{}
e = &entity.Entity{}
defer func() {
if e != nil {
@@ -187,7 +108,7 @@ func ReadKey(r io.Reader, useArmored bool) (e *Entity, err error) {
return e, fmt.Errorf("Read key: %w", err)
}
e, err = getEntity(lis)
e, err = entity.GetOne(lis)
if err != nil {
return e, fmt.Errorf("Parse key: %w", err)
}

22
pkg/keyproofs/style.go → pkg/style/style.go
View File

@@ -1,4 +1,4 @@
package keyproofs
package style
import (
"context"
@@ -11,9 +11,11 @@ import (
"github.com/rs/zerolog/log"
)
type StyleKey string
var pixl = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII="
func (s StyleKey) Key() interface{} {
type Key string
func (s Key) Key() interface{} {
return s
}
@@ -25,10 +27,10 @@ type Style struct {
Palette []string
}
func getStyle(ctx context.Context, email string) (*Style, error) {
func GetStyle(ctx context.Context, email string) (*Style, error) {
log := log.Ctx(ctx)
avatarHost, styleHost, err := styleSRV(ctx, email)
avatarHost, styleHost, err := GetSRV(ctx, email)
if err != nil {
return nil, err
}
@@ -41,10 +43,10 @@ func getStyle(ctx context.Context, email string) (*Style, error) {
style := &Style{}
style.Palette = getPalette(fmt.Sprintf("#%x", id[:3]))
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"
style.Background = pixl
if styleHost != "" {
style.Cover = fmt.Sprintf("https://%s/cover/%x", styleHost, id)
@@ -54,11 +56,11 @@ func getStyle(ctx context.Context, email string) (*Style, error) {
return style, err
}
func styleSRV(ctx context.Context, email string) (avatar string, style string, err error) {
func GetSRV(ctx context.Context, email string) (avatar string, style string, err error) {
// Defaults
style = ""
avatar = "www.gravatar.com"
avatar = "www.libravatar.org"
parts := strings.SplitN(email, "@", 2)
if _, srv, err := net.DefaultResolver.LookupSRV(ctx, "style-sec", "tcp", parts[1]); err == nil {
@@ -82,7 +84,7 @@ func styleSRV(ctx context.Context, email string) (avatar string, style string, e
}
// getPalette maes a complementary color palette. https://play.golang.org/p/nBXLUocGsU5
func getPalette(hex string) []string {
func GetPalette(hex string) []string {
reference, _ := colorful.Hex(hex)
reference = sat(lum(reference, 0, .5), 0, .5)