add did:web support

api/extra.go

···
 	"net/url"
 
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
+	"github.com/bluesky-social/indigo/did"
 	"github.com/bluesky-social/indigo/xrpc"
-	did "github.com/whyrusleeping/go-did"
 	otel "go.opentelemetry.io/otel"
 )
 
-func ResolveDidToHandle(ctx context.Context, xrpcc *xrpc.Client, pls *PLCServer, udid string) (string, string, error) {
+func ResolveDidToHandle(ctx context.Context, xrpcc *xrpc.Client, res did.Resolver, udid string) (string, string, error) {
 	ctx, span := otel.Tracer("gosky").Start(ctx, "resolveDidToHandle")
 	defer span.End()
 
-	doc, err := pls.GetDocument(ctx, udid)
+	doc, err := res.GetDocument(ctx, udid)
 	if err != nil {
 		return "", "", err
 	}

bgs/bgs.go

···
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	"github.com/bluesky-social/indigo/blobs"
 	"github.com/bluesky-social/indigo/carstore"
+	"github.com/bluesky-social/indigo/did"
 	"github.com/bluesky-social/indigo/events"
 	"github.com/bluesky-social/indigo/indexer"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/bluesky-social/indigo/models"
-	"github.com/bluesky-social/indigo/plc"
 	"github.com/bluesky-social/indigo/repomgr"
 	"github.com/bluesky-social/indigo/util"
 	bsutil "github.com/bluesky-social/indigo/util"
···
 	db      *gorm.DB
 	slurper *Slurper
 	events  *events.EventManager
-	didr    plc.DidResolver
+	didr    did.Resolver
 
 	blobs blobs.BlobStore
 
···
 	repoman *repomgr.RepoManager
 }
 
-func NewBGS(db *gorm.DB, ix *indexer.Indexer, repoman *repomgr.RepoManager, evtman *events.EventManager, didr plc.DidResolver, blobs blobs.BlobStore, ssl bool) (*BGS, error) {
+func NewBGS(db *gorm.DB, ix *indexer.Indexer, repoman *repomgr.RepoManager, evtman *events.EventManager, didr did.Resolver, blobs blobs.BlobStore, ssl bool) (*BGS, error) {
 	db.AutoMigrate(User{})
 	db.AutoMigrate(AuthToken{})
 	db.AutoMigrate(models.PDS{})

cmd/gosky/admin.go

···
 			return err
 		}
 
-		plcc := cliutil.GetPLCClient(cctx)
+		plcc := cliutil.GetDidResolver(cctx)
 
 		if cctx.Bool("raw") {
 			fmt.Println(string(b))

cmd/gosky/main.go

···
 	Name:      "get",
 	ArgsUsage: `<did>`,
 	Action: func(cctx *cli.Context) error {
-		s := cliutil.GetPLCClient(cctx)
+		s := cliutil.GetDidResolver(cctx)
 
 		doc, err := s.GetDocument(context.TODO(), cctx.Args().First())
 		if err != nil {

cmd/gosky/util/util.go

···
 	"time"
 
 	"github.com/bluesky-social/indigo/api"
+	"github.com/bluesky-social/indigo/did"
 	"github.com/bluesky-social/indigo/xrpc"
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/urfave/cli/v2"
···
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 )
+
+func GetDidResolver(cctx *cli.Context) did.Resolver {
+	mr := did.NewMultiResolver()
+	mr.AddHandler("plc", &api.PLCServer{
+		Host: cctx.String("plc"),
+	})
+	mr.AddHandler("web", &did.WebResolver{})
+
+	return mr
+}
 
 func GetPLCClient(cctx *cli.Context) *api.PLCServer {
 	return &api.PLCServer{

did/alias.go

···
+package did
+
+import "github.com/whyrusleeping/go-did"
+
+type Document = did.Document
+
+type Service = did.Service

did/multi.go

···
+package did
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/whyrusleeping/go-did"
+)
+
+type Resolver interface {
+	GetDocument(ctx context.Context, didstr string) (*did.Document, error)
+}
+
+type MultiResolver struct {
+	handlers map[string]Resolver
+}
+
+func NewMultiResolver() *MultiResolver {
+	return &MultiResolver{
+		handlers: make(map[string]Resolver),
+	}
+}
+
+func (mr *MultiResolver) AddHandler(method string, res Resolver) {
+	mr.handlers[method] = res
+}
+
+func (mr *MultiResolver) GetDocument(ctx context.Context, didstr string) (*did.Document, error) {
+	pdid, err := did.ParseDID(didstr)
+	if err != nil {
+		return nil, err
+	}
+
+	method := pdid.Protocol()
+
+	res, ok := mr.handlers[method]
+	if !ok {
+		return nil, fmt.Errorf("unknown did method: %q", method)
+	}
+
+	return res.GetDocument(ctx, didstr)
+}

did/web.go

···
+package did
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+
+	"github.com/whyrusleeping/go-did"
+)
+
+type WebResolver struct {
+	// TODO: cache? maybe at a different layer
+}
+
+func (wr *WebResolver) GetDocument(ctx context.Context, didstr string) (*Document, error) {
+	pdid, err := did.ParseDID(didstr)
+	if err != nil {
+		return nil, err
+	}
+
+	val := pdid.Value()
+	if strings.Contains(val, ":") {
+		return nil, fmt.Errorf("did:web resolver does not handle ports or documents at sub-paths")
+	}
+
+	resp, err := http.Get("https://" + val + "/.well-known/did.json")
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		return nil, fmt.Errorf("fetch did request failed (status %d): %s", resp.StatusCode, resp.Status)
+	}
+
+	var out did.Document
+	if err := json.NewDecoder(resp.Body).Decode(&out); err != nil {
+		return nil, err
+	}
+
+	return &out, nil
+}

go.mod

···
 	github.com/stretchr/testify v1.8.2
 	github.com/urfave/cli/v2 v2.25.1
 	github.com/whyrusleeping/cbor-gen v0.0.0-20230331140348-1f892b517e70
-	github.com/whyrusleeping/go-did v0.0.0-20230301193428-2146016fc220
+	github.com/whyrusleeping/go-did v0.0.0-20230526170049-82aaa4048458
 	go.opentelemetry.io/otel v1.14.0
 	go.opentelemetry.io/otel/exporters/jaeger v1.14.0
 	go.opentelemetry.io/otel/sdk v1.14.0
···
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/blake3 v1.1.7 // indirect
 )
+
+replace github.com/whyrusleeping/go-did => ../go-did

go.sum

···
 github.com/whyrusleeping/cbor-gen v0.0.0-20230331140348-1f892b517e70 h1:iNBzUKTsJc9RqStEVX2VYgVHATTU39IuB7g0e8OPWXU=
 github.com/whyrusleeping/cbor-gen v0.0.0-20230331140348-1f892b517e70/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ=
 github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E=
-github.com/whyrusleeping/go-did v0.0.0-20230301193428-2146016fc220 h1:EO/9z3yDvx1van1/0esdcqhalZZQGRj3I1BPTWr5k3A=
-github.com/whyrusleeping/go-did v0.0.0-20230301193428-2146016fc220/go.mod h1:qPtRyexGM5XMHFIfjH+EiA/A/1n2JakWEdMPC53pJAE=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

indexer/indexer.go

···
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	bsky "github.com/bluesky-social/indigo/api/bsky"
 	"github.com/bluesky-social/indigo/carstore"
+	"github.com/bluesky-social/indigo/did"
 	"github.com/bluesky-social/indigo/events"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/bluesky-social/indigo/models"
 	"github.com/bluesky-social/indigo/notifs"
-	"github.com/bluesky-social/indigo/plc"
 	"github.com/bluesky-social/indigo/repomgr"
 	"github.com/bluesky-social/indigo/util"
 	"github.com/bluesky-social/indigo/xrpc"
···
 
 	notifman notifs.NotificationManager
 	events   *events.EventManager
-	didr     plc.DidResolver
+	didr     did.Resolver
 
 	// TODO: i feel like the repomgr doesnt belong here
 	repomgr *repomgr.RepoManager
···
 	CreateExternalUser func(context.Context, string) (*models.ActorInfo, error)
 }
 
-func NewIndexer(db *gorm.DB, notifman notifs.NotificationManager, evtman *events.EventManager, didr plc.DidResolver, repoman *repomgr.RepoManager, crawl, aggregate bool) (*Indexer, error) {
+func NewIndexer(db *gorm.DB, notifman notifs.NotificationManager, evtman *events.EventManager, didr did.Resolver, repoman *repomgr.RepoManager, crawl, aggregate bool) (*Indexer, error) {
 	db.AutoMigrate(&models.FeedPost{})
 	db.AutoMigrate(&models.ActorInfo{})
 	db.AutoMigrate(&models.FollowRecord{})

plc/caching.go

···
 	"context"
 	"time"
 
+	did "github.com/bluesky-social/indigo/did"
 	lru "github.com/hashicorp/golang-lru"
-	"github.com/whyrusleeping/go-did"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 )
 
 type CachingDidResolver struct {
-	res    DidResolver
+	res    did.Resolver
 	maxAge time.Duration
 	cache  *lru.ARCCache
 }
···
 	doc      *did.Document
 }
 
-func NewCachingDidResolver(res DidResolver, maxAge time.Duration, size int) *CachingDidResolver {
+func NewCachingDidResolver(res did.Resolver, maxAge time.Duration, size int) *CachingDidResolver {
 	c, err := lru.NewARC(size)
 	if err != nil {
 		panic(err)

plc/plc.go

···
 import (
 	"context"
 
+	didres "github.com/bluesky-social/indigo/did"
 	"github.com/whyrusleeping/go-did"
 )
 
 type PLCClient interface {
-	DidResolver
+	didres.Resolver
 	CreateDID(ctx context.Context, sigkey *did.PrivKey, recovery string, handle string, service string) (string, error)
 	UpdateUserHandle(ctx context.Context, didstr string, nhandle string) error
 }
-
-type DidResolver interface {
-	GetDocument(ctx context.Context, didstr string) (*did.Document, error)
-}