commit 50cc4da619bcb188d8cfb952d96fa63338a1a02f · kot.pink/core

-176

appview/spindleresolver/resolver.go

···

       1
       1
       -
       package spindleresolver

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"encoding/json"

     

       6
       6
       -
       	"errors"

     

       7
       7
       -
       	"fmt"

     

       8
       8
       -
       	"io"

     

       9
       9
       -
       	"net/http"

     

       10
       10
       -
       	"strings"

     

       11
       11
       -
       	"time"

     

       12
       12
       -
       

     

       13
       13
       -
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       14
       14
       -
       	"tangled.sh/tangled.sh/core/appview/cache"

     

       15
       15
       -
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       16
       16
       -
       

     

       17
       17
       -
       	"github.com/bluesky-social/indigo/api/atproto"

     

       18
       18
       -
       	"github.com/bluesky-social/indigo/xrpc"

     

       19
       19
       -
       )

     

       20
       20
       -
       

     

       21
       21
       -
       type ResolutionStatus string

     

       22
       22
       -
       

     

       23
       23
       -
       const (

     

       24
       24
       -
       	StatusOK      ResolutionStatus = "ok"

     

       25
       25
       -
       	StatusError   ResolutionStatus = "error"

     

       26
       26
       -
       	StatusInvalid ResolutionStatus = "invalid"

     

       27
       27
       -
       )

     

       28
       28
       -
       

     

       29
       29
       -
       type Resolution struct {

     

       30
       30
       -
       	Status     ResolutionStatus `json:"status"`

     

       31
       31
       -
       	OwnerDID   string           `json:"ownerDid,omitempty"`

     

       32
       32
       -
       	VerifiedAt time.Time        `json:"verifiedAt"`

     

       33
       33
       -
       }

     

       34
       34
       -
       

     

       35
       35
       -
       type Resolver struct {

     

       36
       36
       -
       	cache      *cache.Cache

     

       37
       37
       -
       	http       *http.Client

     

       38
       38
       -
       	config     Config

     

       39
       39
       -
       	idResolver *idresolver.Resolver

     

       40
       40
       -
       }

     

       41
       41
       -
       

     

       42
       42
       -
       type Config struct {

     

       43
       43
       -
       	HitTTL     time.Duration

     

       44
       44
       -
       	ErrTTL     time.Duration

     

       45
       45
       -
       	InvalidTTL time.Duration

     

       46
       46
       -
       	Dev        bool

     

       47
       47
       -
       }

     

       48
       48
       -
       

     

       49
       49
       -
       func NewResolver(cache *cache.Cache, client *http.Client, config Config) *Resolver {

     

       50
       50
       -
       	if client == nil {

     

       51
       51
       -
       		client = &http.Client{

     

       52
       52
       -
       			Timeout: 2 * time.Second,

     

       53
       53
       -
       		}

     

       54
       54
       -
       	}

     

       55
       55
       -
       	return &Resolver{

     

       56
       56
       -
       		cache:  cache,

     

       57
       57
       -
       		http:   client,

     

       58
       58
       -
       		config: config,

     

       59
       59
       -
       	}

     

       60
       60
       -
       }

     

       61
       61
       -
       

     

       62
       62
       -
       func DefaultResolver(cache *cache.Cache) *Resolver {

     

       63
       63
       -
       	return NewResolver(

     

       64
       64
       -
       		cache,

     

       65
       65
       -
       		&http.Client{

     

       66
       66
       -
       			Timeout: 2 * time.Second,

     

       67
       67
       -
       		},

     

       68
       68
       -
       		Config{

     

       69
       69
       -
       			HitTTL:     24 * time.Hour,

     

       70
       70
       -
       			ErrTTL:     30 * time.Second,

     

       71
       71
       -
       			InvalidTTL: 1 * time.Minute,

     

       72
       72
       -
       		},

     

       73
       73
       -
       	)

     

       74
       74
       -
       }

     

       75
       75
       -
       

     

       76
       76
       -
       func (r *Resolver) ResolveInstance(ctx context.Context, domain string) (*Resolution, error) {

     

       77
       77
       -
       	key := "spindle:" + domain

     

       78
       78
       -
       

     

       79
       79
       -
       	val, err := r.cache.Get(ctx, key).Result()

     

       80
       80
       -
       	if err == nil {

     

       81
       81
       -
       		var cached Resolution

     

       82
       82
       -
       		if err := json.Unmarshal([]byte(val), &cached); err == nil {

     

       83
       83
       -
       			return &cached, nil

     

       84
       84
       -
       		}

     

       85
       85
       -
       	}

     

       86
       86
       -
       

     

       87
       87
       -
       	resolution, ttl := r.verify(ctx, domain)

     

       88
       88
       -
       

     

       89
       89
       -
       	data, _ := json.Marshal(resolution)

     

       90
       90
       -
       	r.cache.Set(ctx, key, data, ttl)

     

       91
       91
       -
       

     

       92
       92
       -
       	if resolution.Status == StatusOK {

     

       93
       93
       -
       		return resolution, nil

     

       94
       94
       -
       	}

     

       95
       95
       -
       

     

       96
       96
       -
       	return resolution, fmt.Errorf("verification failed: %s", resolution.Status)

     

       97
       97
       -
       }

     

       98
       98
       -
       

     

       99
       99
       -
       func (r *Resolver) verify(ctx context.Context, domain string) (*Resolution, time.Duration) {

     

       100
       100
       -
       	owner, err := r.fetchOwner(ctx, domain)

     

       101
       101
       -
       	if err != nil {

     

       102
       102
       -
       		return &Resolution{Status: StatusError, VerifiedAt: time.Now()}, r.config.ErrTTL

     

       103
       103
       -
       	}

     

       104
       104
       -
       

     

       105
       105
       -
       	record, err := r.fetchRecord(ctx, owner, domain)

     

       106
       106
       -
       	if err != nil {

     

       107
       107
       -
       		return &Resolution{Status: StatusError, VerifiedAt: time.Now()}, r.config.ErrTTL

     

       108
       108
       -
       	}

     

       109
       109
       -
       

     

       110
       110
       -
       	if record.Instance == domain {

     

       111
       111
       -
       		return &Resolution{

     

       112
       112
       -
       			Status:     StatusOK,

     

       113
       113
       -
       			OwnerDID:   owner,

     

       114
       114
       -
       			VerifiedAt: time.Now(),

     

       115
       115
       -
       		}, r.config.HitTTL

     

       116
       116
       -
       	}

     

       117
       117
       -
       

     

       118
       118
       -
       	return &Resolution{

     

       119
       119
       -
       		Status:     StatusInvalid,

     

       120
       120
       -
       		OwnerDID:   owner,

     

       121
       121
       -
       		VerifiedAt: time.Now(),

     

       122
       122
       -
       	}, r.config.InvalidTTL

     

       123
       123
       -
       }

     

       124
       124
       -
       

     

       125
       125
       -
       func (r *Resolver) fetchOwner(ctx context.Context, domain string) (string, error) {

     

       126
       126
       -
       	scheme := "https"

     

       127
       127
       -
       	if r.config.Dev {

     

       128
       128
       -
       		scheme = "http"

     

       129
       129
       -
       	}

     

       130
       130
       -
       

     

       131
       131
       -
       	url := fmt.Sprintf("%s://%s/owner", scheme, domain)

     

       132
       132
       -
       	req, err := http.NewRequest("GET", url, nil)

     

       133
       133
       -
       	if err != nil {

     

       134
       134
       -
       		return "", err

     

       135
       135
       -
       	}

     

       136
       136
       -
       

     

       137
       137
       -
       	resp, err := r.http.Do(req.WithContext(ctx))

     

       138
       138
       -
       	if err != nil || resp.StatusCode != 200 {

     

       139
       139
       -
       		return "", errors.New("failed to fetch /owner")

     

       140
       140
       -
       	}

     

       141
       141
       -
       

     

       142
       142
       -
       	body, err := io.ReadAll(io.LimitReader(resp.Body, 1024)) // read atmost 1kb of data

     

       143
       143
       -
       	if err != nil {

     

       144
       144
       -
       		return "", fmt.Errorf("failed to read /owner response: %w", err)

     

       145
       145
       -
       	}

     

       146
       146
       -
       

     

       147
       147
       -
       	did := strings.TrimSpace(string(body))

     

       148
       148
       -
       	if did == "" {

     

       149
       149
       -
       		return "", errors.New("empty DID in /owner response")

     

       150
       150
       -
       	}

     

       151
       151
       -
       

     

       152
       152
       -
       	return did, nil

     

       153
       153
       -
       }

     

       154
       154
       -
       

     

       155
       155
       -
       func (r *Resolver) fetchRecord(ctx context.Context, did, rkey string) (*tangled.Spindle, error) {

     

       156
       156
       -
       	ident, err := r.idResolver.ResolveIdent(ctx, did)

     

       157
       157
       -
       	if err != nil {

     

       158
       158
       -
       		return nil, err

     

       159
       159
       -
       	}

     

       160
       160
       -
       

     

       161
       161
       -
       	xrpcc := xrpc.Client{

     

       162
       162
       -
       		Host: ident.PDSEndpoint(),

     

       163
       163
       -
       	}

     

       164
       164
       -
       

     

       165
       165
       -
       	rec, err := atproto.RepoGetRecord(ctx, &xrpcc, "", tangled.SpindleNSID, did, rkey)

     

       166
       166
       -
       	if err != nil {

     

       167
       167
       -
       		return nil, err

     

       168
       168
       -
       	}

     

       169
       169
       -
       

     

       170
       170
       -
       	out, ok := rec.Value.Val.(*tangled.Spindle)

     

       171
       171
       -
       	if !ok {

     

       172
       172
       -
       		return nil, fmt.Errorf("invalid record returned")

     

       173
       173
       -
       	}

     

       174
       174
       -
       

     

       175
       175
       -
       	return out, nil

     

       176
       176
       -
       }

