comparing 72c627bec61e7b038a685031dc87ae65046cbd13 and hailey/tidy on hailey.at/cocoon

+5 -5

README.md

···

       143
       143
        
       

     

       144
       144
        
       ### Identity

     

       145
       145
        
       

     

       146
       146
       -
       - [ ] `com.atproto.identity.getRecommendedDidCredentials`

     

       147
       147
       -
       - [ ] `com.atproto.identity.requestPlcOperationSignature`

     

       146
       146
       +
       - [x] `com.atproto.identity.getRecommendedDidCredentials`

     

       147
       147
       +
       - [x] `com.atproto.identity.requestPlcOperationSignature`

     

       148
       148
        
       - [x] `com.atproto.identity.resolveHandle`

     

       149
       149
       -
       - [ ] `com.atproto.identity.signPlcOperation`

     

       150
       150
       -
       - [ ] `com.atproto.identity.submitPlcOperation`

     

       149
       149
       +
       - [x] `com.atproto.identity.signPlcOperation`

     

       150
       150
       +
       - [x] `com.atproto.identity.submitPlcOperation`

     

       151
       151
        
       - [x] `com.atproto.identity.updateHandle`

     

       152
       152
        
       

     

       153
       153
        
       ### Repo

     
···

       158
       158
        
       - [x] `com.atproto.repo.deleteRecord`

     

       159
       159
        
       - [x] `com.atproto.repo.describeRepo`

     

       160
       160
        
       - [x] `com.atproto.repo.getRecord`

     

       161
       161
       -
       - [x] `com.atproto.repo.importRepo` (Works "okay". You still have to handle PLC operations on your own when migrating. Use with extreme caution.)

     

       161
       161
       +
       - [x] `com.atproto.repo.importRepo` (Works "okay". Use with extreme caution.)

     

       162
       162
        
       - [x] `com.atproto.repo.listRecords`

     

       163
       163
        
       - [ ] `com.atproto.repo.listMissingBlobs`

     

       164
       164

models/models.go

···

       19
       19
        
       	EmailUpdateCodeExpiresAt       *time.Time

     

       20
       20
        
       	PasswordResetCode              *string

     

       21
       21
        
       	PasswordResetCodeExpiresAt     *time.Time

     

       22
       22
       +
       	PlcOperationCode               *string

     

       23
       23
       +
       	PlcOperationCodeExpiresAt      *time.Time

     

       22
       24
        
       	Password                       string

     

       23
       25
        
       	SigningKey                     []byte

     

       24
       26
        
       	Rev                            string

+44 -28

oauth/client/manager.go

