appview, knotserver: add didAssign event and PDS rewrite on login #1143

appview/db/repos.go

This file has not been changed.

-6

appview/oauth/handler.go

··· 337 337 return fmt.Errorf("unexpected type for issue record") 338 338 } 339 339 rec.RepoDid = &repoDid 340 340 - rec.Repo = nil 341 340 342 341 case tangled.RepoPullNSID: 343 342 rec, ok := val.(*tangled.RepoPull) ··· 346 345 } 347 346 if rec.Target != nil { 348 347 rec.Target.RepoDid = &repoDid 349 349 - rec.Target.Repo = nil 350 348 } 351 349 if rec.Source != nil && rec.Source.Repo != nil && *rec.Source.Repo == rw.OldRepoAt { 352 350 rec.Source.RepoDid = &repoDid 353 353 - rec.Source.Repo = nil 354 351 } 355 352 356 353 case tangled.RepoCollaboratorNSID: ··· 359 356 return fmt.Errorf("unexpected type for collaborator record") 360 357 } 361 358 rec.RepoDid = &repoDid 362 362 - rec.Repo = nil 363 359 364 360 case tangled.RepoArtifactNSID: 365 361 rec, ok := val.(*tangled.RepoArtifact) ··· 367 363 return fmt.Errorf("unexpected type for artifact record") 368 364 } 369 365 rec.RepoDid = &repoDid 370 370 - rec.Repo = nil 371 366 372 367 case tangled.FeedStarNSID: 373 368 rec, ok := val.(*tangled.FeedStar) ··· 375 370 return fmt.Errorf("unexpected type for star record") 376 371 } 377 372 rec.SubjectDid = &repoDid 378 378 - rec.Subject = nil 379 373 380 374 case tangled.ActorProfileNSID: 381 375 rec, ok := val.(*tangled.ActorProfile)

appview/state/knotstream.go

This patch was likely rebased, as context lines do not match.

knotserver/db/didassign.go

This file has not been changed.

+2 -4

knotserver/db/events.go

··· 5 5 "fmt" 6 6 "time" 7 7 8 8 - "github.com/bluesky-social/indigo/atproto/syntax" 9 8 "tangled.org/core/notifier" 9 9 + "tangled.org/core/tid" 10 10 ) 11 11 12 12 - var tidClock = syntax.NewTIDClock(0) 13 13 - 14 12 type Event struct { 15 13 Rkey string `json:"rkey"` 16 14 Nsid string `json:"nsid"` ··· 47 45 } 48 46 49 47 return d.InsertEvent(Event{ 50 50 - Rkey: tidClock.Next().String(), 48 48 + Rkey: tid.TID(), 51 49 Nsid: RepoDIDAssignNSID, 52 50 EventJson: string(eventJson), 53 51 }, n)

knotserver/events.go

This file has not been changed.

knotserver/git.go

This file has not been changed.

knotserver/internal.go

This file has not been changed.

+4 -28

knotserver/xrpc/xrpc.go

··· 4 4 "encoding/json" 5 5 "log/slog" 6 6 "net/http" 7 7 - "os" 8 8 - "path/filepath" 9 7 "strings" 10 8 11 11 - securejoin "github.com/cyphar/filepath-securejoin" 12 12 - "github.com/go-chi/chi/v5" 13 9 "tangled.org/core/api/tangled" 14 10 "tangled.org/core/idresolver" 15 11 "tangled.org/core/jetstream" ··· 19 15 "tangled.org/core/rbac" 20 16 xrpcerr "tangled.org/core/xrpc/errors" 21 17 "tangled.org/core/xrpc/serviceauth" 18 18 + 19 19 + "github.com/go-chi/chi/v5" 22 20 ) 23 21 24 22 type Xrpc struct { ··· 87 85 ) 88 86 } 89 87 88 88 + repoPath, _, _, err := x.Db.ResolveRepoDIDOnDisk(x.Config.Repo.ScanPath, repo) 89 89 + if err != nil { 90 90 - if !strings.Contains(repo, "/") { 91 91 - repoPath, _, _, err := x.Db.ResolveRepoDIDOnDisk(x.Config.Repo.ScanPath, repo) 92 92 - if err != nil { 93 93 - return "", xrpcerr.RepoNotFoundError 94 94 - } 95 95 - return repoPath, nil 96 96 - } 97 97 - 98 98 - parts := strings.SplitN(repo, "/", 2) 99 99 - ownerDid, repoName := parts[0], parts[1] 100 100 - 101 101 - repoDid, err := x.Db.GetRepoDid(ownerDid, repoName) 102 102 - if err == nil { 103 103 - repoPath, _, _, resolveErr := x.Db.ResolveRepoDIDOnDisk(x.Config.Repo.ScanPath, repoDid) 104 104 - if resolveErr == nil { 105 105 - return repoPath, nil 106 106 - } 107 107 - } 108 108 - 109 109 - repoPath, joinErr := securejoin.SecureJoin(x.Config.Repo.ScanPath, filepath.Join(ownerDid, repoName)) 110 110 - if joinErr != nil { 111 111 - return "", xrpcerr.RepoNotFoundError 112 112 - } 113 113 - if _, statErr := os.Stat(repoPath); statErr != nil { 114 90 return "", xrpcerr.RepoNotFoundError 115 91 } 116 92 return repoPath, nil

rbac/rbac.go

This file has not been changed.

rbac/rbac_test.go

This file has not been changed.