+442 -90

appview/spindles/spindles.go

···

       1
       1
        
       package spindles

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"context"

     

       5
       4
        
       	"errors"

     

       6
       5
        
       	"fmt"

     

       7
       7
       -
       	"io"

     

       8
       6
        
       	"log/slog"

     

       9
       7
        
       	"net/http"

     

       10
       10
       -
       	"strings"

     

       8
       8
       +
       	"slices"

     

       11
       9
        
       	"time"

     

       12
       10
        
       

     

       13
       11
        
       	"github.com/go-chi/chi/v5"

     

       14
       12
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       13
       13
       +
       	"tangled.sh/tangled.sh/core/appview"

     

       15
       14
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       16
       15
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       16
       16
       +
       	"tangled.sh/tangled.sh/core/appview/idresolver"

     

       17
       17
        
       	"tangled.sh/tangled.sh/core/appview/middleware"

     

       18
       18
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       19
       19
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       20
       20
       +
       	verify "tangled.sh/tangled.sh/core/appview/spindleverify"

     

       20
       21
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       21
       22
        
       

     

       22
       23
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     
···

       25
       26
        
       )

     

       26
       27
        
       

     

       27
       28
        
       type Spindles struct {

     

       28
       28
       -
       	Db       *db.DB

     

       29
       29
       -
       	OAuth    *oauth.OAuth

     

       30
       30
       -
       	Pages    *pages.Pages

     

       31
       31
       -
       	Config   *config.Config

     

       32
       32
       -
       	Enforcer *rbac.Enforcer

     

       33
       33
       -
       	Logger   *slog.Logger

     

       29
       29
       +
       	Db         *db.DB

     

       30
       30
       +
       	OAuth      *oauth.OAuth

     

       31
       31
       +
       	Pages      *pages.Pages

     

       32
       32
       +
       	Config     *config.Config

     

       33
       33
       +
       	Enforcer   *rbac.Enforcer

     

       34
       34
       +
       	IdResolver *idresolver.Resolver

     

       35
       35
       +
       	Logger     *slog.Logger

     

       34
       36
        
       }

     

       35
       37
        
       

     

       36
       38
        
       func (s *Spindles) Router() http.Handler {

     

       37
       39
        
       	r := chi.NewRouter()

     

       38
       40
        
       

     

       39
       39
       -
       	r.Use(middleware.AuthMiddleware(s.OAuth))

     

       41
       41
       +
       	r.With(middleware.AuthMiddleware(s.OAuth)).Get("/", s.spindles)

     

       42
       42
       +
       	r.With(middleware.AuthMiddleware(s.OAuth)).Post("/register", s.register)

     

       40
       43
        
       

     

       41
       41
       -
       	r.Get("/", s.spindles)

     

       42
       42
       -
       	r.Post("/register", s.register)

     

       43
       43
       -
       	r.Delete("/{instance}", s.delete)

     

       44
       44
       -
       	r.Post("/{instance}/retry", s.retry)

     

       44
       44
       +
       	r.With(middleware.AuthMiddleware(s.OAuth)).Get("/{instance}", s.dashboard)

     

       45
       45
       +
       	r.With(middleware.AuthMiddleware(s.OAuth)).Delete("/{instance}", s.delete)

     

       46
       46
       +
       

     

       47
       47
       +
       	r.With(middleware.AuthMiddleware(s.OAuth)).Post("/{instance}/retry", s.retry)

     

       48
       48
       +
       	r.With(middleware.AuthMiddleware(s.OAuth)).Post("/{instance}/add", s.addMember)

     

       49
       49
       +
       	r.With(middleware.AuthMiddleware(s.OAuth)).Post("/{instance}/remove", s.removeMember)

     

       45
       50
        
       

     

       46
       51
        
       	return r

     

       47
       52
        
       }

     