···

       22
       22
        
       	cli           *http.Client

     

       23
       23
        
       	logger        *slog.Logger

     

       24
       24
        
       	jwksCache     cache.Cache[string, jwk.Key]

     

       25
       25
       -
       	metadataCache cache.Cache[string, Metadata]

     

       25
       25
       +
       	metadataCache cache.Cache[string, *Metadata]

     

       26
       26
        
       }

     

       27
       27
        
       

     

       28
       28
        
       type ManagerArgs struct {

     
···

       40
       40
        
       	}

     

       41
       41
        
       

     

       42
       42
        
       	jwksCache := cache.NewCache[string, jwk.Key]().WithLRU().WithMaxKeys(500).WithTTL(5 * time.Minute)

     

       43
       43
       -
       	metadataCache := cache.NewCache[string, Metadata]().WithLRU().WithMaxKeys(500).WithTTL(5 * time.Minute)

     

       43
       43
       +
       	metadataCache := cache.NewCache[string, *Metadata]().WithLRU().WithMaxKeys(500).WithTTL(5 * time.Minute)

     

       44
       44
        
       

     

       45
       45
        
       	return &Manager{

     

       46
       46
        
       		cli:           args.Cli,

     
···

       57
       57
        
       	}

     

       58
       58
        
       

     

       59
       59
        
       	var jwks jwk.Key

     

       60
       60
       -
       	if metadata.JWKS != nil && len(metadata.JWKS.Keys) > 0 {

     

       61
       61
       -
       		// TODO: this is kinda bad but whatever for now. there could obviously be more than one jwk, and we need to

     

       62
       62
       -
       		// make sure we use the right one

     

       63
       63
       -
       		b, err := json.Marshal(metadata.JWKS.Keys[0])

     

       64
       64
       -
       		if err != nil {

     

       65
       65
       -
       			return nil, err

     

       66
       66
       -
       		}

     

       60
       60
       +
       	if metadata.TokenEndpointAuthMethod == "private_key_jwt" {

     

       61
       61
       +
       		if metadata.JWKS != nil && len(metadata.JWKS.Keys) > 0 {

     

       62
       62
       +
       			// TODO: this is kinda bad but whatever for now. there could obviously be more than one jwk, and we need to

     

       63
       63
       +
       			// make sure we use the right one

     

       64
       64
       +
       			b, err := json.Marshal(metadata.JWKS.Keys[0])

     

       65
       65
       +
       			if err != nil {

     

       66
       66
       +
       				return nil, err

     

       67
       67
       +
       			}

     

       67
       68
        
       

     

       68
       68
       -
       		k, err := helpers.ParseJWKFromBytes(b)

     

       69
       69
       -
       		if err != nil {

     

       70
       70
       -
       			return nil, err

     

       71
       71
       -
       		}

     

       69
       69
       +
       			k, err := helpers.ParseJWKFromBytes(b)

     

       70
       70
       +
       			if err != nil {

     

       71
       71
       +
       				return nil, err

     

       72
       72
       +
       			}

     

       72
       73
        
       

     

       73
       73
       -
       		jwks = k

     

       74
       74
       -
       	} else if metadata.JWKSURI != nil {

     

       75
       75
       -
       		maybeJwks, err := cm.getClientJwks(ctx, clientId, *metadata.JWKSURI)

     

       76
       76
       -
       		if err != nil {

     

       77
       77
       -
       			return nil, err

     

       78
       78
       -
       		}

     

       74
       74
       +
       			jwks = k

     

       75
       75
       +
       		} else if metadata.JWKS != nil {

     

       76
       76
       +
       		} else if metadata.JWKSURI != nil {

     

       77
       77
       +
       			maybeJwks, err := cm.getClientJwks(ctx, clientId, *metadata.JWKSURI)

     

       78
       78
       +
       			if err != nil {

     

       79
       79
       +
       				return nil, err

     

       80
       80
       +
       			}

     

       79
       81
        
       

     

       80
       80
       -
       		jwks = maybeJwks

     

       81
       81
       -
       	} else {

     

       82
       82
       -
       		return nil, fmt.Errorf("no valid jwks found in oauth client metadata")

     

       82
       82
       +
       			jwks = maybeJwks

     

       83
       83
       +
       		} else {

     

       84
       84
       +
       			return nil, fmt.Errorf("no valid jwks found in oauth client metadata")

     

       85
       85
       +
       		}

     

       83
       86
        
       	}

     

       84
       87
        
       

     

       85
       88
        
       	return &Client{

     
···

       89
       92
        
       }

     

       90
       93
        
       

     

       91
       94
        
       func (cm *Manager) getClientMetadata(ctx context.Context, clientId string) (*Metadata, error) {

     

       92
       92
       -
       	metadataCached, ok := cm.metadataCache.Get(clientId)

     

       95
       95
       +
       	cached, ok := cm.metadataCache.Get(clientId)

     

       93
       96
        
       	if !ok {

     

       94
       97
        
       		req, err := http.NewRequestWithContext(ctx, "GET", clientId, nil)

     

       95
       98
        
       		if err != nil {

     
···

       117
       120
        
       			return nil, err

     

       118
       121
        
       		}

     

       119
       122
        
       

     

       123
       123
       +
       		cm.metadataCache.Set(clientId, validated, 10*time.Minute)

     

       124
       124
       +
       

     

       120
       125
        
       		return validated, nil

     

       121
       126
        
       	} else {

     

       122
       122
       -
       		return &metadataCached, nil

     

       127
       127
       +
       		return cached, nil

     

       123
       128
        
       	}

     

       124
       129
        
       }

     

       125
       130
        
       

     
···

       204
       209
        
       		return nil, fmt.Errorf("error unmarshaling metadata: %w", err)

     

       205
       210
        
       	}

     

       206
       211
        
       

     

       212
       212
       +
       	if metadata.ClientURI == "" {

     

       213
       213
       +
       		u, err := url.Parse(metadata.ClientID)

     

       214
       214
       +
       		if err != nil {

     

       215
       215
       +
       			return nil, fmt.Errorf("unable to parse client id: %w", err)

     

       216
       216
       +
       		}

     

       217
       217
       +
       		u.RawPath = ""

     

       218
       218
       +
       		u.RawQuery = ""

     

       219
       219
       +
       		metadata.ClientURI = u.String()

     

       220
       220
       +
       	}

     

       221
       221
       +
       

     

       207
       222
        
       	u, err := url.Parse(metadata.ClientURI)

     

       208
       223
        
       	if err != nil {

     

       209
       224
        
       		return nil, fmt.Errorf("unable to parse client uri: %w", err)

     

       210
       225
        
       	}

     

       211
       226
        
       

     

       227
       227
       +
       	if metadata.ClientName == "" {

     

       228
       228
       +
       		metadata.ClientName = metadata.ClientURI

     

       229
       229
       +
       	}

     

       230
       230
       +
       

     

       212
       231
        
       	if isLocalHostname(u.Hostname()) {

     

       213
       213
       -
       		return nil, errors.New("`client_uri` hostname is invalid")

     

       232
       232
       +
       		return nil, fmt.Errorf("`client_uri` hostname is invalid: %s", u.Hostname())

     

       214
       233
        
       	}

     

       215
       234
        
       

     

       216
       235
        
       	if metadata.Scope == "" {

     
···

       349
       368
        
       			if u.Scheme != "http" {

     

       350
       369
        
       				return nil, fmt.Errorf("loopback redirect uri %s must use http", ruri)

     

       351
       370
        
       			}

     

       352
       352
       -
       

     

       353
       353
       -
       			break

     

       354
       371
        
       		case u.Scheme == "http":

     

       355
       372
        
       			return nil, errors.New("only loopbvack redirect uris are allowed to use the `http` scheme")

     

       356
       373
        
       		case u.Scheme == "https":

     

       357
       374
        
       			if isLocalHostname(u.Hostname()) {

     

       358
       375
        
       				return nil, fmt.Errorf("redirect uri %s's domain must not be a local hostname", ruri)

     

       359
       376
        
       			}

     

       360
       360
       -
       			break

     

       361
       377
        
       		case strings.Contains(u.Scheme, "."):

     

       362
       378
        
       			if metadata.ApplicationType != "native" {

     

       363
       379
        
       				return nil, errors.New("private-use uri scheme redirect uris are only allowed for native apps")

+31 -15

plc/client.go

···

       55
       55
        
       }

     

       56
       56
        
       

     

       57
       57
        
       func (c *Client) CreateDID(sigkey *atcrypto.PrivateKeyK256, recovery string, handle string) (string, *Operation, error) {

     

       58
       58
       -
       	pubsigkey, err := sigkey.PublicKey()

     

       58
       58
       +
       	creds, err := c.CreateDidCredentials(sigkey, recovery, handle)

     

       59
       59
        
       	if err != nil {

     

       60
       60
        
       		return "", nil, err

     

       61
       61
        
       	}

     

       62
       62
        
       

     

       63
       63
       -
       	pubrotkey, err := c.rotationKey.PublicKey()

     

       63
       63
       +
       	op := Operation{

     

       64
       64
       +
       		Type: "plc_operation",

     

       65
       65
       +
       		VerificationMethods: creds.VerificationMethods,

     

       66
       66
       +
       		RotationKeys: creds.RotationKeys,

     

       67
       67
       +
       		AlsoKnownAs: creds.AlsoKnownAs,

     

       68
       68
       +
       		Services: creds.Services,

     

       69
       69
       +
       		Prev: nil,

     

       70
       70
       +
       	}

     

       71
       71
       +
       

     

       72
       72
       +
       	if err := c.SignOp(sigkey, &op); err != nil {

     

       73
       73
       +
       		return "", nil, err

     

       74
       74
       +
       	}

     

       75
       75
       +
       

     

       76
       76
       +
       	did, err := DidFromOp(&op)

     

       64
       77
        
       	if err != nil {

     

       65
       78
        
       		return "", nil, err

     

       66
       79
        
       	}

     

       67
       80
        
       

     

       81
       81
       +
       	return did, &op, nil

     

       82
       82
       +
       }

     

       83
       83
       +
       

     

       84
       84
       +
       func (c *Client) CreateDidCredentials(sigkey *atcrypto.PrivateKeyK256, recovery string, handle string) (*DidCredentials, error) {

     

       85
       85
       +
       	pubsigkey, err := sigkey.PublicKey()

     

       86
       86
       +
       	if err != nil {

     

       87
       87
       +
       		return nil, err

     

       88
       88
       +
       	}

     

       89
       89
       +
       

     

       90
       90
       +
       	pubrotkey, err := c.rotationKey.PublicKey()

     

       91
       91
       +
       	if err != nil {

     

       92
       92
       +
       		return nil, err

     

       93
       93
       +
       	}

     

       94
       94
       +
       

     

       68
       95
        
       	// todo

     

       69
       96
        
       	rotationKeys := []string{pubrotkey.DIDKey()}

     

       70
       97
        
       	if recovery != "" {

     
···

       77
       104
        
       		}(recovery)

     

       78
       105
        
       	}

     

       79
       106
        
       

     

       80
       80
       -
       	op := Operation{

     

       81
       81
       -
       		Type: "plc_operation",

     

       107
       107
       +
       	creds := DidCredentials{

     

       82
       108
        
       		VerificationMethods: map[string]string{

     

       83
       109
        
       			"atproto": pubsigkey.DIDKey(),

     

       84
       110
        
       		},

     
···

       92
       118
        
       				Endpoint: "https://" + c.pdsHostname,

     

       93
       119
        
       			},

     

       94
       120
        
       		},

     

       95
       95
       -
       		Prev: nil,

     

       96
       121
        
       	}

     

       97
       122
        
       

     

       98
       98
       -
       	if err := c.SignOp(sigkey, &op); err != nil {

     

       99
       99
       -
       		return "", nil, err

     

       100
       100
       -
       	}

     

       101
       101
       -
       

     

       102
       102
       -
       	did, err := DidFromOp(&op)

     

       103
       103
       -
       	if err != nil {

     

       104
       104
       -
       		return "", nil, err

     

       105
       105
       -
       	}

     

       106
       106
       -
       

     

       107
       107
       -
       	return did, &op, nil

     

       123
       123
       +
       	return &creds, nil

     

       108
       124
        
       }

     

       109
       125
        
       

     

       110
       126
        
       func (c *Client) SignOp(sigkey *atcrypto.PrivateKeyK256, op *Operation) error {

plc/types.go

···

       8
       8
        
       	cbg "github.com/whyrusleeping/cbor-gen"

     

       9
       9
        
       )

     

       10
       10
        
       

     

       11
       11
       +
       

     

       12
       12
       +
       type DidCredentials struct {

     

       13
       13
       +
       	VerificationMethods map[string]string                    `json:"verificationMethods"`

     

       14
       14
       +
       	RotationKeys        []string                             `json:"rotationKeys"`

     

       15
       15
       +
       	AlsoKnownAs         []string                             `json:"alsoKnownAs"`

     

       16
       16
       +
       	Services            map[string]identity.OperationService `json:"services"`

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       11
       19
        
       type Operation struct {

     

       12
       20
        
       	Type                string                               `json:"type"`

     

       13
       21
        
       	VerificationMethods map[string]string                    `json:"verificationMethods"`

server/handle_account.go

···

       12
       12
        
       

     

       13
       13
        
       func (s *Server) handleAccount(e echo.Context) error {

     

       14
       14
        
       	ctx := e.Request().Context()

     

       15
       15
       +
       

     

       15
       16
        
       	repo, sess, err := s.getSessionRepoOrErr(e)

     

       16
       17
        
       	if err != nil {

     

       17
       18
        
       		return e.Redirect(303, "/account/signin")

+26

server/handle_identity_get_recommended_did_credentials.go

···

       1
       1
       +
       package server

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"github.com/bluesky-social/indigo/atproto/atcrypto"

     

       5
       5
       +
       	"github.com/haileyok/cocoon/internal/helpers"

     

       6
       6
       +
       	"github.com/haileyok/cocoon/models"

     

       7
       7
       +
       	"github.com/labstack/echo/v4"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       func (s *Server) handleGetRecommendedDidCredentials(e echo.Context) error {

     

       11
       11
       +
       	repo := e.Get("repo").(*models.RepoActor)

     

       12
       12
       +
       

     

       13
       13
       +
       	k, err := atcrypto.ParsePrivateBytesK256(repo.SigningKey)

     

       14
       14
       +
       	if err != nil {

     

       15
       15
       +
       		s.logger.Error("error parsing key", "error", err)

     

       16
       16
       +
       		return helpers.ServerError(e, nil)

     

       17
       17
       +
       	}

     

       18
       18
       +
       

     

       19
       19
       +
       	creds, err := s.plcClient.CreateDidCredentials(k, "", repo.Actor.Handle)

     

       20
       20
       +
       	if err != nil {

     

       21
       21
       +
       		s.logger.Error("error crating did credentials", "error", err)

     

       22
       22
       +
       		return helpers.ServerError(e, nil)

     

       23
       23
       +
       	}

     

       24
       24
       +
       

     

       25
       25
       +
       	return e.JSON(200, creds)

     

       26
       26
       +
       }

+29

server/handle_identity_request_plc_operation.go

···

       1
       1
       +
       package server

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"time"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/haileyok/cocoon/internal/helpers"

     

       8
       8
       +
       	"github.com/haileyok/cocoon/models"

     

       9
       9
       +
       	"github.com/labstack/echo/v4"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

       12
       12
       +
       func (s *Server) handleIdentityRequestPlcOperationSignature(e echo.Context) error {

     

       13
       13
       +
       	urepo := e.Get("repo").(*models.RepoActor)

     

       14
       14
       +
       

     

       15
       15
       +
       	code := fmt.Sprintf("%s-%s", helpers.RandomVarchar(5), helpers.RandomVarchar(5))

     

       16
       16
       +
       	eat := time.Now().Add(10 * time.Minute).UTC()

     

       17
       17
       +
       

     

       18
       18
       +
       	if err := s.db.Exec("UPDATE repos SET plc_operation_code = ?, plc_operation_code_expires_at = ? WHERE did = ?", nil, code, eat, urepo.Repo.Did).Error; err != nil {

     

       19
       19
       +
       		s.logger.Error("error updating user", "error", err)

     

       20
       20
       +
       		return helpers.ServerError(e, nil)

     

       21
       21
       +
       	}

     

       22
       22
       +
       

     

       23
       23
       +
       	if err := s.sendPlcTokenReset(urepo.Email, urepo.Handle, code); err != nil {

     

       24
       24
       +
       		s.logger.Error("error sending mail", "error", err)

     

       25
       25
       +
       		return helpers.ServerError(e, nil)

     

       26
       26
       +
       	}

     

       27
       27
       +
       

     

       28
       28
       +
       	return e.NoContent(200)

     

       29
       29
       +
       }

+103

server/handle_identity_sign_plc_operation.go

···

       1
       1
       +
       package server

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"strings"

     

       6
       6
       +
       	"time"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/Azure/go-autorest/autorest/to"

     

       9
       9
       +
       	"github.com/bluesky-social/indigo/atproto/atcrypto"

     

       10
       10
       +
       	"github.com/haileyok/cocoon/identity"

     

       11
       11
       +
       	"github.com/haileyok/cocoon/internal/helpers"

     

       12
       12
       +
       	"github.com/haileyok/cocoon/models"

     

       13
       13
       +
       	"github.com/haileyok/cocoon/plc"

     

       14
       14
       +
       	"github.com/labstack/echo/v4"

     

       15
       15
       +
       )

     

       16
       16
       +
       

     

       17
       17
       +
       type ComAtprotoSignPlcOperationRequest struct {

     

       18
       18
       +
       	Token               string                                `json:"token"`

     

       19
       19
       +
       	VerificationMethods *map[string]string                    `json:"verificationMethods"`

     

       20
       20
       +
       	RotationKeys        *[]string                             `json:"rotationKeys"`

     

       21
       21
       +
       	AlsoKnownAs         *[]string                             `json:"alsoKnownAs"`

     

       22
       22
       +
       	Services            *map[string]identity.OperationService `json:"services"`

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       type ComAtprotoSignPlcOperationResponse struct {

     

       26
       26
       +
       	Operation plc.Operation `json:"operation"`

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       func (s *Server) handleSignPlcOperation(e echo.Context) error {

     

       30
       30
       +
       	repo := e.Get("repo").(*models.RepoActor)

     

       31
       31
       +
       

     

       32
       32
       +
       	var req ComAtprotoSignPlcOperationRequest

     

       33
       33
       +
       	if err := e.Bind(&req); err != nil {

     

       34
       34
       +
       		s.logger.Error("error binding", "error", err)

     

       35
       35
       +
       		return helpers.ServerError(e, nil)

     

       36
       36
       +
       	}

     

       37
       37
       +
       

     

       38
       38
       +
       	if !strings.HasPrefix(repo.Repo.Did, "did:plc:") {

     

       39
       39
       +
       		return helpers.InputError(e, nil)

     

       40
       40
       +
       	}

     

       41
       41
       +
       

     

       42
       42
       +
       	if repo.PlcOperationCode == nil || repo.PlcOperationCodeExpiresAt == nil {

     

       43
       43
       +
       		return helpers.InputError(e, to.StringPtr("InvalidToken"))

     

       44
       44
       +
       	}

     

       45
       45
       +
       

     

       46
       46
       +
       	if *repo.PlcOperationCode != req.Token {

     

       47
       47
       +
       		return helpers.InvalidTokenError(e)

     

       48
       48
       +
       	}

     

       49
       49
       +
       

     

       50
       50
       +
       	if time.Now().UTC().After(*repo.PlcOperationCodeExpiresAt) {

     

       51
       51
       +
       		return helpers.ExpiredTokenError(e)

     

       52
       52
       +
       	}

     

       53
       53
       +
       

     

       54
       54
       +
       	ctx := context.WithValue(e.Request().Context(), "skip-cache", true)

     

       55
       55
       +
       	log, err := identity.FetchDidAuditLog(ctx, nil, repo.Repo.Did)

     

       56
       56
       +
       	if err != nil {

     

       57
       57
       +
       		s.logger.Error("error fetching doc", "error", err)

     

       58
       58
       +
       		return helpers.ServerError(e, nil)

     

       59
       59
       +
       	}

     

       60
       60
       +
       

     

       61
       61
       +
       	latest := log[len(log)-1]

     

       62
       62
       +
       

     

       63
       63
       +
       	op := plc.Operation{

     

       64
       64
       +
       		Type:                "plc_operation",

     

       65
       65
       +
       		VerificationMethods: latest.Operation.VerificationMethods,

     

       66
       66
       +
       		RotationKeys:        latest.Operation.RotationKeys,

     

       67
       67
       +
       		AlsoKnownAs:         latest.Operation.AlsoKnownAs,

     

       68
       68
       +
       		Services:            latest.Operation.Services,

     

       69
       69
       +
       		Prev:                &latest.Cid,

     

       70
       70
       +
       	}

     

       71
       71
       +
       	if req.VerificationMethods != nil {

     

       72
       72
       +
       		op.VerificationMethods = *req.VerificationMethods

     

       73
       73
       +
       	}

     

       74
       74
       +
       	if req.RotationKeys != nil {

     

       75
       75
       +
       		op.RotationKeys = *req.RotationKeys

     

       76
       76
       +
       	}

     

       77
       77
       +
       	if req.AlsoKnownAs != nil {

     

       78
       78
       +
       		op.AlsoKnownAs = *req.AlsoKnownAs

     

       79
       79
       +
       	}

     

       80
       80
       +
       	if req.Services != nil {

     

       81
       81
       +
       		op.Services = *req.Services

     

       82
       82
       +
       	}

     

       83
       83
       +
       

     

       84
       84
       +
       	k, err := atcrypto.ParsePrivateBytesK256(repo.SigningKey)

     

       85
       85
       +
       	if err != nil {

     

       86
       86
       +
       		s.logger.Error("error parsing signing key", "error", err)

     

       87
       87
       +
       		return helpers.ServerError(e, nil)

     

       88
       88
       +
       	}

     

       89
       89
       +
       

     

       90
       90
       +
       	if err := s.plcClient.SignOp(k, &op); err != nil {

     

       91
       91
       +
       		s.logger.Error("error signing plc operation", "error", err)

     

       92
       92
       +
       		return helpers.ServerError(e, nil)

     

       93
       93
       +
       	}

     

       94
       94
       +
       

     

       95
       95
       +
       	if err := s.db.Exec("UPDATE repos SET plc_operation_code = NULL, plc_operation_code_expires_at = NULL WHERE did = ?", nil, repo.Repo.Did).Error; err != nil {

     

       96
       96
       +
       		s.logger.Error("error updating repo", "error", err)

     

       97
       97
       +
       		return helpers.ServerError(e, nil)

     

       98
       98
       +
       	}

     

       99
       99
       +
       

     

       100
       100
       +
       	return e.JSON(200, ComAtprotoSignPlcOperationResponse{

     

       101
       101
       +
       		Operation: op,

     

       102
       102
       +
       	})

     

       103
       103
       +
       }

+87

server/handle_identity_submit_plc_operation.go

···

       1
       1
       +
       package server

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"slices"

     

       6
       6
       +
       	"strings"

     

       7
       7
       +
       	"time"

     

       8
       8
       +
       

     

       9
       9
       +
       	"github.com/bluesky-social/indigo/api/atproto"

     

       10
       10
       +
       	"github.com/bluesky-social/indigo/atproto/atcrypto"

     

       11
       11
       +
       	"github.com/bluesky-social/indigo/events"

     

       12
       12
       +
       	"github.com/bluesky-social/indigo/util"

     

       13
       13
       +
       	"github.com/haileyok/cocoon/internal/helpers"

     

       14
       14
       +
       	"github.com/haileyok/cocoon/models"

     

       15
       15
       +
       	"github.com/haileyok/cocoon/plc"

     

       16
       16
       +
       	"github.com/labstack/echo/v4"

     

       17
       17
       +
       )

     

       18
       18
       +
       

     

       19
       19
       +
       type ComAtprotoSubmitPlcOperationRequest struct {

     

       20
       20
       +
       	Operation plc.Operation `json:"operation"`

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       func (s *Server) handleSubmitPlcOperation(e echo.Context) error {

     

       24
       24
       +
       	repo := e.Get("repo").(*models.RepoActor)

     

       25
       25
       +
       

     

       26
       26
       +
       	var req ComAtprotoSubmitPlcOperationRequest

     

       27
       27
       +
       	if err := e.Bind(&req); err != nil {

     

       28
       28
       +
       		s.logger.Error("error binding", "error", err)

     

       29
       29
       +
       		return helpers.ServerError(e, nil)

     

       30
       30
       +
       	}

     

       31
       31
       +
       

     

       32
       32
       +
       	if err := e.Validate(req); err != nil {

     

       33
       33
       +
       		return helpers.InputError(e, nil)

     

       34
       34
       +
       	}

     

       35
       35
       +
       	if !strings.HasPrefix(repo.Repo.Did, "did:plc:") {

     

       36
       36
       +
       		return helpers.InputError(e, nil)

     

       37
       37
       +
       	}

     

       38
       38
       +
       

     

       39
       39
       +
       	op := req.Operation

     

       40
       40
       +
       

     

       41
       41
       +
       	k, err := atcrypto.ParsePrivateBytesK256(repo.SigningKey)

     

       42
       42
       +
       	if err != nil {

     

       43
       43
       +
       		s.logger.Error("error parsing key", "error", err)

     

       44
       44
       +
       		return helpers.ServerError(e, nil)

     

       45
       45
       +
       	}

     

       46
       46
       +
       	required, err := s.plcClient.CreateDidCredentials(k, "", repo.Actor.Handle)

     

       47
       47
       +
       	if err != nil {

     

       48
       48
       +
       		s.logger.Error("error crating did credentials", "error", err)

     

       49
       49
       +
       		return helpers.ServerError(e, nil)

     

       50
       50
       +
       	}

     

       51
       51
       +
       

     

       52
       52
       +
       	for _, expectedKey := range required.RotationKeys {

     

       53
       53
       +
       		if !slices.Contains(op.RotationKeys, expectedKey) {

     

       54
       54
       +
       			return helpers.InputError(e, nil)

     

       55
       55
       +
       		}

     

       56
       56
       +
       	}

     

       57
       57
       +
       	if op.Services["atproto_pds"].Type != "AtprotoPersonalDataServer" {

     

       58
       58
       +
       		return helpers.InputError(e, nil)

     

       59
       59
       +
       	}

     

       60
       60
       +
       	if op.Services["atproto_pds"].Endpoint != required.Services["atproto_pds"].Endpoint {

     

       61
       61
       +
       		return helpers.InputError(e, nil)

     

       62
       62
       +
       	}

     

       63
       63
       +
       	if op.VerificationMethods["atproto"] != required.VerificationMethods["atproto"] {

     

       64
       64
       +
       		return helpers.InputError(e, nil)

     

       65
       65
       +
       	}

     

       66
       66
       +
       	if op.AlsoKnownAs[0] != required.AlsoKnownAs[0] {

     

       67
       67
       +
       		return helpers.InputError(e, nil)

     

       68
       68
       +
       	}

     

       69
       69
       +
       

     

       70
       70
       +
       	if err := s.plcClient.SendOperation(e.Request().Context(), repo.Repo.Did, &op); err != nil {

     

       71
       71
       +
       		return err

     

       72
       72
       +
       	}

     

       73
       73
       +
       

     

       74
       74
       +
       	if err := s.passport.BustDoc(context.TODO(), repo.Repo.Did); err != nil {

     

       75
       75
       +
       		s.logger.Warn("error busting did doc", "error", err)

     

       76
       76
       +
       	}

     

       77
       77
       +
       

     

       78
       78
       +
       	s.evtman.AddEvent(context.TODO(), &events.XRPCStreamEvent{

     

       79
       79
       +
       		RepoIdentity: &atproto.SyncSubscribeRepos_Identity{

     

       80
       80
       +
       			Did:  repo.Repo.Did,

     

       81
       81
       +
       			Seq:  time.Now().UnixMicro(), // TODO: no

     

       82
       82
       +
       			Time: time.Now().Format(util.ISO8601),

     

       83
       83
       +
       		},

     

       84
       84
       +
       	})

     

       85
       85
       +
       

     

       86
       86
       +
       	return nil

     

       87
       87
       +
       }

+9 -8

server/handle_import_repo.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"bytes"

     

       5
       5
       -
       	"context"

     

       6
       5
        
       	"io"

     

       7
       6
        
       	"slices"

     

       8
       7
        
       	"strings"

     
···

       18
       17
        
       )

     

       19
       18
        
       

     

       20
       19
        
       func (s *Server) handleRepoImportRepo(e echo.Context) error {

     

       20
       20
       +
       	ctx := e.Request().Context()

     

       21
       21
       +
       

     

       21
       22
        
       	urepo := e.Get("repo").(*models.RepoActor)

     

       22
       23
        
       

     

       23
       24
        
       	b, err := io.ReadAll(e.Request().Body)

     
···

       52
       53
        
       

     

       53
       54
        
       	slices.Reverse(orderedBlocks)

     

       54
       55
        
       

     

       55
       55
       -
       	if err := bs.PutMany(context.TODO(), orderedBlocks); err != nil {

     

       56
       56
       +
       	if err := bs.PutMany(ctx, orderedBlocks); err != nil {

     

       56
       57
        
       		s.logger.Error("could not insert blocks", "error", err)

     

       57
       58
        
       		return helpers.ServerError(e, nil)

     

       58
       59
        
       	}

     

       59
       60
        
       

     

       60
       60
       -
       	r, err := repo.OpenRepo(context.TODO(), bs, cs.Header.Roots[0])

     

       61
       61
       +
       	r, err := repo.OpenRepo(ctx, bs, cs.Header.Roots[0])

     

       61
       62
        
       	if err != nil {

     

       62
       63
        
       		s.logger.Error("could not open repo", "error", err)

     

       63
       64
        
       		return helpers.ServerError(e, nil)

     
···

       67
       68
        
       

     

       68
       69
        
       	clock := syntax.NewTIDClock(0)

     

       69
       70
        
       

     

       70
       70
       -
       	if err := r.ForEach(context.TODO(), "", func(key string, cid cid.Cid) error {

     

       71
       71
       +
       	if err := r.ForEach(ctx, "", func(key string, cid cid.Cid) error {

     

       71
       72
        
       		pts := strings.Split(key, "/")

     

       72
       73
        
       		nsid := pts[0]

     

       73
       74
        
       		rkey := pts[1]

     

       74
       75
        
       		cidStr := cid.String()

     

       75
       75
       -
       		b, err := bs.Get(context.TODO(), cid)

     

       76
       76
       +
       		b, err := bs.Get(ctx, cid)

     

       76
       77
        
       		if err != nil {

     

       77
       78
        
       			s.logger.Error("record bytes don't exist in blockstore", "error", err)

     

       78
       79
        
       			return helpers.ServerError(e, nil)

     
···

       87
       88
        
       			Value:     b.RawData(),

     

       88
       89
        
       		}

     

       89
       90
        
       

     

       90
       90
       -
       		if err := tx.Create(rec).Error; err != nil {

     

       91
       91
       +
       		if err := tx.Save(rec).Error; err != nil {

     

       91
       92
        
       			return err

     

       92
       93
        
       		}

     

       93
       94
        
       

     
···

       100
       101
        
       

     

       101
       102
        
       	tx.Commit()

     

       102
       103
        
       

     

       103
       103
       -
       	root, rev, err := r.Commit(context.TODO(), urepo.SignFor)

     

       104
       104
       +
       	root, rev, err := r.Commit(ctx, urepo.SignFor)

     

       104
       105
        
       	if err != nil {

     

       105
       106
        
       		s.logger.Error("error committing", "error", err)

     

       106
       107
        
       		return helpers.ServerError(e, nil)

     

       107
       108
        
       	}

     

       108
       109
        
       

     

       109
       109
       -
       	if err := s.UpdateRepo(context.TODO(), urepo.Repo.Did, root, rev); err != nil {

     

       110
       110
       +
       	if err := s.UpdateRepo(ctx, urepo.Repo.Did, root, rev); err != nil {

     

       110
       111
        
       		s.logger.Error("error updating repo after commit", "error", err)

     

       111
       112
        
       		return helpers.ServerError(e, nil)

     

       112
       113
        
       	}

+15 -2

server/handle_proxy.go

···

       96
       96
        
       

     

       97
       97
        
       		encheader := strings.TrimRight(base64.RawURLEncoding.EncodeToString(hj), "=")

     

       98
       98
        
       

     

       99
       99
       +
       		// When proxying app.bsky.feed.getFeed the token is actually issued for the

     

       100
       100
       +
       		// underlying feed generator and the app view passes it on. This allows the

     

       101
       101
       +
       		// getFeed implementation to pass in the desired lxm and aud for the token

     

       102
       102
       +
       		// and then just delegate to the general proxying logic

     

       103
       103
       +
       		lxm, proxyTokenLxmExists := e.Get("proxyTokenLxm").(string)

     

       104
       104
       +
       		if !proxyTokenLxmExists || lxm == "" {

     

       105
       105
       +
       			lxm = pts[2]

     

       106
       106
       +
       		}

     

       107
       107
       +
       		aud, proxyTokenAudExists := e.Get("proxyTokenAud").(string)

     

       108
       108
       +
       		if !proxyTokenAudExists || aud == "" {

     

       109
       109
       +
       			aud = svcDid

     

       110
       110
       +
       		}

     

       111
       111
       +
       

     

       99
       112
        
       		payload := map[string]any{

     

       100
       113
        
       			"iss": repo.Repo.Did,

     

       101
       101
       -
       			"aud": svcDid,

     

       102
       102
       -
       			"lxm": pts[2],

     

       114
       114
       +
       			"aud": aud,

     

       115
       115
       +
       			"lxm": lxm,

     

       103
       116
        
       			"jti": uuid.NewString(),

     

       104
       117
        
       			"exp": time.Now().Add(1 * time.Minute).UTC().Unix(),

     

       105
       118
        
       		}

+35

server/handle_proxy_get_feed.go

···

       1
       1
       +
       package server

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"github.com/Azure/go-autorest/autorest/to"

     

       5
       5
       +
       	"github.com/bluesky-social/indigo/api/atproto"

     

       6
       6
       +
       	"github.com/bluesky-social/indigo/api/bsky"

     

       7
       7
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/xrpc"

     

       9
       9
       +
       	"github.com/haileyok/cocoon/internal/helpers"

     

       10
       10
       +
       	"github.com/labstack/echo/v4"

     

       11
       11
       +
       )

     

       12
       12
       +
       

     

       13
       13
       +
       func (s *Server) handleProxyBskyFeedGetFeed(e echo.Context) error {

     

       14
       14
       +
       	feedUri, err := syntax.ParseATURI(e.QueryParam("feed"))

     

       15
       15
       +
       	if err != nil {

     

       16
       16
       +
       		return helpers.InputError(e, to.StringPtr("invalid feed uri"))

     

       17
       17
       +
       	}

     

       18
       18
       +
       

     

       19
       19
       +
       	appViewEndpoint, _, err := s.getAtprotoProxyEndpointFromRequest(e)

     

       20
       20
       +
       	if err != nil {

     

       21
       21
       +
       		e.Logger().Error("could not get atproto proxy", "error", err)

     

       22
       22
       +
       		return helpers.ServerError(e, nil)

     

       23
       23
       +
       	}

     

       24
       24
       +
       

     

       25
       25
       +
       	appViewClient := xrpc.Client{

     

       26
       26
       +
       		Host: appViewEndpoint,

     

       27
       27
       +
       	}

     

       28
       28
       +
       	feedRecord, err := atproto.RepoGetRecord(e.Request().Context(), &appViewClient, "", feedUri.Collection().String(), feedUri.Authority().String(), feedUri.RecordKey().String())

     

       29
       29
       +
       	feedGeneratorDid := feedRecord.Value.Val.(*bsky.FeedGenerator).Did

     

       30
       30
       +
       

     

       31
       31
       +
       	e.Set("proxyTokenLxm", "app.bsky.feed.getFeedSkeleton")

     

       32
       32
       +
       	e.Set("proxyTokenAud", feedGeneratorDid)

     

       33
       33
       +
       

     

       34
       34
       +
       	return s.handleProxy(e)

     

       35
       35
       +
       }

+3 -1

server/handle_repo_apply_writes.go

···

       26
       26
        
       }

     

       27
       27
        
       

     

       28
       28
        
       func (s *Server) handleApplyWrites(e echo.Context) error {

     

       29
       29
       +
       	ctx := e.Request().Context()

     

       30
       30
       +
       

     

       29
       31
        
       	repo := e.Get("repo").(*models.RepoActor)

     

       30
       32
        
       

     

       31
       33
        
       	var req ComAtprotoRepoApplyWritesRequest

     
···

       54
       56
        
       		})

     

       55
       57
        
       	}

     

       56
       58
        
       

     

       57
       57
       -
       	results, err := s.repoman.applyWrites(repo.Repo, ops, req.SwapCommit)

     

       59
       59
       +
       	results, err := s.repoman.applyWrites(ctx, repo.Repo, ops, req.SwapCommit)

     

       58
       60
        
       	if err != nil {

     

       59
       61
        
       		s.logger.Error("error applying writes", "error", err)

     

       60
       62
        
       		return helpers.ServerError(e, nil)

+3 -1

server/handle_repo_create_record.go

···

       17
       17
        
       }

     

       18
       18
        
       

     

       19
       19
        
       func (s *Server) handleCreateRecord(e echo.Context) error {

     

       20
       20
       +
       	ctx := e.Request().Context()

     

       21
       21
       +
       

     

       20
       22
        
       	repo := e.Get("repo").(*models.RepoActor)

     

       21
       23
        
       

     

       22
       24
        
       	var req ComAtprotoRepoCreateRecordRequest

     
···

       40
       42
        
       		optype = OpTypeUpdate

     

       41
       43
        
       	}

     

       42
       44
        
       

     

       43
       43
       -
       	results, err := s.repoman.applyWrites(repo.Repo, []Op{

     

       45
       45
       +
       	results, err := s.repoman.applyWrites(ctx, repo.Repo, []Op{

     

       44
       46
        
       		{

     

       45
       47
        
       			Type:       optype,

     

       46
       48
        
       			Collection: req.Collection,

+3 -1

server/handle_repo_delete_record.go

···

       15
       15
        
       }

     

       16
       16
        
       

     

       17
       17
        
       func (s *Server) handleDeleteRecord(e echo.Context) error {

     

       18
       18
       +
       	ctx := e.Request().Context()

     

       19
       19
       +
       

     

       18
       20
        
       	repo := e.Get("repo").(*models.RepoActor)

     

       19
       21
        
       

     

       20
       22
        
       	var req ComAtprotoRepoDeleteRecordRequest

     
···

       33
       35
        
       		return helpers.InputError(e, nil)

     

       34
       36
        
       	}

     

       35
       37
        
       

     

       36
       36
       -
       	results, err := s.repoman.applyWrites(repo.Repo, []Op{

     

       38
       38
       +
       	results, err := s.repoman.applyWrites(ctx, repo.Repo, []Op{

     

       37
       39
        
       		{

     

       38
       40
        
       			Type:       OpTypeDelete,

     

       39
       41
        
       			Collection: req.Collection,

+3 -1

server/handle_repo_put_record.go

···

       17
       17
        
       }

     

       18
       18
        
       

     

       19
       19
        
       func (s *Server) handlePutRecord(e echo.Context) error {

     

       20
       20
       +
       	ctx := e.Request().Context()

     

       21
       21
       +
       

     

       20
       22
        
       	repo := e.Get("repo").(*models.RepoActor)

     

       21
       23
        
       

     

       22
       24
        
       	var req ComAtprotoRepoPutRecordRequest

     
···

       40
       42
        
       		optype = OpTypeUpdate

     

       41
       43
        
       	}

     

       42
       44
        
       

     

       43
       43
       -
       	results, err := s.repoman.applyWrites(repo.Repo, []Op{

     

       45
       45
       +
       	results, err := s.repoman.applyWrites(ctx, repo.Repo, []Op{

     

       44
       46
        
       		{

     

       45
       47
        
       			Type:       optype,

     

       46
       48
        
       			Collection: req.Collection,

+46 -15

server/handle_server_check_account_status.go

···

       1
       1
        
       package server

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"errors"

     

       5
       5
       +
       	"sync"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       4
       8
        
       	"github.com/haileyok/cocoon/internal/helpers"

     

       5
       9
        
       	"github.com/haileyok/cocoon/models"

     

       6
       10
        
       	"github.com/ipfs/go-cid"

     
···

       22
       26
        
       func (s *Server) handleServerCheckAccountStatus(e echo.Context) error {

     

       23
       27
        
       	urepo := e.Get("repo").(*models.RepoActor)

     

       24
       28
        
       

     

       29
       29
       +
       	_, didErr := syntax.ParseDID(urepo.Repo.Did)

     

       30
       30
       +
       	if didErr != nil {

     

       31
       31
       +
       		s.logger.Error("error validating did", "err", didErr)

     

       32
       32
       +
       	}

     

       33
       33
       +
       

     

       25
       34
        
       	resp := ComAtprotoServerCheckAccountStatusResponse{

     

       26
       35
        
       		Activated:     true, // TODO: should allow for deactivation etc.

     

       27
       27
       -
       		ValidDid:      true, // TODO: should probably verify?

     

       36
       36
       +
       		ValidDid:      didErr == nil,

     

       28
       37
        
       		RepoRev:       urepo.Rev,

     

       29
       38
        
       		ImportedBlobs: 0, // TODO: ???

     

       30
       39
        
       	}

     
···

       34
       43
        
       		s.logger.Error("error casting cid", "error", err)

     

       35
       44
        
       		return helpers.ServerError(e, nil)

     

       36
       45
        
       	}

     

       46
       46
       +
       

     

       37
       47
        
       	resp.RepoCommit = rootcid.String()

     

       38
       48
        
       

     

       39
       49
        
       	type CountResp struct {

     
···

       41
       51
        
       	}

     

       42
       52
        
       

     

       43
       53
        
       	var blockCtResp CountResp

     

       44
       44
       -
       	if err := s.db.Raw("SELECT COUNT(*) AS ct FROM blocks WHERE did = ?", nil, urepo.Repo.Did).Scan(&blockCtResp).Error; err != nil {

     

       45
       45
       -
       		s.logger.Error("error getting block count", "error", err)

     

       46
       46
       -
       		return helpers.ServerError(e, nil)

     

       47
       47
       -
       	}

     

       48
       48
       -
       	resp.RepoBlocks = blockCtResp.Ct

     

       54
       54
       +
       	var recCtResp CountResp

     

       55
       55
       +
       	var blobCtResp CountResp

     

       56
       56
       +
       

     

       57
       57
       +
       	var wg sync.WaitGroup

     

       58
       58
       +
       	var procErr error

     

       59
       59
       +
       

     

       60
       60
       +
       	wg.Add(1)

     

       61
       61
       +
       	go func() {

     

       62
       62
       +
       		defer wg.Done()

     

       63
       63
       +
       		if err := s.db.Raw("SELECT COUNT(*) AS ct FROM blocks WHERE did = ?", nil, urepo.Repo.Did).Scan(&blockCtResp).Error; err != nil {

     

       64
       64
       +
       			s.logger.Error("error getting block count", "error", err)

     

       65
       65
       +
       			procErr = errors.Join(procErr, err)

     

       66
       66
       +
       		}

     

       67
       67
       +
       	}()

     

       68
       68
       +
       

     

       69
       69
       +
       	wg.Add(1)

     

       70
       70
       +
       	go func() {

     

       71
       71
       +
       		defer wg.Done()

     

       72
       72
       +
       		if err := s.db.Raw("SELECT COUNT(*) AS ct FROM records WHERE did = ?", nil, urepo.Repo.Did).Scan(&recCtResp).Error; err != nil {

     

       73
       73
       +
       			s.logger.Error("error getting record count", "error", err)

     

       74
       74
       +
       			procErr = errors.Join(procErr, err)

     

       75
       75
       +
       		}

     

       76
       76
       +
       	}()

     

       49
       77
        
       

     

       50
       50
       -
       	var recCtResp CountResp

     

       51
       51
       -
       	if err := s.db.Raw("SELECT COUNT(*) AS ct FROM records WHERE did = ?", nil, urepo.Repo.Did).Scan(&recCtResp).Error; err != nil {

     

       52
       52
       -
       		s.logger.Error("error getting record count", "error", err)

     

       53
       53
       -
       		return helpers.ServerError(e, nil)

     

       54
       54
       -
       	}

     

       55
       55
       -
       	resp.IndexedRecords = recCtResp.Ct

     

       78
       78
       +
       	wg.Add(1)

     

       79
       79
       +
       	go func() {

     

       80
       80
       +
       		if err := s.db.Raw("SELECT COUNT(*) AS ct FROM blobs WHERE did = ?", nil, urepo.Repo.Did).Scan(&blobCtResp).Error; err != nil {

     

       81
       81
       +
       			s.logger.Error("error getting expected blobs count", "error", err)

     

       82
       82
       +
       			procErr = errors.Join(procErr, err)

     

       83
       83
       +
       		}

     

       84
       84
       +
       	}()

     

       56
       85
        
       

     

       57
       57
       -
       	var blobCtResp CountResp

     

       58
       58
       -
       	if err := s.db.Raw("SELECT COUNT(*) AS ct FROM blobs WHERE did = ?", nil, urepo.Repo.Did).Scan(&blobCtResp).Error; err != nil {

     

       59
       59
       -
       		s.logger.Error("error getting record count", "error", err)

     

       86
       86
       +
       	wg.Wait()

     

       87
       87
       +
       	if procErr != nil {

     

       60
       88
        
       		return helpers.ServerError(e, nil)

     

       61
       89
        
       	}

     

       90
       90
       +
       

     

       91
       91
       +
       	resp.RepoBlocks = blockCtResp.Ct

     

       92
       92
       +
       	resp.IndexedRecords = recCtResp.Ct

     

       62
       93
        
       	resp.ExpectedBlobs = blobCtResp.Ct

     

       63
       94
        
       

     

       64
       95
        
       	return e.JSON(200, resp)

+3 -1

server/handle_sync_get_record.go

···

       13
       13
        
       )

     

       14
       14
        
       

     

       15
       15
        
       func (s *Server) handleSyncGetRecord(e echo.Context) error {

     

       16
       16
       +
       	ctx := e.Request().Context()

     

       17
       17
       +
       

     

       16
       18
        
       	did := e.QueryParam("did")

     

       17
       19
        
       	collection := e.QueryParam("collection")

     

       18
       20
        
       	rkey := e.QueryParam("rkey")

     
···

       23
       25
        
       		return helpers.ServerError(e, nil)

     

       24
       26
        
       	}

     

       25
       27
        
       

     

       26
       26
       -
       	root, blocks, err := s.repoman.getRecordProof(urepo, collection, rkey)

     

       28
       28
       +
       	root, blocks, err := s.repoman.getRecordProof(ctx, urepo, collection, rkey)

     

       27
       29
        
       	if err != nil {

     

       28
       30
        
       		return err

     

       29
       31
        
       	}

+19

server/mail.go

···

       40
       40
        
       	return nil

     

       41
       41
        
       }

     

       42
       42
        
       

     

       43
       43
       +
       func (s *Server) sendPlcTokenReset(email, handle, code string) error {

     

       44
       44
       +
       	if s.mail == nil {

     

       45
       45
       +
       		return nil

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       48
       48
       +
       	s.mailLk.Lock()

     

       49
       49
       +
       	defer s.mailLk.Unlock()

     

       50
       50
       +
       

     

       51
       51
       +
       	s.mail.To(email)

     

       52
       52
       +
       	s.mail.Subject("PLC token for " + s.config.Hostname)

     

       53
       53
       +
       	s.mail.Plain().Set(fmt.Sprintf("Hello %s. Your PLC operation code is %s. This code will expire in ten minutes.", handle, code))

     

       54
       54
       +
       

     

       55
       55
       +
       	if err := s.mail.Send(); err != nil {

     

       56
       56
       +
       		return err

     

       57
       57
       +
       	}

     

       58
       58
       +
       

     

       59
       59
       +
       	return nil

     

       60
       60
       +
       }

     

       61
       61
       +
       

     

       43
       62
        
       func (s *Server) sendEmailUpdate(email, handle, code string) error {

     

       44
       63
        
       	if s.mail == nil {

     

       45
       64
        
       		return nil

+19 -16

server/repo.go

···

       96
       96
        
       }

     

       97
       97
        
       

     

       98
       98
        
       // TODO make use of swap commit

     

       99
       99
       -
       func (rm *RepoMan) applyWrites(urepo models.Repo, writes []Op, swapCommit *string) ([]ApplyWriteResult, error) {

     

       99
       99
       +
       func (rm *RepoMan) applyWrites(ctx context.Context, urepo models.Repo, writes []Op, swapCommit *string) ([]ApplyWriteResult, error) {

     

       100
       100
        
       	rootcid, err := cid.Cast(urepo.Root)

     

       101
       101
        
       	if err != nil {

     

       102
       102
        
       		return nil, err

     
···

       104
       104
        
       

     

       105
       105
        
       	dbs := rm.s.getBlockstore(urepo.Did)

     

       106
       106
        
       	bs := recording_blockstore.New(dbs)

     

       107
       107
       -
       	r, err := repo.OpenRepo(context.TODO(), bs, rootcid)

     

       107
       107
       +
       	r, err := repo.OpenRepo(ctx, bs, rootcid)

     

       108
       108
        
       

     

       109
       109
       -
       	entries := []models.Record{}

     

       110
       110
       -
       	var results []ApplyWriteResult

     

       109
       109
       +
       	entries := make([]models.Record, 0, len(writes))

     

       110
       110
       +
       	results := make([]ApplyWriteResult, 0, len(writes))

     

       111
       111
        
       

     

       112
       112
        
       	for i, op := range writes {

     

       113
       113
        
       		if op.Type != OpTypeCreate && op.Rkey == nil {

     

       114
       114
        
       			return nil, fmt.Errorf("invalid rkey")

     

       115
       115
        
       		} else if op.Type == OpTypeCreate && op.Rkey != nil {

     

       116
       116
       -
       			_, _, err := r.GetRecord(context.TODO(), op.Collection+"/"+*op.Rkey)

     

       116
       116
       +
       			_, _, err := r.GetRecord(ctx, op.Collection+"/"+*op.Rkey)

     

       117
       117
        
       			if err == nil {

     

       118
       118
        
       				op.Type = OpTypeUpdate

     

       119
       119
        
       			}

     
···

       144
       144
        
       				mm["$type"] = op.Collection

     

       145
       145
        
       			}

     

       146
       146
        
       

     

       147
       147
       -
       			nc, err := r.PutRecord(context.TODO(), op.Collection+"/"+*op.Rkey, &mm)

     

       147
       147
       +
       			nc, err := r.PutRecord(ctx, op.Collection+"/"+*op.Rkey, &mm)

     

       148
       148
        
       			if err != nil {

     

       149
       149
        
       				return nil, err

     

       150
       150
        
       			}

     
···

       177
       177
        
       				Rkey:  *op.Rkey,

     

       178
       178
        
       				Value: old.Value,

     

       179
       179
        
       			})

     

       180
       180
       -
       			err := r.DeleteRecord(context.TODO(), op.Collection+"/"+*op.Rkey)

     

       180
       180
       +
       			err := r.DeleteRecord(ctx, op.Collection+"/"+*op.Rkey)

     

       181
       181
        
       			if err != nil {

     

       182
       182
        
       				return nil, err

     

       183
       183
        
       			}

     
···

       194
       194
        
       				return nil, err

     

       195
       195
        
       			}

     

       196
       196
        
       			mm := MarshalableMap(out)

     

       197
       197
       -
       			nc, err := r.UpdateRecord(context.TODO(), op.Collection+"/"+*op.Rkey, &mm)

     

       197
       197
       +
       			nc, err := r.UpdateRecord(ctx, op.Collection+"/"+*op.Rkey, &mm)

     

       198
       198
        
       			if err != nil {

     

       199
       199
        
       				return nil, err

     

       200
       200
        
       			}

     
···

       219
       219
        
       		}

     

       220
       220
        
       	}

     

       221
       221
        
       

     

       222
       222
       -
       	newroot, rev, err := r.Commit(context.TODO(), urepo.SignFor)

     

       222
       222
       +
       	newroot, rev, err := r.Commit(ctx, urepo.SignFor)

     

       223
       223
        
       	if err != nil {

     

       224
       224
        
       		return nil, err

     

       225
       225
        
       	}

     
···

       230
       230
        
       		Roots:   []cid.Cid{newroot},

     

       231
       231
        
       		Version: 1,

     

       232
       232
        
       	})

     

       233
       233
       +
       	if err != nil {

     

       234
       234
       +
       		return nil, err

     

       235
       235
       +
       	}

     

       233
       236
        
       

     

       234
       237
        
       	if _, err := carstore.LdWrite(buf, hb); err != nil {

     

       235
       238
        
       		return nil, err

     

       236
       239
        
       	}

     

       237
       240
        
       

     

       238
       238
       -
       	diffops, err := r.DiffSince(context.TODO(), rootcid)

     

       241
       241
       +
       	diffops, err := r.DiffSince(ctx, rootcid)

     

       239
       242
        
       	if err != nil {

     

       240
       243
        
       		return nil, err

     

       241
       244
        
       	}

     
···

       270
       273
        
       			})

     

       271
       274
        
       		}

     

       272
       275
        
       

     

       273
       273
       -
       		blk, err := dbs.Get(context.TODO(), c)

     

       276
       276
       +
       		blk, err := dbs.Get(ctx, c)

     

       274
       277
        
       		if err != nil {

     

       275
       278
        
       			return nil, err

     

       276
       279
        
       		}

     
···

       316
       319
        
       		}

     

       317
       320
        
       	}

     

       318
       321
        
       

     

       319
       319
       -
       	rm.s.evtman.AddEvent(context.TODO(), &events.XRPCStreamEvent{

     

       322
       322
       +
       	rm.s.evtman.AddEvent(ctx, &events.XRPCStreamEvent{

     

       320
       323
        
       		RepoCommit: &atproto.SyncSubscribeRepos_Commit{

     

       321
       324
        
       			Repo:   urepo.Did,

     

       322
       325
        
       			Blocks: buf.Bytes(),

     
···

       330
       333
        
       		},

     

       331
       334
        
       	})

     

       332
       335
        
       

     

       333
       333
       -
       	if err := rm.s.UpdateRepo(context.TODO(), urepo.Did, newroot, rev); err != nil {

     

       336
       336
       +
       	if err := rm.s.UpdateRepo(ctx, urepo.Did, newroot, rev); err != nil {

     

       334
       337
        
       		return nil, err

     

       335
       338
        
       	}

     

       336
       339
        
       

     
···

       345
       348
        
       	return results, nil

     

       346
       349
        
       }

     

       347
       350
        
       

     

       348
       348
       -
       func (rm *RepoMan) getRecordProof(urepo models.Repo, collection, rkey string) (cid.Cid, []blocks.Block, error) {

     

       351
       351
       +
       func (rm *RepoMan) getRecordProof(ctx context.Context, urepo models.Repo, collection, rkey string) (cid.Cid, []blocks.Block, error) {

     

       349
       352
        
       	c, err := cid.Cast(urepo.Root)

     

       350
       353
        
       	if err != nil {

     

       351
       354
        
       		return cid.Undef, nil, err

     
···

       354
       357
        
       	dbs := rm.s.getBlockstore(urepo.Did)

     

       355
       358
        
       	bs := recording_blockstore.New(dbs)

     

       356
       359
        
       

     

       357
       357
       -
       	r, err := repo.OpenRepo(context.TODO(), bs, c)

     

       360
       360
       +
       	r, err := repo.OpenRepo(ctx, bs, c)

     

       358
       361
        
       	if err != nil {

     

       359
       362
        
       		return cid.Undef, nil, err

     

       360
       363
        
       	}

     

       361
       364
        
       

     

       362
       362
       -
       	_, _, err = r.GetRecordBytes(context.TODO(), collection+"/"+rkey)

     

       365
       365
       +
       	_, _, err = r.GetRecordBytes(ctx, collection+"/"+rkey)

     

       363
       366
        
       	if err != nil {

     

       364
       367
        
       		return cid.Undef, nil, err

     

       365
       368
        
       	}

server/server.go

···

       459
       459
        
       	s.echo.GET("/xrpc/com.atproto.server.getSession", s.handleGetSession, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       460
       460
        
       	s.echo.POST("/xrpc/com.atproto.server.refreshSession", s.handleRefreshSession, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       461
       461
        
       	s.echo.POST("/xrpc/com.atproto.server.deleteSession", s.handleDeleteSession, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       462
       462
       +
       	s.echo.GET("/xrpc/com.atproto.identity.getRecommendedDidCredentials", s.handleGetRecommendedDidCredentials, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       462
       463
        
       	s.echo.POST("/xrpc/com.atproto.identity.updateHandle", s.handleIdentityUpdateHandle, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       464
       464
       +
       	s.echo.POST("/xrpc/com.atproto.identity.requestPlcOperationSignature", s.handleIdentityRequestPlcOperationSignature, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       465
       465
       +
       	s.echo.POST("/xrpc/com.atproto.identity.signPlcOperation", s.handleSignPlcOperation, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       466
       466
       +
       	s.echo.POST("/xrpc/com.atproto.identity.submitPlcOperation", s.handleSubmitPlcOperation, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       463
       467
        
       	s.echo.POST("/xrpc/com.atproto.server.confirmEmail", s.handleServerConfirmEmail, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       464
       468
        
       	s.echo.POST("/xrpc/com.atproto.server.requestEmailConfirmation", s.handleServerRequestEmailConfirmation, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       465
       469
        
       	s.echo.POST("/xrpc/com.atproto.server.requestPasswordReset", s.handleServerRequestPasswordReset) // AUTH NOT REQUIRED FOR THIS ONE

     
···

       482
       486
        
       	// stupid silly endpoints

     

       483
       487
        
       	s.echo.GET("/xrpc/app.bsky.actor.getPreferences", s.handleActorGetPreferences, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       484
       488
        
       	s.echo.POST("/xrpc/app.bsky.actor.putPreferences", s.handleActorPutPreferences, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       489
       489
       +
       	s.echo.GET("/xrpc/app.bsky.feed.getFeed", s.handleProxyBskyFeedGetFeed, s.handleLegacySessionMiddleware, s.handleOauthSessionMiddleware)

     

       485
       490
        
       

     

       486
       491
        
       	// admin routes

     

       487
       492
        
       	s.echo.POST("/xrpc/com.atproto.server.createInviteCode", s.handleCreateInviteCode, s.handleAdminMiddleware)

Compare changes