···

       64
       69
        
       	})

     

       65
       70
        
       }

     

       66
       71
        
       

     

       72
       72
       +
       func (s *Spindles) dashboard(w http.ResponseWriter, r *http.Request) {

     

       73
       73
       +
       	l := s.Logger.With("handler", "dashboard")

     

       74
       74
       +
       

     

       75
       75
       +
       	user := s.OAuth.GetUser(r)

     

       76
       76
       +
       	l = l.With("user", user.Did)

     

       77
       77
       +
       

     

       78
       78
       +
       	instance := chi.URLParam(r, "instance")

     

       79
       79
       +
       	if instance == "" {

     

       80
       80
       +
       		return

     

       81
       81
       +
       	}

     

       82
       82
       +
       	l = l.With("instance", instance)

     

       83
       83
       +
       

     

       84
       84
       +
       	spindles, err := db.GetSpindles(

     

       85
       85
       +
       		s.Db,

     

       86
       86
       +
       		db.FilterEq("instance", instance),

     

       87
       87
       +
       		db.FilterEq("owner", user.Did),

     

       88
       88
       +
       		db.FilterIsNot("verified", "null"),

     

       89
       89
       +
       	)

     

       90
       90
       +
       	if err != nil || len(spindles) != 1 {

     

       91
       91
       +
       		l.Error("failed to get spindle", "err", err, "len(spindles)", len(spindles))

     

       92
       92
       +
       		http.Error(w, "Not found", http.StatusNotFound)

     

       93
       93
       +
       		return

     

       94
       94
       +
       	}

     

       95
       95
       +
       

     

       96
       96
       +
       	spindle := spindles[0]

     

       97
       97
       +
       	members, err := s.Enforcer.GetSpindleUsersByRole("server:member", spindle.Instance)

     

       98
       98
       +
       	if err != nil {

     

       99
       99
       +
       		l.Error("failed to get spindle members", "err", err)

     

       100
       100
       +
       		http.Error(w, "Not found", http.StatusInternalServerError)

     

       101
       101
       +
       		return

     

       102
       102
       +
       	}

     

       103
       103
       +
       	slices.Sort(members)

     

       104
       104
       +
       

     

       105
       105
       +
       	repos, err := db.GetRepos(

     

       106
       106
       +
       		s.Db,

     

       107
       107
       +
       		db.FilterEq("spindle", instance),

     

       108
       108
       +
       	)

     

       109
       109
       +
       	if err != nil {

     

       110
       110
       +
       		l.Error("failed to get spindle repos", "err", err)

     

       111
       111
       +
       		http.Error(w, "Not found", http.StatusInternalServerError)

     

       112
       112
       +
       		return

     

       113
       113
       +
       	}

     

       114
       114
       +
       

     

       115
       115
       +
       	identsToResolve := make([]string, len(members))

     

       116
       116
       +
       	for i, member := range members {

     

       117
       117
       +
       		identsToResolve[i] = member

     

       118
       118
       +
       	}

     

       119
       119
       +
       	resolvedIds := s.IdResolver.ResolveIdents(r.Context(), identsToResolve)

     

       120
       120
       +
       	didHandleMap := make(map[string]string)

     

       121
       121
       +
       	for _, identity := range resolvedIds {

     

       122
       122
       +
       		if !identity.Handle.IsInvalidHandle() {

     

       123
       123
       +
       			didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())

     

       124
       124
       +
       		} else {

     

       125
       125
       +
       			didHandleMap[identity.DID.String()] = identity.DID.String()

     

       126
       126
       +
       		}

     

       127
       127
       +
       	}

     

       128
       128
       +
       

     

       129
       129
       +
       	// organize repos by did

     

       130
       130
       +
       	repoMap := make(map[string][]db.Repo)

     

       131
       131
       +
       	for _, r := range repos {

     

       132
       132
       +
       		repoMap[r.Did] = append(repoMap[r.Did], r)

     

       133
       133
       +
       	}

     

       134
       134
       +
       

     

       135
       135
       +
       	s.Pages.SpindleDashboard(w, pages.SpindleDashboardParams{

     

       136
       136
       +
       		LoggedInUser: user,

     

       137
       137
       +
       		Spindle:      spindle,

     

       138
       138
       +
       		Members:      members,

     

       139
       139
       +
       		Repos:        repoMap,

     

       140
       140
       +
       		DidHandleMap: didHandleMap,

     

       141
       141
       +
       	})

     

       142
       142
       +
       }

     

       143
       143
       +
       

     

       67
       144
        
       // this endpoint inserts a record on behalf of the user to register that domain

     

       68
       145
        
       //

     

       69
       146
        
       // when registered, it also makes a request to see if the spindle declares this users as its owner,

     
···

       85
       162
        
       		s.Pages.Notice(w, noticeId, "Incomplete form.")

     

       86
       163
        
       		return

     

       87
       164
        
       	}

     

       165
       165
       +
       	l = l.With("instance", instance)

     

       166
       166
       +
       	l = l.With("user", user.Did)

     

       88
       167
        
       

     

       89
       168
        
       	tx, err := s.Db.Begin()

     

       90
       169
        
       	if err != nil {

     
···

       92
       171
        
       		fail()

     

       93
       172
        
       		return

     

       94
       173
        
       	}

     

       95
       95
       -
       	defer tx.Rollback()

     

       174
       174
       +
       	defer func() {

     

       175
       175
       +
       		tx.Rollback()

     

       176
       176
       +
       		s.Enforcer.E.LoadPolicy()

     

       177
       177
       +
       	}()

     

       96
       178
        
       

     

       97
       179
        
       	err = db.AddSpindle(tx, db.Spindle{

     

       98
       180
        
       		Owner:    syntax.DID(user.Did),

     
···

       104
       186
        
       		return

     

       105
       187
        
       	}

     

       106
       188
        
       

     

       189
       189
       +
       	err = s.Enforcer.AddSpindle(instance)

     

       190
       190
       +
       	if err != nil {

     

       191
       191
       +
       		l.Error("failed to create spindle", "err", err)

     

       192
       192
       +
       		fail()

     

       193
       193
       +
       		return

     

       194
       194
       +
       	}

     

       195
       195
       +
       

     

       107
       196
        
       	// create record on pds

     

       108
       197
        
       	client, err := s.OAuth.AuthorizedClient(r)

     

       109
       198
        
       	if err != nil {

     
···

       144
       233
        
       		return

     

       145
       234
        
       	}

     

       146
       235
        
       

     

       147
       147
       -
       	// begin verification

     

       148
       148
       -
       	expectedOwner, err := fetchOwner(r.Context(), instance, s.Config.Core.Dev)

     

       149
       149
       -
       	if err != nil {

     

       150
       150
       -
       		l.Error("verification failed", "err", err)

     

       151
       151
       -
       

     

       152
       152
       -
       		// just refresh the page

     

       153
       153
       -
       		s.Pages.HxRefresh(w)

     

       154
       154
       -
       		return

     

       155
       155
       -
       	}

     

       156
       156
       -
       

     

       157
       157
       -
       	if expectedOwner != user.Did {

     

       158
       158
       -
       		// verification failed

     

       159
       159
       -
       		l.Error("verification failed", "expectedOwner", expectedOwner, "observedOwner", user.Did)

     

       160
       160
       -
       		s.Pages.HxRefresh(w)

     

       161
       161
       -
       		return

     

       162
       162
       -
       	}

     

       163
       163
       -
       

     

       164
       164
       -
       	tx, err = s.Db.Begin()

     

       165
       165
       -
       	if err != nil {

     

       166
       166
       -
       		l.Error("failed to commit verification info", "err", err)

     

       167
       167
       -
       		s.Pages.HxRefresh(w)

     

       168
       168
       -
       		return

     

       169
       169
       -
       	}

     

       170
       170
       -
       	defer func() {

     

       171
       171
       -
       		tx.Rollback()

     

       172
       172
       -
       		s.Enforcer.E.LoadPolicy()

     

       173
       173
       -
       	}()

     

       174
       174
       -
       

     

       175
       175
       -
       	// mark this spindle as verified in the db

     

       176
       176
       -
       	_, err = db.VerifySpindle(

     

       177
       177
       -
       		tx,

     

       178
       178
       -
       		db.FilterEq("owner", user.Did),

     

       179
       179
       -
       		db.FilterEq("instance", instance),

     

       180
       180
       -
       	)

     

       181
       181
       -
       

     

       182
       182
       -
       	err = s.Enforcer.AddSpindleOwner(instance, user.Did)

     

       236
       236
       +
       	err = s.Enforcer.E.SavePolicy()

     

       183
       237
        
       	if err != nil {

     

       184
       238
        
       		l.Error("failed to update ACL", "err", err)

     

       185
       239
        
       		s.Pages.HxRefresh(w)

     

       186
       240
        
       		return

     

       187
       241
        
       	}

     

       188
       242
        
       

     

       189
       189
       -
       	err = tx.Commit()

     

       243
       243
       +
       	// begin verification

     

       244
       244
       +
       	err = verify.RunVerification(r.Context(), instance, user.Did, s.Config.Core.Dev)

     

       190
       245
        
       	if err != nil {

     

       191
       191
       -
       		l.Error("failed to commit verification info", "err", err)

     

       246
       246
       +
       		l.Error("verification failed", "err", err)

     

       192
       247
        
       		s.Pages.HxRefresh(w)

     

       193
       248
        
       		return

     

       194
       249
        
       	}

     

       195
       250
        
       

     

       196
       196
       -
       	err = s.Enforcer.E.SavePolicy()

     

       251
       251
       +
       	_, err = verify.MarkVerified(s.Db, s.Enforcer, instance, user.Did)

     

       197
       252
        
       	if err != nil {

     

       198
       198
       -
       		l.Error("failed to update ACL", "err", err)

     

       253
       253
       +
       		l.Error("failed to mark verified", "err", err)

     

       199
       254
        
       		s.Pages.HxRefresh(w)

     

       200
       255
        
       		return

     

       201
       256
        
       	}

     
···

       207
       262
        
       

     

       208
       263
        
       func (s *Spindles) delete(w http.ResponseWriter, r *http.Request) {

     

       209
       264
        
       	user := s.OAuth.GetUser(r)

     

       210
       210
       -
       	l := s.Logger.With("handler", "register")

     

       265
       265
       +
       	l := s.Logger.With("handler", "delete")

     

       211
       266
        
       

     

       212
       267
        
       	noticeId := "operation-error"

     

       213
       268
        
       	defaultErr := "Failed to delete spindle. Try again later."

     
···

       222
       277
        
       		return

     

       223
       278
        
       	}

     

       224
       279
        
       

     

       280
       280
       +
       	spindles, err := db.GetSpindles(

     

       281
       281
       +
       		s.Db,

     

       282
       282
       +
       		db.FilterEq("owner", user.Did),

     

       283
       283
       +
       		db.FilterEq("instance", instance),

     

       284
       284
       +
       	)

     

       285
       285
       +
       	if err != nil || len(spindles) != 1 {

     

       286
       286
       +
       		l.Error("failed to retrieve instance", "err", err, "len(spindles)", len(spindles))

     

       287
       287
       +
       		fail()

     

       288
       288
       +
       		return

     

       289
       289
       +
       	}

     

       290
       290
       +
       

     

       291
       291
       +
       	if string(spindles[0].Owner) != user.Did {

     

       292
       292
       +
       		l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner)

     

       293
       293
       +
       		s.Pages.Notice(w, noticeId, "Failed to delete spindle, unauthorized deletion attempt.")

     

       294
       294
       +
       		return

     

       295
       295
       +
       	}

     

       296
       296
       +
       

     

       225
       297
        
       	tx, err := s.Db.Begin()

     

       226
       298
        
       	if err != nil {

     

       227
       299
        
       		l.Error("failed to start txn", "err", err)

     

       228
       300
        
       		fail()

     

       229
       301
        
       		return

     

       230
       302
        
       	}

     

       231
       231
       -
       	defer tx.Rollback()

     

       303
       303
       +
       	defer func() {

     

       304
       304
       +
       		tx.Rollback()

     

       305
       305
       +
       		s.Enforcer.E.LoadPolicy()

     

       306
       306
       +
       	}()

     

       232
       307
        
       

     

       233
       308
        
       	err = db.DeleteSpindle(

     

       234
       309
        
       		tx,

     
···

       237
       312
        
       	)

     

       238
       313
        
       	if err != nil {

     

       239
       314
        
       		l.Error("failed to delete spindle", "err", err)

     

       315
       315
       +
       		fail()

     

       316
       316
       +
       		return

     

       317
       317
       +
       	}

     

       318
       318
       +
       

     

       319
       319
       +
       	err = s.Enforcer.RemoveSpindle(instance)

     

       320
       320
       +
       	if err != nil {

     

       321
       321
       +
       		l.Error("failed to update ACL", "err", err)

     

       240
       322
        
       		fail()

     

       241
       323
        
       		return

     

       242
       324
        
       	}

     
···

       265
       347
        
       		return

     

       266
       348
        
       	}

     

       267
       349
        
       

     

       350
       350
       +
       	err = s.Enforcer.E.SavePolicy()

     

       351
       351
       +
       	if err != nil {

     

       352
       352
       +
       		l.Error("failed to update ACL", "err", err)

     

       353
       353
       +
       		s.Pages.HxRefresh(w)

     

       354
       354
       +
       		return

     

       355
       355
       +
       	}

     

       356
       356
       +
       

     

       357
       357
       +
       	shouldRedirect := r.Header.Get("shouldRedirect")

     

       358
       358
       +
       	if shouldRedirect == "true" {

     

       359
       359
       +
       		s.Pages.HxRedirect(w, "/spindles")

     

       360
       360
       +
       		return

     

       361
       361
       +
       	}

     

       362
       362
       +
       

     

       268
       363
        
       	w.Write([]byte{})

     

       269
       364
        
       }

     

       270
       365
        
       

     

       271
       366
        
       func (s *Spindles) retry(w http.ResponseWriter, r *http.Request) {

     

       272
       367
        
       	user := s.OAuth.GetUser(r)

     

       273
       273
       -
       	l := s.Logger.With("handler", "register")

     

       368
       368
       +
       	l := s.Logger.With("handler", "retry")

     

       274
       369
        
       

     

       275
       370
        
       	noticeId := "operation-error"

     

       276
       371
        
       	defaultErr := "Failed to verify spindle. Try again later."

     
···

       284
       379
        
       		fail()

     

       285
       380
        
       		return

     

       286
       381
        
       	}

     

       382
       382
       +
       	l = l.With("instance", instance)

     

       383
       383
       +
       	l = l.With("user", user.Did)

     

       384
       384
       +
       

     

       385
       385
       +
       	spindles, err := db.GetSpindles(

     

       386
       386
       +
       		s.Db,

     

       387
       387
       +
       		db.FilterEq("owner", user.Did),

     

       388
       388
       +
       		db.FilterEq("instance", instance),

     

       389
       389
       +
       	)

     

       390
       390
       +
       	if err != nil || len(spindles) != 1 {

     

       391
       391
       +
       		l.Error("failed to retrieve instance", "err", err, "len(spindles)", len(spindles))

     

       392
       392
       +
       		fail()

     

       393
       393
       +
       		return

     

       394
       394
       +
       	}

     

       395
       395
       +
       

     

       396
       396
       +
       	if string(spindles[0].Owner) != user.Did {

     

       397
       397
       +
       		l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner)

     

       398
       398
       +
       		s.Pages.Notice(w, noticeId, "Failed to verify spindle, unauthorized verification attempt.")

     

       399
       399
       +
       		return

     

       400
       400
       +
       	}

     

       287
       401
        
       

     

       288
       402
        
       	// begin verification

     

       289
       289
       -
       	expectedOwner, err := fetchOwner(r.Context(), instance, s.Config.Core.Dev)

     

       403
       403
       +
       	err = verify.RunVerification(r.Context(), instance, user.Did, s.Config.Core.Dev)

     

       290
       404
        
       	if err != nil {

     

       291
       405
        
       		l.Error("verification failed", "err", err)

     

       406
       406
       +
       

     

       407
       407
       +
       		if errors.Is(err, verify.FetchError) {

     

       408
       408
       +
       			s.Pages.Notice(w, noticeId, err.Error())

     

       409
       409
       +
       			return

     

       410
       410
       +
       		}

     

       411
       411
       +
       

     

       412
       412
       +
       		if e, ok := err.(*verify.OwnerMismatch); ok {

     

       413
       413
       +
       			s.Pages.Notice(w, noticeId, e.Error())

     

       414
       414
       +
       			return

     

       415
       415
       +
       		}

     

       416
       416
       +
       

     

       292
       417
        
       		fail()

     

       293
       418
        
       		return

     

       294
       419
        
       	}

     

       295
       420
        
       

     

       296
       296
       -
       	if expectedOwner != user.Did {

     

       297
       297
       -
       		l.Error("verification failed", "expectedOwner", expectedOwner, "observedOwner", user.Did)

     

       298
       298
       -
       		s.Pages.Notice(w, noticeId, fmt.Sprintf("Owner did not match, expected %s, got %s", expectedOwner, user.Did))

     

       421
       421
       +
       	rowId, err := verify.MarkVerified(s.Db, s.Enforcer, instance, user.Did)

     

       422
       422
       +
       	if err != nil {

     

       423
       423
       +
       		l.Error("failed to mark verified", "err", err)

     

       424
       424
       +
       		s.Pages.Notice(w, noticeId, err.Error())

     

       299
       425
        
       		return

     

       300
       426
        
       	}

     

       301
       427
        
       

     

       302
       302
       -
       	// mark this spindle as verified in the db

     

       303
       303
       -
       	rowId, err := db.VerifySpindle(

     

       428
       428
       +
       	verifiedSpindle, err := db.GetSpindles(

     

       429
       429
       +
       		s.Db,

     

       430
       430
       +
       		db.FilterEq("id", rowId),

     

       431
       431
       +
       	)

     

       432
       432
       +
       	if err != nil || len(verifiedSpindle) != 1 {

     

       433
       433
       +
       		l.Error("failed get new spindle", "err", err)

     

       434
       434
       +
       		s.Pages.HxRefresh(w)

     

       435
       435
       +
       		return

     

       436
       436
       +
       	}

     

       437
       437
       +
       

     

       438
       438
       +
       	shouldRefresh := r.Header.Get("shouldRefresh")

     

       439
       439
       +
       	if shouldRefresh == "true" {

     

       440
       440
       +
       		s.Pages.HxRefresh(w)

     

       441
       441
       +
       		return

     

       442
       442
       +
       	}

     

       443
       443
       +
       

     

       444
       444
       +
       	w.Header().Set("HX-Reswap", "outerHTML")

     

       445
       445
       +
       	s.Pages.SpindleListing(w, pages.SpindleListingParams{verifiedSpindle[0]})

     

       446
       446
       +
       }

     

       447
       447
       +
       

     

       448
       448
       +
       func (s *Spindles) addMember(w http.ResponseWriter, r *http.Request) {

     

       449
       449
       +
       	user := s.OAuth.GetUser(r)

     

       450
       450
       +
       	l := s.Logger.With("handler", "addMember")

     

       451
       451
       +
       

     

       452
       452
       +
       	instance := chi.URLParam(r, "instance")

     

       453
       453
       +
       	if instance == "" {

     

       454
       454
       +
       		l.Error("empty instance")

     

       455
       455
       +
       		http.Error(w, "Not found", http.StatusNotFound)

     

       456
       456
       +
       		return

     

       457
       457
       +
       	}

     

       458
       458
       +
       	l = l.With("instance", instance)

     

       459
       459
       +
       	l = l.With("user", user.Did)

     

       460
       460
       +
       

     

       461
       461
       +
       	spindles, err := db.GetSpindles(

     

       304
       462
        
       		s.Db,

     

       305
       463
        
       		db.FilterEq("owner", user.Did),

     

       306
       464
        
       		db.FilterEq("instance", instance),

     

       307
       465
        
       	)

     

       466
       466
       +
       	if err != nil || len(spindles) != 1 {

     

       467
       467
       +
       		l.Error("failed to retrieve instance", "err", err, "len(spindles)", len(spindles))

     

       468
       468
       +
       		http.Error(w, "Not found", http.StatusNotFound)

     

       469
       469
       +
       		return

     

       470
       470
       +
       	}

     

       471
       471
       +
       

     

       472
       472
       +
       	noticeId := fmt.Sprintf("add-member-error-%d", spindles[0].Id)

     

       473
       473
       +
       	defaultErr := "Failed to add member. Try again later."

     

       474
       474
       +
       	fail := func() {

     

       475
       475
       +
       		s.Pages.Notice(w, noticeId, defaultErr)

     

       476
       476
       +
       	}

     

       477
       477
       +
       

     

       478
       478
       +
       	if string(spindles[0].Owner) != user.Did {

     

       479
       479
       +
       		l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner)

     

       480
       480
       +
       		s.Pages.Notice(w, noticeId, "Failed to add member, unauthorized attempt.")

     

       481
       481
       +
       		return

     

       482
       482
       +
       	}

     

       483
       483
       +
       

     

       484
       484
       +
       	member := r.FormValue("member")

     

       485
       485
       +
       	if member == "" {

     

       486
       486
       +
       		l.Error("empty member")

     

       487
       487
       +
       		s.Pages.Notice(w, noticeId, "Failed to add member, empty form.")

     

       488
       488
       +
       		return

     

       489
       489
       +
       	}

     

       490
       490
       +
       	l = l.With("member", member)

     

       491
       491
       +
       

     

       492
       492
       +
       	memberId, err := s.IdResolver.ResolveIdent(r.Context(), member)

     

       493
       493
       +
       	if err != nil {

     

       494
       494
       +
       		l.Error("failed to resolve member identity to handle", "err", err)

     

       495
       495
       +
       		s.Pages.Notice(w, noticeId, "Failed to add member, identity resolution failed.")

     

       496
       496
       +
       		return

     

       497
       497
       +
       	}

     

       498
       498
       +
       	if memberId.Handle.IsInvalidHandle() {

     

       499
       499
       +
       		l.Error("failed to resolve member identity to handle")

     

       500
       500
       +
       		s.Pages.Notice(w, noticeId, "Failed to add member, identity resolution failed.")

     

       501
       501
       +
       		return

     

       502
       502
       +
       	}

     

       503
       503
       +
       

     

       504
       504
       +
       	// write to pds

     

       505
       505
       +
       	client, err := s.OAuth.AuthorizedClient(r)

     

       506
       506
       +
       	if err != nil {

     

       507
       507
       +
       		l.Error("failed to authorize client", "err", err)

     

       508
       508
       +
       		fail()

     

       509
       509
       +
       		return

     

       510
       510
       +
       	}

     

       511
       511
       +
       

     

       512
       512
       +
       	tx, err := s.Db.Begin()

     

       308
       513
        
       	if err != nil {

     

       309
       309
       -
       		l.Error("verification failed", "err", err)

     

       514
       514
       +
       		l.Error("failed to start txn", "err", err)

     

       310
       515
        
       		fail()

     

       311
       516
        
       		return

     

       312
       517
        
       	}

     

       518
       518
       +
       	defer func() {

     

       519
       519
       +
       		tx.Rollback()

     

       520
       520
       +
       		s.Enforcer.E.LoadPolicy()

     

       521
       521
       +
       	}()

     

       313
       522
        
       

     

       314
       314
       -
       	verifiedSpindle := db.Spindle{

     

       315
       315
       -
       		Id:       int(rowId),

     

       316
       316
       -
       		Owner:    syntax.DID(user.Did),

     

       523
       523
       +
       	rkey := appview.TID()

     

       524
       524
       +
       

     

       525
       525
       +
       	// add member to db

     

       526
       526
       +
       	if err = db.AddSpindleMember(tx, db.SpindleMember{

     

       527
       527
       +
       		Did:      syntax.DID(user.Did),

     

       528
       528
       +
       		Rkey:     rkey,

     

       317
       529
        
       		Instance: instance,

     

       530
       530
       +
       		Subject:  memberId.DID,

     

       531
       531
       +
       	}); err != nil {

     

       532
       532
       +
       		l.Error("failed to add spindle member", "err", err)

     

       533
       533
       +
       		fail()

     

       534
       534
       +
       		return

     

       318
       535
        
       	}

     

       319
       536
        
       

     

       320
       320
       -
       	w.Header().Set("HX-Reswap", "outerHTML")

     

       321
       321
       -
       	s.Pages.SpindleListing(w, pages.SpindleListingParams{

     

       322
       322
       -
       		LoggedInUser: user,

     

       323
       323
       -
       		Spindle:      verifiedSpindle,

     

       537
       537
       +
       	if err = s.Enforcer.AddSpindleMember(instance, memberId.DID.String()); err != nil {

     

       538
       538
       +
       		l.Error("failed to add member to ACLs")

     

       539
       539
       +
       		fail()

     

       540
       540
       +
       		return

     

       541
       541
       +
       	}

     

       542
       542
       +
       

     

       543
       543
       +
       	_, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{

     

       544
       544
       +
       		Collection: tangled.SpindleMemberNSID,

     

       545
       545
       +
       		Repo:       user.Did,

     

       546
       546
       +
       		Rkey:       rkey,

     

       547
       547
       +
       		Record: &lexutil.LexiconTypeDecoder{

     

       548
       548
       +
       			Val: &tangled.SpindleMember{

     

       549
       549
       +
       				CreatedAt: time.Now().Format(time.RFC3339),

     

       550
       550
       +
       				Instance:  instance,

     

       551
       551
       +
       				Subject:   memberId.DID.String(),

     

       552
       552
       +
       			},

     

       553
       553
       +
       		},

     

       324
       554
        
       	})

     

       555
       555
       +
       	if err != nil {

     

       556
       556
       +
       		l.Error("failed to add record to PDS", "err", err)

     

       557
       557
       +
       		s.Pages.Notice(w, noticeId, "Failed to add record to PDS, try again later.")

     

       558
       558
       +
       		return

     

       559
       559
       +
       	}

     

       560
       560
       +
       

     

       561
       561
       +
       	if err = tx.Commit(); err != nil {

     

       562
       562
       +
       		l.Error("failed to commit txn", "err", err)

     

       563
       563
       +
       		fail()

     

       564
       564
       +
       		return

     

       565
       565
       +
       	}

     

       566
       566
       +
       

     

       567
       567
       +
       	if err = s.Enforcer.E.SavePolicy(); err != nil {

     

       568
       568
       +
       		l.Error("failed to add member to ACLs", "err", err)

     

       569
       569
       +
       		fail()

     

       570
       570
       +
       		return

     

       571
       571
       +
       	}

     

       572
       572
       +
       

     

       573
       573
       +
       	// success

     

       574
       574
       +
       	s.Pages.HxRedirect(w, fmt.Sprintf("/spindles/%s", instance))

     

       325
       575
        
       }

     

       326
       576
        
       

     

       327
       327
       -
       func fetchOwner(ctx context.Context, domain string, dev bool) (string, error) {

     

       328
       328
       -
       	scheme := "https"

     

       329
       329
       -
       	if dev {

     

       330
       330
       -
       		scheme = "http"

     

       577
       577
       +
       func (s *Spindles) removeMember(w http.ResponseWriter, r *http.Request) {

     

       578
       578
       +
       	user := s.OAuth.GetUser(r)

     

       579
       579
       +
       	l := s.Logger.With("handler", "removeMember")

     

       580
       580
       +
       

     

       581
       581
       +
       	noticeId := "operation-error"

     

       582
       582
       +
       	defaultErr := "Failed to add member. Try again later."

     

       583
       583
       +
       	fail := func() {

     

       584
       584
       +
       		s.Pages.Notice(w, noticeId, defaultErr)

     

       331
       585
        
       	}

     

       332
       586
        
       

     

       333
       333
       -
       	url := fmt.Sprintf("%s://%s/owner", scheme, domain)

     

       334
       334
       -
       	req, err := http.NewRequest("GET", url, nil)

     

       587
       587
       +
       	instance := chi.URLParam(r, "instance")

     

       588
       588
       +
       	if instance == "" {

     

       589
       589
       +
       		l.Error("empty instance")

     

       590
       590
       +
       		fail()

     

       591
       591
       +
       		return

     

       592
       592
       +
       	}

     

       593
       593
       +
       	l = l.With("instance", instance)

     

       594
       594
       +
       	l = l.With("user", user.Did)

     

       595
       595
       +
       

     

       596
       596
       +
       	spindles, err := db.GetSpindles(

     

       597
       597
       +
       		s.Db,

     

       598
       598
       +
       		db.FilterEq("owner", user.Did),

     

       599
       599
       +
       		db.FilterEq("instance", instance),

     

       600
       600
       +
       	)

     

       601
       601
       +
       	if err != nil || len(spindles) != 1 {

     

       602
       602
       +
       		l.Error("failed to retrieve instance", "err", err, "len(spindles)", len(spindles))

     

       603
       603
       +
       		fail()

     

       604
       604
       +
       		return

     

       605
       605
       +
       	}

     

       606
       606
       +
       

     

       607
       607
       +
       	if string(spindles[0].Owner) != user.Did {

     

       608
       608
       +
       		l.Error("unauthorized", "user", user.Did, "owner", spindles[0].Owner)

     

       609
       609
       +
       		s.Pages.Notice(w, noticeId, "Failed to add member, unauthorized attempt.")

     

       610
       610
       +
       		return

     

       611
       611
       +
       	}

     

       612
       612
       +
       

     

       613
       613
       +
       	member := r.FormValue("member")

     

       614
       614
       +
       	if member == "" {

     

       615
       615
       +
       		l.Error("empty member")

     

       616
       616
       +
       		s.Pages.Notice(w, noticeId, "Failed to add member, empty form.")

     

       617
       617
       +
       		return

     

       618
       618
       +
       	}

     

       619
       619
       +
       	l = l.With("member", member)

     

       620
       620
       +
       

     

       621
       621
       +
       	memberId, err := s.IdResolver.ResolveIdent(r.Context(), member)

     

       622
       622
       +
       	if err != nil {

     

       623
       623
       +
       		l.Error("failed to resolve member identity to handle", "err", err)

     

       624
       624
       +
       		s.Pages.Notice(w, noticeId, "Failed to add member, identity resolution failed.")

     

       625
       625
       +
       		return

     

       626
       626
       +
       	}

     

       627
       627
       +
       	if memberId.Handle.IsInvalidHandle() {

     

       628
       628
       +
       		l.Error("failed to resolve member identity to handle")

     

       629
       629
       +
       		s.Pages.Notice(w, noticeId, "Failed to add member, identity resolution failed.")

     

       630
       630
       +
       		return

     

       631
       631
       +
       	}

     

       632
       632
       +
       

     

       633
       633
       +
       	tx, err := s.Db.Begin()

     

       335
       634
        
       	if err != nil {

     

       336
       336
       -
       		return "", err

     

       635
       635
       +
       		l.Error("failed to start txn", "err", err)

     

       636
       636
       +
       		fail()

     

       637
       637
       +
       		return

     

       638
       638
       +
       	}

     

       639
       639
       +
       	defer func() {

     

       640
       640
       +
       		tx.Rollback()

     

       641
       641
       +
       		s.Enforcer.E.LoadPolicy()

     

       642
       642
       +
       	}()

     

       643
       643
       +
       

     

       644
       644
       +
       	// get the record from the DB first:

     

       645
       645
       +
       	members, err := db.GetSpindleMembers(

     

       646
       646
       +
       		s.Db,

     

       647
       647
       +
       		db.FilterEq("did", user.Did),

     

       648
       648
       +
       		db.FilterEq("instance", instance),

     

       649
       649
       +
       		db.FilterEq("subject", memberId.DID),

     

       650
       650
       +
       	)

     

       651
       651
       +
       	if err != nil || len(members) != 1 {

     

       652
       652
       +
       		l.Error("failed to get member", "err", err)

     

       653
       653
       +
       		fail()

     

       654
       654
       +
       		return

     

       337
       655
        
       	}

     

       338
       656
        
       

     

       339
       339
       -
       	client := &http.Client{

     

       340
       340
       -
       		Timeout: 1 * time.Second,

     

       657
       657
       +
       	// remove from db

     

       658
       658
       +
       	if err = db.RemoveSpindleMember(

     

       659
       659
       +
       		tx,

     

       660
       660
       +
       		db.FilterEq("did", user.Did),

     

       661
       661
       +
       		db.FilterEq("instance", instance),

     

       662
       662
       +
       		db.FilterEq("subject", memberId.DID),

     

       663
       663
       +
       	); err != nil {

     

       664
       664
       +
       		l.Error("failed to remove spindle member", "err", err)

     

       665
       665
       +
       		fail()

     

       666
       666
       +
       		return

     

       341
       667
        
       	}

     

       342
       668
        
       

     

       343
       343
       -
       	resp, err := client.Do(req.WithContext(ctx))

     

       344
       344
       -
       	if err != nil || resp.StatusCode != 200 {

     

       345
       345
       -
       		return "", errors.New("failed to fetch /owner")

     

       669
       669
       +
       	// remove from enforcer

     

       670
       670
       +
       	if err = s.Enforcer.RemoveSpindleMember(instance, memberId.DID.String()); err != nil {

     

       671
       671
       +
       		l.Error("failed to update ACLs", "err", err)

     

       672
       672
       +
       		fail()

     

       673
       673
       +
       		return

     

       346
       674
        
       	}

     

       347
       675
        
       

     

       348
       348
       -
       	body, err := io.ReadAll(io.LimitReader(resp.Body, 1024)) // read atmost 1kb of data

     

       676
       676
       +
       	client, err := s.OAuth.AuthorizedClient(r)

     

       349
       677
        
       	if err != nil {

     

       350
       350
       -
       		return "", fmt.Errorf("failed to read /owner response: %w", err)

     

       678
       678
       +
       		l.Error("failed to authorize client", "err", err)

     

       679
       679
       +
       		fail()

     

       680
       680
       +
       		return

     

       351
       681
        
       	}

     

       352
       682
        
       

     

       353
       353
       -
       	did := strings.TrimSpace(string(body))

     

       354
       354
       -
       	if did == "" {

     

       355
       355
       -
       		return "", errors.New("empty DID in /owner response")

     

       683
       683
       +
       	// remove from pds

     

       684
       684
       +
       	_, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{

     

       685
       685
       +
       		Collection: tangled.SpindleMemberNSID,

     

       686
       686
       +
       		Repo:       user.Did,

     

       687
       687
       +
       		Rkey:       members[0].Rkey,

     

       688
       688
       +
       	})

     

       689
       689
       +
       	if err != nil {

     

       690
       690
       +
       		// non-fatal

     

       691
       691
       +
       		l.Error("failed to delete record", "err", err)

     

       692
       692
       +
       	}

     

       693
       693
       +
       

     

       694
       694
       +
       	// commit everything

     

       695
       695
       +
       	if err = tx.Commit(); err != nil {

     

       696
       696
       +
       		l.Error("failed to commit txn", "err", err)

     

       697
       697
       +
       		fail()

     

       698
       698
       +
       		return

     

       356
       699
        
       	}

     

       357
       700
        
       

     

       358
       358
       -
       	return did, nil

     

       701
       701
       +
       	// commit everything

     

       702
       702
       +
       	if err = s.Enforcer.E.SavePolicy(); err != nil {

     

       703
       703
       +
       		l.Error("failed to save ACLs", "err", err)

     

       704
       704
       +
       		fail()

     

       705
       705
       +
       		return

     

       706
       706
       +
       	}

     

       707
       707
       +
       

     

       708
       708
       +
       	// ok

     

       709
       709
       +
       	s.Pages.HxRefresh(w)

     

       710
       710
       +
       	return

     

       359
       711
        
       }

+118

appview/spindleverify/verify.go

···

       1
       1
       +
       package spindleverify

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"errors"

     

       6
       6
       +
       	"fmt"

     

       7
       7
       +
       	"io"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       	"strings"

     

       10
       10
       +
       	"time"

     

       11
       11
       +
       

     

       12
       12
       +
       	"tangled.sh/tangled.sh/core/appview/db"

     

       13
       13
       +
       	"tangled.sh/tangled.sh/core/rbac"

     

       14
       14
       +
       )

     

       15
       15
       +
       

     

       16
       16
       +
       var (

     

       17
       17
       +
       	FetchError = errors.New("failed to fetch owner")

     

       18
       18
       +
       )

     

       19
       19
       +
       

     

       20
       20
       +
       // TODO: move this to "spindleclient" or similar

     

       21
       21
       +
       func fetchOwner(ctx context.Context, domain string, dev bool) (string, error) {

     

       22
       22
       +
       	scheme := "https"

     

       23
       23
       +
       	if dev {

     

       24
       24
       +
       		scheme = "http"

     

       25
       25
       +
       	}

     

       26
       26
       +
       

     

       27
       27
       +
       	url := fmt.Sprintf("%s://%s/owner", scheme, domain)

     

       28
       28
       +
       	req, err := http.NewRequest("GET", url, nil)

     

       29
       29
       +
       	if err != nil {

     

       30
       30
       +
       		return "", err

     

       31
       31
       +
       	}

     

       32
       32
       +
       

     

       33
       33
       +
       	client := &http.Client{

     

       34
       34
       +
       		Timeout: 1 * time.Second,

     

       35
       35
       +
       	}

     

       36
       36
       +
       

     

       37
       37
       +
       	resp, err := client.Do(req.WithContext(ctx))

     

       38
       38
       +
       	if err != nil || resp.StatusCode != 200 {

     

       39
       39
       +
       		return "", fmt.Errorf("failed to fetch /owner")

     

       40
       40
       +
       	}

     

       41
       41
       +
       

     

       42
       42
       +
       	body, err := io.ReadAll(io.LimitReader(resp.Body, 1024)) // read atmost 1kb of data

     

       43
       43
       +
       	if err != nil {

     

       44
       44
       +
       		return "", fmt.Errorf("failed to read /owner response: %w", err)

     

       45
       45
       +
       	}

     

       46
       46
       +
       

     

       47
       47
       +
       	did := strings.TrimSpace(string(body))

     

       48
       48
       +
       	if did == "" {

     

       49
       49
       +
       		return "", fmt.Errorf("empty DID in /owner response")

     

       50
       50
       +
       	}

     

       51
       51
       +
       

     

       52
       52
       +
       	return did, nil

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       type OwnerMismatch struct {

     

       56
       56
       +
       	expected string

     

       57
       57
       +
       	observed string

     

       58
       58
       +
       }

     

       59
       59
       +
       

     

       60
       60
       +
       func (e *OwnerMismatch) Error() string {

     

       61
       61
       +
       	return fmt.Sprintf("owner mismatch: %q != %q", e.expected, e.observed)

     

       62
       62
       +
       }

     

       63
       63
       +
       

     

       64
       64
       +
       func RunVerification(ctx context.Context, instance, expectedOwner string, dev bool) error {

     

       65
       65
       +
       	// begin verification

     

       66
       66
       +
       	observedOwner, err := fetchOwner(ctx, instance, dev)

     

       67
       67
       +
       	if err != nil {

     

       68
       68
       +
       		return fmt.Errorf("%w: %w", FetchError, err)

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	if observedOwner != expectedOwner {

     

       72
       72
       +
       		return &OwnerMismatch{

     

       73
       73
       +
       			expected: expectedOwner,

     

       74
       74
       +
       			observed: observedOwner,

     

       75
       75
       +
       		}

     

       76
       76
       +
       	}

     

       77
       77
       +
       

     

       78
       78
       +
       	return nil

     

       79
       79
       +
       }

     

       80
       80
       +
       

     

       81
       81
       +
       // mark this spindle as verified in the DB and add this user as its owner

     

       82
       82
       +
       func MarkVerified(d *db.DB, e *rbac.Enforcer, instance, owner string) (int64, error) {

     

       83
       83
       +
       	tx, err := d.Begin()

     

       84
       84
       +
       	if err != nil {

     

       85
       85
       +
       		return 0, fmt.Errorf("failed to create txn: %w", err)

     

       86
       86
       +
       	}

     

       87
       87
       +
       	defer func() {

     

       88
       88
       +
       		tx.Rollback()

     

       89
       89
       +
       		e.E.LoadPolicy()

     

       90
       90
       +
       	}()

     

       91
       91
       +
       

     

       92
       92
       +
       	// mark this spindle as verified in the db

     

       93
       93
       +
       	rowId, err := db.VerifySpindle(

     

       94
       94
       +
       		tx,

     

       95
       95
       +
       		db.FilterEq("owner", owner),

     

       96
       96
       +
       		db.FilterEq("instance", instance),

     

       97
       97
       +
       	)

     

       98
       98
       +
       	if err != nil {

     

       99
       99
       +
       		return 0, fmt.Errorf("failed to write to DB: %w", err)

     

       100
       100
       +
       	}

     

       101
       101
       +
       

     

       102
       102
       +
       	err = e.AddSpindleOwner(instance, owner)

     

       103
       103
       +
       	if err != nil {

     

       104
       104
       +
       		return 0, fmt.Errorf("failed to update ACL: %w", err)

     

       105
       105
       +
       	}

     

       106
       106
       +
       

     

       107
       107
       +
       	err = tx.Commit()

     

       108
       108
       +
       	if err != nil {

     

       109
       109
       +
       		return 0, fmt.Errorf("failed to commit txn: %w", err)

     

       110
       110
       +
       	}

     

       111
       111
       +
       

     

       112
       112
       +
       	err = e.E.SavePolicy()

     

       113
       113
       +
       	if err != nil {

     

       114
       114
       +
       		return 0, fmt.Errorf("failed to update ACL: %w", err)

     

       115
       115
       +
       	}

     

       116
       116
       +
       

     

       117
       117
       +
       	return rowId, nil

     

       118
       118
       +
       }