+79 -20

api/tangled/cbor_gen.go

··· 7934 7934 } 7935 7935 7936 7936 cw := cbg.NewCborWriter(w) 7937 7937 - fieldCount := 9 7937 7937 + fieldCount := 10 7938 7938 7939 7939 if t.Body == nil { 7940 7940 fieldCount-- 7941 7941 } 7942 7942 7943 7943 if t.Mentions == nil { 7944 7944 + fieldCount-- 7945 7945 + } 7946 7946 + 7947 7947 + if t.Patch == nil { 7944 7948 fieldCount-- 7945 7949 } 7946 7950 ··· 8008 8012 } 8009 8013 8010 8014 // t.Patch (string) (string) 8011 8011 - if len("patch") > 1000000 { 8012 8012 - return xerrors.Errorf("Value in field \"patch\" was too long") 8013 8013 - } 8015 8015 + if t.Patch != nil { 8014 8016 8015 8015 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("patch"))); err != nil { 8016 8016 - return err 8017 8017 - } 8018 8018 - if _, err := cw.WriteString(string("patch")); err != nil { 8019 8019 - return err 8020 8020 - } 8017 8017 + if len("patch") > 1000000 { 8018 8018 + return xerrors.Errorf("Value in field \"patch\" was too long") 8019 8019 + } 8021 8020 8022 8022 - if len(t.Patch) > 1000000 { 8023 8023 - return xerrors.Errorf("Value in field t.Patch was too long") 8024 8024 - } 8021 8021 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("patch"))); err != nil { 8022 8022 + return err 8023 8023 + } 8024 8024 + if _, err := cw.WriteString(string("patch")); err != nil { 8025 8025 + return err 8026 8026 + } 8027 8027 + 8028 8028 + if t.Patch == nil { 8029 8029 + if _, err := cw.Write(cbg.CborNull); err != nil { 8030 8030 + return err 8031 8031 + } 8032 8032 + } else { 8033 8033 + if len(*t.Patch) > 1000000 { 8034 8034 + return xerrors.Errorf("Value in field t.Patch was too long") 8035 8035 + } 8025 8036 8026 8026 - if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Patch))); err != nil { 8027 8027 - return err 8028 8028 - } 8029 8029 - if _, err := cw.WriteString(string(t.Patch)); err != nil { 8030 8030 - return err 8037 8037 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Patch))); err != nil { 8038 8038 + return err 8039 8039 + } 8040 8040 + if _, err := cw.WriteString(string(*t.Patch)); err != nil { 8041 8041 + return err 8042 8042 + } 8043 8043 + } 8031 8044 } 8032 8045 8033 8046 // t.Title (string) (string) ··· 8147 8160 return err 8148 8161 } 8149 8162 8163 8163 + // t.PatchBlob (util.LexBlob) (struct) 8164 8164 + if len("patchBlob") > 1000000 { 8165 8165 + return xerrors.Errorf("Value in field \"patchBlob\" was too long") 8166 8166 + } 8167 8167 + 8168 8168 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("patchBlob"))); err != nil { 8169 8169 + return err 8170 8170 + } 8171 8171 + if _, err := cw.WriteString(string("patchBlob")); err != nil { 8172 8172 + return err 8173 8173 + } 8174 8174 + 8175 8175 + if err := t.PatchBlob.MarshalCBOR(cw); err != nil { 8176 8176 + return err 8177 8177 + } 8178 8178 + 8150 8179 // t.References ([]string) (slice) 8151 8180 if t.References != nil { 8152 8181 ··· 8262 8291 case "patch": 8263 8292 8264 8293 { 8265 8265 - sval, err := cbg.ReadStringWithMax(cr, 1000000) 8294 8294 + b, err := cr.ReadByte() 8266 8295 if err != nil { 8267 8296 return err 8268 8297 } 8298 8298 + if b != cbg.CborNull[0] { 8299 8299 + if err := cr.UnreadByte(); err != nil { 8300 8300 + return err 8301 8301 + } 8269 8302 8270 8270 - t.Patch = string(sval) 8303 8303 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 8304 8304 + if err != nil { 8305 8305 + return err 8306 8306 + } 8307 8307 + 8308 8308 + t.Patch = (*string)(&sval) 8309 8309 + } 8271 8310 } 8272 8311 // t.Title (string) (string) 8273 8312 case "title": ··· 8370 8409 } 8371 8410 8372 8411 t.CreatedAt = string(sval) 8412 8412 + } 8413 8413 + // t.PatchBlob (util.LexBlob) (struct) 8414 8414 + case "patchBlob": 8415 8415 + 8416 8416 + { 8417 8417 + 8418 8418 + b, err := cr.ReadByte() 8419 8419 + if err != nil { 8420 8420 + return err 8421 8421 + } 8422 8422 + if b != cbg.CborNull[0] { 8423 8423 + if err := cr.UnreadByte(); err != nil { 8424 8424 + return err 8425 8425 + } 8426 8426 + t.PatchBlob = new(util.LexBlob) 8427 8427 + if err := t.PatchBlob.UnmarshalCBOR(cr); err != nil { 8428 8428 + return xerrors.Errorf("unmarshaling t.PatchBlob pointer: %w", err) 8429 8429 + } 8430 8430 + } 8431 8431 + 8373 8432 } 8374 8433 // t.References ([]string) (slice) 8375 8434 case "references":

-34

api/tangled/pipelinecancelPipeline.go

··· 1 1 - // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. 2 2 - 3 3 - package tangled 4 4 - 5 5 - // schema: sh.tangled.pipeline.cancelPipeline 6 6 - 7 7 - import ( 8 8 - "context" 9 9 - 10 10 - "github.com/bluesky-social/indigo/lex/util" 11 11 - ) 12 12 - 13 13 - const ( 14 14 - PipelineCancelPipelineNSID = "sh.tangled.pipeline.cancelPipeline" 15 15 - ) 16 16 - 17 17 - // PipelineCancelPipeline_Input is the input argument to a sh.tangled.pipeline.cancelPipeline call. 18 18 - type PipelineCancelPipeline_Input struct { 19 19 - // pipeline: pipeline at-uri 20 20 - Pipeline string `json:"pipeline" cborgen:"pipeline"` 21 21 - // repo: repo at-uri, spindle can't resolve repo from pipeline at-uri yet 22 22 - Repo string `json:"repo" cborgen:"repo"` 23 23 - // workflow: workflow name 24 24 - Workflow string `json:"workflow" cborgen:"workflow"` 25 25 - } 26 26 - 27 27 - // PipelineCancelPipeline calls the XRPC method "sh.tangled.pipeline.cancelPipeline". 28 28 - func PipelineCancelPipeline(ctx context.Context, c util.LexClient, input *PipelineCancelPipeline_Input) error { 29 29 - if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.pipeline.cancelPipeline", nil, input, nil); err != nil { 30 30 - return err 31 31 - } 32 32 - 33 33 - return nil 34 34 - }

+12 -9

api/tangled/repopull.go

··· 17 17 } // 18 18 // RECORDTYPE: RepoPull 19 19 type RepoPull struct { 20 20 - LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull" cborgen:"$type,const=sh.tangled.repo.pull"` 21 21 - Body *string `json:"body,omitempty" cborgen:"body,omitempty"` 22 22 - CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 - Mentions []string `json:"mentions,omitempty" cborgen:"mentions,omitempty"` 24 24 - Patch string `json:"patch" cborgen:"patch"` 25 25 - References []string `json:"references,omitempty" cborgen:"references,omitempty"` 26 26 - Source *RepoPull_Source `json:"source,omitempty" cborgen:"source,omitempty"` 27 27 - Target *RepoPull_Target `json:"target" cborgen:"target"` 28 28 - Title string `json:"title" cborgen:"title"` 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull" cborgen:"$type,const=sh.tangled.repo.pull"` 21 21 + Body *string `json:"body,omitempty" cborgen:"body,omitempty"` 22 22 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 + Mentions []string `json:"mentions,omitempty" cborgen:"mentions,omitempty"` 24 24 + // patch: (deprecated) use patchBlob instead 25 25 + Patch *string `json:"patch,omitempty" cborgen:"patch,omitempty"` 26 26 + // patchBlob: patch content 27 27 + PatchBlob *util.LexBlob `json:"patchBlob" cborgen:"patchBlob"` 28 28 + References []string `json:"references,omitempty" cborgen:"references,omitempty"` 29 29 + Source *RepoPull_Source `json:"source,omitempty" cborgen:"source,omitempty"` 30 30 + Target *RepoPull_Target `json:"target" cborgen:"target"` 31 31 + Title string `json:"title" cborgen:"title"` 29 32 } 30 33 31 34 // RepoPull_Source is a "source" in the sh.tangled.repo.pull schema.

+6 -6

appview/db/pipeline.go

··· 6 6 "strings" 7 7 "time" 8 8 9 9 - "github.com/bluesky-social/indigo/atproto/syntax" 10 9 "tangled.org/core/appview/models" 11 10 "tangled.org/core/orm" 12 11 ) ··· 217 216 } 218 217 defer rows.Close() 219 218 220 220 - pipelines := make(map[syntax.ATURI]models.Pipeline) 219 219 + pipelines := make(map[string]models.Pipeline) 221 220 for rows.Next() { 222 221 var p models.Pipeline 223 222 var t models.Trigger ··· 254 253 p.Trigger = &t 255 254 p.Statuses = make(map[string]models.WorkflowStatus) 256 255 257 257 - pipelines[p.AtUri()] = p 256 256 + k := fmt.Sprintf("%s/%s", p.Knot, p.Rkey) 257 257 + pipelines[k] = p 258 258 } 259 259 260 260 // get all statuses ··· 314 314 return nil, fmt.Errorf("invalid status created timestamp %q: %w", created, err) 315 315 } 316 316 317 317 - pipelineAt := ps.PipelineAt() 317 317 + key := fmt.Sprintf("%s/%s", ps.PipelineKnot, ps.PipelineRkey) 318 318 319 319 // extract 320 320 - pipeline, ok := pipelines[pipelineAt] 320 320 + pipeline, ok := pipelines[key] 321 321 if !ok { 322 322 continue 323 323 } ··· 331 331 332 332 // reassign 333 333 pipeline.Statuses[ps.Workflow] = statuses 334 334 - pipelines[pipelineAt] = pipeline 334 334 + pipelines[key] = pipeline 335 335 } 336 336 337 337 var all []models.Pipeline

+18 -11

appview/db/profile.go

··· 20 20 timeline := models.ProfileTimeline{ 21 21 ByMonth: make([]models.ByMonth, TimeframeMonths), 22 22 } 23 23 - currentMonth := time.Now().Month() 23 23 + now := time.Now() 24 24 timeframe := fmt.Sprintf("-%d months", TimeframeMonths) 25 25 26 26 pulls, err := GetPullsByOwnerDid(e, forDid, timeframe) ··· 30 30 31 31 // group pulls by month 32 32 for _, pull := range pulls { 33 33 - pullMonth := pull.Created.Month() 33 33 + monthsAgo := monthsBetween(pull.Created, now) 34 34 35 35 - if currentMonth-pullMonth >= TimeframeMonths { 35 35 + if monthsAgo >= TimeframeMonths { 36 36 // shouldn't happen; but times are weird 37 37 continue 38 38 } 39 39 40 40 - idx := currentMonth - pullMonth 40 40 + idx := monthsAgo 41 41 items := &timeline.ByMonth[idx].PullEvents.Items 42 42 43 43 *items = append(*items, &pull) ··· 53 53 } 54 54 55 55 for _, issue := range issues { 56 56 - issueMonth := issue.Created.Month() 56 56 + monthsAgo := monthsBetween(issue.Created, now) 57 57 58 58 - if currentMonth-issueMonth >= TimeframeMonths { 58 58 + if monthsAgo >= TimeframeMonths { 59 59 // shouldn't happen; but times are weird 60 60 continue 61 61 } 62 62 63 63 - idx := currentMonth - issueMonth 63 63 + idx := monthsAgo 64 64 items := &timeline.ByMonth[idx].IssueEvents.Items 65 65 66 66 *items = append(*items, &issue) ··· 77 77 if repo.Source != "" { 78 78 sourceRepo, err = GetRepoByAtUri(e, repo.Source) 79 79 if err != nil { 80 80 - return nil, err 80 80 + // the source repo was not found, skip this bit 81 81 + log.Println("profile", "err", err) 81 82 } 82 83 } 83 84 84 84 - repoMonth := repo.Created.Month() 85 85 + monthsAgo := monthsBetween(repo.Created, now) 85 86 86 86 - if currentMonth-repoMonth >= TimeframeMonths { 87 87 + if monthsAgo >= TimeframeMonths { 87 88 // shouldn't happen; but times are weird 88 89 continue 89 90 } 90 91 91 91 - idx := currentMonth - repoMonth 92 92 + idx := monthsAgo 92 93 93 94 items := &timeline.ByMonth[idx].RepoEvents 94 95 *items = append(*items, models.RepoEvent{ ··· 98 99 } 99 100 100 101 return &timeline, nil 102 102 + } 103 103 + 104 104 + func monthsBetween(from, to time.Time) int { 105 105 + years := to.Year() - from.Year() 106 106 + months := int(to.Month() - from.Month()) 107 107 + return years*12 + months 101 108 } 102 109 103 110 func UpsertProfile(tx *sql.Tx, profile *models.Profile) error {

+1 -1

appview/db/punchcard.go

··· 78 78 punch.Count = int(count.Int64) 79 79 } 80 80 81 81 - punchcard.Punches[punch.Date.YearDay()] = punch 81 81 + punchcard.Punches[punch.Date.YearDay()-1] = punch 82 82 punchcard.Total += punch.Count 83 83 } 84 84

+2 -2

appview/issues/opengraph.go

··· 193 193 dollyX := dollyBounds.Min.X + (dollyBounds.Dx() / 2) - (dollySize / 2) 194 194 dollyY := statsY + iconBaselineOffset - dollySize/2 + 25 195 195 dollyColor := color.RGBA{180, 180, 180, 255} // light gray 196 196 - err = dollyArea.DrawDollySilhouette(dollyX, dollyY, dollySize, dollyColor) 196 196 + err = dollyArea.DrawDolly(dollyX, dollyY, dollySize, dollyColor) 197 197 if err != nil { 198 198 - log.Printf("dolly silhouette not available (this is ok): %v", err) 198 198 + log.Printf("dolly not available (this is ok): %v", err) 199 199 } 200 200 201 201 // Draw "opened by @author" and date at the bottom with more spacing

-5

appview/knots/knots.go

··· 666 666 k.Pages.Notice(w, noticeId, "Failed to remove member, identity resolution failed.") 667 667 return 668 668 } 669 669 - if memberId.Handle.IsInvalidHandle() { 670 670 - l.Error("failed to resolve member identity to handle") 671 671 - k.Pages.Notice(w, noticeId, "Failed to remove member, identity resolution failed.") 672 672 - return 673 673 - } 674 669 675 670 // remove from enforcer 676 671 err = k.Enforcer.RemoveKnotMember(domain, memberId.DID.String())

+4

appview/middleware/middleware.go

··· 223 223 ) 224 224 if err != nil { 225 225 log.Println("failed to resolve repo", "err", err) 226 226 + w.WriteHeader(http.StatusNotFound) 226 227 mw.pages.ErrorKnot404(w) 227 228 return 228 229 } ··· 240 241 f, err := mw.repoResolver.Resolve(r) 241 242 if err != nil { 242 243 log.Println("failed to fully resolve repo", err) 244 244 + w.WriteHeader(http.StatusNotFound) 243 245 mw.pages.ErrorKnot404(w) 244 246 return 245 247 } ··· 288 290 f, err := mw.repoResolver.Resolve(r) 289 291 if err != nil { 290 292 log.Println("failed to fully resolve repo", err) 293 293 + w.WriteHeader(http.StatusNotFound) 291 294 mw.pages.ErrorKnot404(w) 292 295 return 293 296 } ··· 324 327 f, err := mw.repoResolver.Resolve(r) 325 328 if err != nil { 326 329 log.Println("failed to fully resolve repo", err) 330 330 + w.WriteHeader(http.StatusNotFound) 327 331 mw.pages.ErrorKnot404(w) 328 332 return 329 333 }

-10

appview/models/pipeline.go

··· 1 1 package models 2 2 3 3 import ( 4 4 - "fmt" 5 4 "slices" 6 5 "time" 7 6 8 7 "github.com/bluesky-social/indigo/atproto/syntax" 9 8 "github.com/go-git/go-git/v5/plumbing" 10 10 - "tangled.org/core/api/tangled" 11 9 spindle "tangled.org/core/spindle/models" 12 10 "tangled.org/core/workflow" 13 11 ) ··· 25 23 // populate when querying for reverse mappings 26 24 Trigger *Trigger 27 25 Statuses map[string]WorkflowStatus 28 28 - } 29 29 - 30 30 - func (p *Pipeline) AtUri() syntax.ATURI { 31 31 - return syntax.ATURI(fmt.Sprintf("at://did:web:%s/%s/%s", p.Knot, tangled.PipelineNSID, p.Rkey)) 32 26 } 33 27 34 28 type WorkflowStatus struct { ··· 134 128 Error *string 135 129 ExitCode int 136 130 } 137 137 - 138 138 - func (ps *PipelineStatus) PipelineAt() syntax.ATURI { 139 139 - return syntax.ATURI(fmt.Sprintf("at://did:web:%s/%s/%s", ps.PipelineKnot, tangled.PipelineNSID, ps.PipelineRkey)) 140 140 - }

+1 -1

appview/models/pull.go

··· 83 83 Repo *Repo 84 84 } 85 85 86 86 + // NOTE: This method does not include patch blob in returned atproto record 86 87 func (p Pull) AsRecord() tangled.RepoPull { 87 88 var source *tangled.RepoPull_Source 88 89 if p.PullSource != nil { ··· 113 114 Repo: p.RepoAt.String(), 114 115 Branch: p.TargetBranch, 115 116 }, 116 116 - Patch: p.LatestPatch(), 117 117 Source: source, 118 118 } 119 119 return record

+9 -9

appview/ogcard/card.go

··· 334 334 return nil 335 335 } 336 336 337 337 - func (c *Card) DrawDollySilhouette(x, y, size int, iconColor color.Color) error { 337 337 + func (c *Card) DrawDolly(x, y, size int, iconColor color.Color) error { 338 338 tpl, err := template.New("dolly"). 339 339 - ParseFS(pages.Files, "templates/fragments/dolly/silhouette.html") 339 339 + ParseFS(pages.Files, "templates/fragments/dolly/logo.html") 340 340 if err != nil { 341 341 - return fmt.Errorf("failed to read dolly silhouette template: %w", err) 341 341 + return fmt.Errorf("failed to read dolly template: %w", err) 342 342 } 343 343 344 344 var svgData bytes.Buffer 345 345 - if err = tpl.ExecuteTemplate(&svgData, "fragments/dolly/silhouette", nil); err != nil { 346 346 - return fmt.Errorf("failed to execute dolly silhouette template: %w", err) 345 345 + if err = tpl.ExecuteTemplate(&svgData, "fragments/dolly/logo", nil); err != nil { 346 346 + return fmt.Errorf("failed to execute dolly template: %w", err) 347 347 } 348 348 349 349 icon, err := BuildSVGIconFromData(svgData.Bytes(), iconColor) ··· 453 453 454 454 // Handle SVG separately 455 455 if contentType == "image/svg+xml" || strings.HasSuffix(url, ".svg") { 456 456 - return c.convertSVGToPNG(bodyBytes) 456 456 + return convertSVGToPNG(bodyBytes) 457 457 } 458 458 459 459 // Support content types are in-sync with the allowed custom avatar file types ··· 493 493 } 494 494 495 495 // convertSVGToPNG converts SVG data to a PNG image 496 496 - func (c *Card) convertSVGToPNG(svgData []byte) (image.Image, bool) { 496 496 + func convertSVGToPNG(svgData []byte) (image.Image, bool) { 497 497 // Parse the SVG 498 498 icon, err := oksvg.ReadIconStream(bytes.NewReader(svgData)) 499 499 if err != nil { ··· 547 547 draw.CatmullRom.Scale(scaledImg, scaledImg.Bounds(), img, srcBounds, draw.Src, nil) 548 548 549 549 // Draw the image with circular clipping 550 550 - for cy := 0; cy < size; cy++ { 551 551 - for cx := 0; cx < size; cx++ { 550 550 + for cy := range size { 551 551 + for cx := range size { 552 552 // Calculate distance from center 553 553 dx := float64(cx - center) 554 554 dy := float64(cy - center)

+12 -1

appview/pages/pages.go

··· 210 210 return tpl.ExecuteTemplate(w, "layouts/base", params) 211 211 } 212 212 213 213 + type DollyParams struct { 214 214 + Classes string 215 215 + FillColor string 216 216 + } 217 217 + 218 218 + func (p *Pages) Dolly(w io.Writer, params DollyParams) error { 219 219 + return p.executePlain("fragments/dolly/logo", w, params) 220 220 + } 221 221 + 213 222 func (p *Pages) Favicon(w io.Writer) error { 214 214 - return p.executePlain("fragments/dolly/silhouette", w, nil) 223 223 + return p.Dolly(w, DollyParams{ 224 224 + Classes: "text-black dark:text-white", 225 225 + }) 215 226 } 216 227 217 228 type LoginParams struct {

+9 -29

appview/pages/templates/brand/brand.html

··· 4 4 <div class="grid grid-cols-10"> 5 5 <header class="col-span-full md:col-span-10 px-6 py-2 mb-4"> 6 6 <h1 class="text-2xl font-bold dark:text-white mb-1">Brand</h1> 7 7 - <p class="text-gray-600 dark:text-gray-400 mb-1"> 7 7 + <p class="text-gray-500 dark:text-gray-300 mb-1"> 8 8 Assets and guidelines for using Tangled's logo and brand elements. 9 9 </p> 10 10 </header> ··· 14 14 15 15 <!-- Introduction Section --> 16 16 <section> 17 17 - <p class="text-gray-600 dark:text-gray-400 mb-2"> 17 17 + <p class="text-gray-500 dark:text-gray-300 mb-2"> 18 18 Tangled's logo and mascot is <strong>Dolly</strong>, the first ever <em>cloned</em> mammal. Please 19 19 follow the below guidelines when using Dolly and the logotype. 20 20 </p> 21 21 - <p class="text-gray-600 dark:text-gray-400 mb-2"> 21 21 + <p class="text-gray-500 dark:text-gray-300 mb-2"> 22 22 All assets are served as SVGs, and can be downloaded by right-clicking and clicking "Save image as". 23 23 </p> 24 24 </section> ··· 34 34 </div> 35 35 <div class="order-1 lg:order-2"> 36 36 <h2 class="text-xl font-semibold dark:text-white mb-3">Black logotype</h2> 37 37 - <p class="text-gray-600 dark:text-gray-400 mb-4">For use on light-colored backgrounds.</p> 37 37 + <p class="text-gray-500 dark:text-gray-300 mb-4">For use on light-colored backgrounds.</p> 38 38 <p class="text-gray-700 dark:text-gray-300"> 39 39 This is the preferred version of the logotype, featuring dark text and elements, ideal for light 40 40 backgrounds and designs. ··· 53 53 </div> 54 54 <div class="order-1 lg:order-2"> 55 55 <h2 class="text-xl font-semibold dark:text-white mb-3">White logotype</h2> 56 56 - <p class="text-gray-600 dark:text-gray-400 mb-4">For use on dark-colored backgrounds.</p> 56 56 + <p class="text-gray-500 dark:text-gray-300 mb-4">For use on dark-colored backgrounds.</p> 57 57 <p class="text-gray-700 dark:text-gray-300"> 58 58 This version features white text and elements, ideal for dark backgrounds 59 59 and inverted designs. ··· 81 81 </div> 82 82 <div class="order-1 lg:order-2"> 83 83 <h2 class="text-xl font-semibold dark:text-white mb-3">Mark only</h2> 84 84 - <p class="text-gray-600 dark:text-gray-400 mb-4"> 84 84 + <p class="text-gray-500 dark:text-gray-300 mb-4"> 85 85 When a smaller 1:1 logo or icon is needed, Dolly's face may be used on its own. 86 86 </p> 87 87 <p class="text-gray-700 dark:text-gray-300 mb-4"> ··· 123 123 </div> 124 124 <div class="order-1 lg:order-2"> 125 125 <h2 class="text-xl font-semibold dark:text-white mb-3">Colored backgrounds</h2> 126 126 - <p class="text-gray-600 dark:text-gray-400 mb-4"> 126 126 + <p class="text-gray-500 dark:text-gray-300 mb-4"> 127 127 White logo mark on colored backgrounds. 128 128 </p> 129 129 <p class="text-gray-700 dark:text-gray-300 mb-4"> ··· 165 165 </div> 166 166 <div class="order-1 lg:order-2"> 167 167 <h2 class="text-xl font-semibold dark:text-white mb-3">Lighter backgrounds</h2> 168 168 - <p class="text-gray-600 dark:text-gray-400 mb-4"> 168 168 + <p class="text-gray-500 dark:text-gray-300 mb-4"> 169 169 Dark logo mark on lighter, pastel backgrounds. 170 170 </p> 171 171 <p class="text-gray-700 dark:text-gray-300 mb-4"> ··· 186 186 </div> 187 187 <div class="order-1 lg:order-2"> 188 188 <h2 class="text-xl font-semibold dark:text-white mb-3">Recoloring</h2> 189 189 - <p class="text-gray-600 dark:text-gray-400 mb-4"> 189 189 + <p class="text-gray-500 dark:text-gray-300 mb-4"> 190 190 Custom coloring of the logotype is permitted. 191 191 </p> 192 192 <p class="text-gray-700 dark:text-gray-300 mb-4"> ··· 194 194 </p> 195 195 <p class="text-gray-700 dark:text-gray-300 text-sm"> 196 196 <strong>Example:</strong> Gray/sand colored logotype on a light yellow/tan background. 197 197 - </p> 198 198 - </div> 199 199 - </section> 200 200 - 201 201 - <!-- Silhouette Section --> 202 202 - <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center"> 203 203 - <div class="order-2 lg:order-1"> 204 204 - <div class="border border-gray-200 dark:border-gray-700 p-8 sm:p-16 bg-gray-50 dark:bg-gray-100 rounded"> 205 205 - <img src="https://assets.tangled.network/tangled_dolly_silhouette.svg" 206 206 - alt="Dolly silhouette" 207 207 - class="w-full max-w-32 mx-auto" /> 208 208 - </div> 209 209 - </div> 210 210 - <div class="order-1 lg:order-2"> 211 211 - <h2 class="text-xl font-semibold dark:text-white mb-3">Dolly silhouette</h2> 212 212 - <p class="text-gray-600 dark:text-gray-400 mb-4">A minimalist version of Dolly.</p> 213 213 - <p class="text-gray-700 dark:text-gray-300"> 214 214 - The silhouette can be used where a subtle brand presence is needed, 215 215 - or as a background element. Works on any background color with proper contrast. 216 216 - For example, we use this as the site's favicon. 217 197 </p> 218 198 </div> 219 199 </section>

+14 -2

appview/pages/templates/fragments/dolly/logo.html

··· 2 2 <svg 3 3 version="1.1" 4 4 id="svg1" 5 5 - class="{{ . }}" 5 5 + class="{{ .Classes }}" 6 6 width="25" 7 7 height="25" 8 8 viewBox="0 0 25 25" ··· 17 17 xmlns:svg="http://www.w3.org/2000/svg" 18 18 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 19 19 xmlns:cc="http://creativecommons.org/ns#"> 20 20 + <style> 21 21 + .dolly { 22 22 + color: #000000; 23 23 + } 24 24 + 25 25 + @media (prefers-color-scheme: dark) { 26 26 + .dolly { 27 27 + color: #ffffff; 28 28 + } 29 29 + } 30 30 + </style> 20 31 <sodipodi:namedview 21 32 id="namedview1" 22 33 pagecolor="#ffffff" ··· 51 62 id="g1" 52 63 transform="translate(-0.42924038,-0.87777209)"> 53 64 <path 54 54 - fill="currentColor" 65 65 + class="dolly" 66 66 + fill="{{ or .FillColor "currentColor" }}" 55 67 style="stroke-width:0.111183;" 56 68 d="m 16.775491,24.987061 c -0.78517,-0.0064 -1.384202,-0.234614 -2.033994,-0.631295 -0.931792,-0.490188 -1.643475,-1.31368 -2.152014,-2.221647 C 11.781409,23.136647 10.701392,23.744942 9.4922931,24.0886 8.9774725,24.238111 8.0757679,24.389777 6.5811304,23.84827 4.4270703,23.124679 2.8580086,20.883331 3.0363279,18.599583 3.0037061,17.652919 3.3488675,16.723769 3.8381157,15.925061 2.5329485,15.224503 1.4686756,14.048584 1.0611184,12.606459 0.81344502,11.816973 0.82385989,10.966486 0.91519098,10.154906 1.2422711,8.2387903 2.6795811,6.5725716 4.5299585,5.9732484 5.2685364,4.290122 6.8802592,3.0349975 8.706276,2.7794663 c 1.2124148,-0.1688264 2.46744,0.084987 3.52811,0.7011837 1.545426,-1.7139736 4.237779,-2.2205077 6.293579,-1.1676231 1.568222,0.7488935 2.689625,2.3113526 2.961888,4.0151464 1.492195,0.5977882 2.749007,1.8168898 3.242225,3.3644951 0.329805,0.9581836 0.340709,2.0135956 0.127128,2.9974286 -0.381606,1.535184 -1.465322,2.842146 -2.868035,3.556463 0.0034,0.273204 0.901506,2.243045 0.751284,3.729647 -0.03281,1.858525 -1.211631,3.619894 -2.846433,4.475452 -0.953967,0.556812 -2.084452,0.546309 -3.120531,0.535398 z m -4.470079,-5.349839 c 1.322246,-0.147248 2.189053,-1.300106 2.862307,-2.338363 0.318287,-0.472954 0.561404,-1.002348 0.803,-1.505815 0.313265,0.287151 0.578698,0.828085 1.074141,0.956909 0.521892,0.162542 1.133743,0.03052 1.45325,-0.443554 0.611414,-1.140449 0.31004,-2.516537 -0.04602,-3.698347 C 18.232844,11.92927 17.945151,11.232927 17.397785,10.751793 17.514522,9.9283111 17.026575,9.0919791 16.332883,8.6609491 15.741721,9.1323278 14.842258,9.1294949 14.271975,8.6252369 13.178927,9.7400102 12.177239,9.7029996 11.209704,8.8195135 10.992255,8.6209543 10.577326,10.031484 9.1211947,9.2324497 8.2846288,9.9333947 7.6359672,10.607693 7.0611981,11.578553 6.5026891,12.62523 5.9177873,13.554793 5.867393,14.69141 c -0.024234,0.66432 0.4948601,1.360337 1.1982269,1.306329 0.702996,0.06277 1.1815208,-0.629091 1.7138087,-0.916491 0.079382,0.927141 0.1688108,1.923227 0.4821259,2.828358 0.3596254,1.171275 1.6262605,1.915695 2.8251855,1.745211 0.08481,-0.0066 0.218672,-0.01769 0.218672,-0.0176 z m 0.686342,-3.497495 c -0.643126,-0.394168 -0.33365,-1.249599 -0.359402,-1.870938 0.064,-0.749774 0.115321,-1.538054 0.452402,-2.221125 0.356724,-0.487008 1.226721,-0.299139 1.265134,0.325689 -0.02558,0.628509 -0.314101,1.25416 -0.279646,1.9057 -0.07482,0.544043 0.05418,1.155133 -0.186476,1.652391 -0.197455,0.275121 -0.599638,0.355105 -0.892012,0.208283 z m -2.808766,-0.358124 c -0.605767,-0.328664 -0.4133176,-1.155655 -0.5083256,-1.73063 0.078762,-0.66567 0.013203,-1.510085 0.5705316,-1.976886 0.545037,-0.380109 1.286917,0.270803 1.029164,0.868384 -0.274913,0.755214 -0.09475,1.580345 -0.08893,2.34609 -0.104009,0.451702 -0.587146,0.691508 -1.002445,0.493042 z" 57 69 id="path4"

-95

appview/pages/templates/fragments/dolly/silhouette.html

··· 1 1 - {{ define "fragments/dolly/silhouette" }} 2 2 - <svg 3 3 - version="1.1" 4 4 - id="svg1" 5 5 - width="25" 6 6 - height="25" 7 7 - viewBox="0 0 25 25" 8 8 - sodipodi:docname="tangled_dolly_face_only_black_on_trans.svg" 9 9 - inkscape:export-filename="tangled_dolly_silhouette_black_on_trans.svg" 10 10 - inkscape:export-xdpi="96" 11 11 - inkscape:export-ydpi="96" 12 12 - inkscape:version="1.4 (e7c3feb100, 2024-10-09)" 13 13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 14 14 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 15 15 - xmlns="http://www.w3.org/2000/svg" 16 16 - xmlns:svg="http://www.w3.org/2000/svg" 17 17 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 18 18 - xmlns:cc="http://creativecommons.org/ns#"> 19 19 - <style> 20 20 - .dolly { 21 21 - color: #000000; 22 22 - } 23 23 - 24 24 - @media (prefers-color-scheme: dark) { 25 25 - .dolly { 26 26 - color: #ffffff; 27 27 - } 28 28 - } 29 29 - </style> 30 30 - <sodipodi:namedview 31 31 - id="namedview1" 32 32 - pagecolor="#ffffff" 33 33 - bordercolor="#000000" 34 34 - borderopacity="0.25" 35 35 - inkscape:showpageshadow="2" 36 36 - inkscape:pageopacity="0.0" 37 37 - inkscape:pagecheckerboard="true" 38 38 - inkscape:deskcolor="#d5d5d5" 39 39 - inkscape:zoom="64" 40 40 - inkscape:cx="4.96875" 41 41 - inkscape:cy="13.429688" 42 42 - inkscape:window-width="3840" 43 43 - inkscape:window-height="2160" 44 44 - inkscape:window-x="0" 45 45 - inkscape:window-y="0" 46 46 - inkscape:window-maximized="0" 47 47 - inkscape:current-layer="g1" 48 48 - borderlayer="true"> 49 49 - <inkscape:page 50 50 - x="0" 51 51 - y="0" 52 52 - width="25" 53 53 - height="25" 54 54 - id="page2" 55 55 - margin="0" 56 56 - bleed="0" /> 57 57 - </sodipodi:namedview> 58 58 - <g 59 59 - inkscape:groupmode="layer" 60 60 - inkscape:label="Image" 61 61 - id="g1" 62 62 - transform="translate(-0.42924038,-0.87777209)"> 63 63 - <path 64 64 - class="dolly" 65 65 - fill="currentColor" 66 66 - style="stroke-width:0.111183" 67 67 - d="m 16.775491,24.987061 c -0.78517,-0.0064 -1.384202,-0.234614 -2.033994,-0.631295 -0.931792,-0.490188 -1.643475,-1.31368 -2.152014,-2.221647 C 11.781409,23.136647 10.701392,23.744942 9.4922931,24.0886 8.9774725,24.238111 8.0757679,24.389777 6.5811304,23.84827 4.4270703,23.124679 2.8580086,20.883331 3.0363279,18.599583 3.0037061,17.652919 3.3488675,16.723769 3.8381157,15.925061 2.5329485,15.224503 1.4686756,14.048584 1.0611184,12.606459 0.81344502,11.816973 0.82385989,10.966486 0.91519098,10.154906 1.2422711,8.2387903 2.6795811,6.5725716 4.5299585,5.9732484 5.2685364,4.290122 6.8802592,3.0349975 8.706276,2.7794663 c 1.2124148,-0.1688264 2.46744,0.084987 3.52811,0.7011837 1.545426,-1.7139736 4.237779,-2.2205077 6.293579,-1.1676231 1.568222,0.7488935 2.689625,2.3113526 2.961888,4.0151464 1.492195,0.5977882 2.749007,1.8168898 3.242225,3.3644951 0.329805,0.9581836 0.340709,2.0135956 0.127128,2.9974286 -0.381606,1.535184 -1.465322,2.842146 -2.868035,3.556463 0.0034,0.273204 0.901506,2.243045 0.751284,3.729647 -0.03281,1.858525 -1.211631,3.619894 -2.846433,4.475452 -0.953967,0.556812 -2.084452,0.546309 -3.120531,0.535398 z m -4.470079,-5.349839 c 1.322246,-0.147248 2.189053,-1.300106 2.862307,-2.338363 0.318287,-0.472954 0.561404,-1.002348 0.803,-1.505815 0.313265,0.287151 0.578698,0.828085 1.074141,0.956909 0.521892,0.162542 1.133743,0.03052 1.45325,-0.443554 0.611414,-1.140449 0.31004,-2.516537 -0.04602,-3.698347 C 18.232844,11.92927 17.945151,11.232927 17.397785,10.751793 17.514522,9.9283111 17.026575,9.0919791 16.332883,8.6609491 15.741721,9.1323278 14.842258,9.1294949 14.271975,8.6252369 13.178927,9.7400102 12.177239,9.7029996 11.209704,8.8195135 10.992255,8.6209543 10.577326,10.031484 9.1211947,9.2324497 8.2846288,9.9333947 7.6359672,10.607693 7.0611981,11.578553 6.5026891,12.62523 5.9177873,13.554793 5.867393,14.69141 c -0.024234,0.66432 0.4948601,1.360337 1.1982269,1.306329 0.702996,0.06277 1.1815208,-0.629091 1.7138087,-0.916491 0.079382,0.927141 0.1688108,1.923227 0.4821259,2.828358 0.3596254,1.171275 1.6262605,1.915695 2.8251855,1.745211 0.08481,-0.0066 0.218672,-0.01769 0.218672,-0.0176 z" 68 68 - id="path7" 69 69 - sodipodi:nodetypes="sccccccccccccccccccsscccccccccscccccccsc" /> 70 70 - </g> 71 71 - <metadata 72 72 - id="metadata1"> 73 73 - <rdf:RDF> 74 74 - <cc:Work 75 75 - rdf:about=""> 76 76 - <cc:license 77 77 - rdf:resource="http://creativecommons.org/licenses/by/4.0/" /> 78 78 - </cc:Work> 79 79 - <cc:License 80 80 - rdf:about="http://creativecommons.org/licenses/by/4.0/"> 81 81 - <cc:permits 82 82 - rdf:resource="http://creativecommons.org/ns#Reproduction" /> 83 83 - <cc:permits 84 84 - rdf:resource="http://creativecommons.org/ns#Distribution" /> 85 85 - <cc:requires 86 86 - rdf:resource="http://creativecommons.org/ns#Notice" /> 87 87 - <cc:requires 88 88 - rdf:resource="http://creativecommons.org/ns#Attribution" /> 89 89 - <cc:permits 90 90 - rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> 91 91 - </cc:License> 92 92 - </rdf:RDF> 93 93 - </metadata> 94 94 - </svg> 95 95 - {{ end }}

+1 -1

appview/pages/templates/fragments/logotype.html

··· 1 1 {{ define "fragments/logotype" }} 2 2 <span class="flex items-center gap-2"> 3 3 - {{ template "fragments/dolly/logo" "size-16 text-black dark:text-white" }} 3 3 + {{ template "fragments/dolly/logo" (dict "Classes" "size-16 text-black dark:text-white") }} 4 4 <span class="font-bold text-4xl not-italic">tangled</span> 5 5 <span class="font-normal not-italic text-xs rounded bg-gray-100 dark:bg-gray-700 px-1"> 6 6 alpha

+1 -1

appview/pages/templates/fragments/logotypeSmall.html

··· 1 1 {{ define "fragments/logotypeSmall" }} 2 2 <span class="flex items-center gap-2"> 3 3 - {{ template "fragments/dolly/logo" "size-8 text-black dark:text-white" }} 3 3 + {{ template "fragments/dolly/logo" (dict "Classes" "size-8 text-black dark:text-white")}} 4 4 <span class="font-bold text-xl not-italic">tangled</span> 5 5 <span class="font-normal not-italic text-xs rounded bg-gray-100 dark:bg-gray-700 px-1"> 6 6 alpha

+4

appview/pages/templates/layouts/base.html

··· 11 11 <script defer src="/static/htmx-ext-ws.min.js"></script> 12 12 <script defer src="/static/actor-typeahead.js" type="module"></script> 13 13 14 14 + <link rel="icon" href="/static/logos/dolly.ico" sizes="48x48"/> 15 15 + <link rel="icon" href="/static/logos/dolly.svg" sizes="any" type="image/svg+xml"/> 16 16 + <link rel="apple-touch-icon" href="/static/logos/dolly.png"/> 17 17 + 14 18 <!-- preconnect to image cdn --> 15 19 <link rel="preconnect" href="https://avatar.tangled.sh" /> 16 20 <link rel="preconnect" href="https://camo.tangled.sh" />

+1 -5

appview/pages/templates/layouts/fragments/topbar.html

··· 3 3 <div class="flex justify-between p-0 items-center"> 4 4 <div id="left-items"> 5 5 <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline flex items-center gap-2"> 6 6 - {{ template "fragments/dolly/logo" "size-8 text-black dark:text-white" }} 7 7 - <span class="font-bold text-xl not-italic hidden md:inline">tangled</span> 8 8 - <span class="font-normal not-italic text-xs rounded bg-gray-100 dark:bg-gray-700 px-1 hidden md:inline"> 9 9 - alpha 10 10 - </span> 6 6 + {{ template "fragments/logotypeSmall" }} 11 7 </a> 12 8 </div> 13 9

+1 -1

appview/pages/templates/repo/fragments/diff.html

··· 17 17 {{ else }} 18 18 {{ range $idx, $hunk := $diff }} 19 19 {{ with $hunk }} 20 20 - <details open id="file-{{ .Name.New }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}"> 20 20 + <details open id="file-{{ .Id }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}"> 21 21 <summary class="list-none cursor-pointer sticky top-0"> 22 22 <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between"> 23 23 <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto">

+35 -35

appview/pages/templates/repo/fragments/splitDiff.html

··· 3 3 {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800" -}} 4 4 {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}} 5 5 {{- $lineNrSepStyle := "pr-2 border-r border-gray-200 dark:border-gray-700" -}} 6 6 - {{- $containerStyle := "flex min-w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 6 6 + {{- $containerStyle := "inline-flex w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 7 7 {{- $emptyStyle := "bg-gray-200/30 dark:bg-gray-700/30" -}} 8 8 {{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400" -}} 9 9 {{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}} 10 10 {{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}} 11 11 {{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}} 12 12 <div class="grid grid-cols-2 divide-x divide-gray-200 dark:divide-gray-700"> 13 13 - <pre class="overflow-x-auto col-span-1"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div> 13 13 + <div class="overflow-x-auto col-span-1 font-mono leading-normal"><div class="overflow-x-auto"><div class="inline-flex flex-col min-w-full">{{- range .TextFragments -}}<span class="block bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</span> 14 14 {{- range .LeftLines -}} 15 15 {{- if .IsEmpty -}} 16 16 - <div class="{{ $emptyStyle }} {{ $containerStyle }}"> 17 17 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></div> 18 18 - <div class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></div> 19 19 - <div class="px-2 invisible" aria-hidden="true">{{ .Content }}</div> 20 20 - </div> 16 16 + <span class="{{ $emptyStyle }} {{ $containerStyle }}"> 17 17 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></span> 18 18 + <span class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></span> 19 19 + <span class="px-2 invisible" aria-hidden="true">{{ .Content }}</span> 20 20 + </span> 21 21 {{- else if eq .Op.String "-" -}} 22 22 - <div class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}"> 23 23 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></div> 24 24 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 25 25 - <div class="px-2">{{ .Content }}</div> 26 26 - </div> 22 22 + <span class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}"> 23 23 + <span class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></span> 24 24 + <span class="{{ $opStyle }}">{{ .Op.String }}</span> 25 25 + <span class="px-2 whitespace-pre">{{ .Content }}</span> 26 26 + </span> 27 27 {{- else if eq .Op.String " " -}} 28 28 - <div class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}"> 29 29 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></div> 30 30 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 31 31 - <div class="px-2">{{ .Content }}</div> 32 32 - </div> 28 28 + <span class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}"> 29 29 + <span class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></span> 30 30 + <span class="{{ $opStyle }}">{{ .Op.String }}</span> 31 31 + <span class="px-2 whitespace-pre">{{ .Content }}</span> 32 32 + </span> 33 33 {{- end -}} 34 34 {{- end -}} 35 35 - {{- end -}}</div></div></pre> 35 35 + {{- end -}}</div></div></div> 36 36 37 37 - <pre class="overflow-x-auto col-span-1"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div> 37 37 + <div class="overflow-x-auto col-span-1 font-mono leading-normal"><div class="overflow-x-auto"><div class="inline-flex flex-col min-w-full">{{- range .TextFragments -}}<span class="block bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</span> 38 38 {{- range .RightLines -}} 39 39 {{- if .IsEmpty -}} 40 40 - <div class="{{ $emptyStyle }} {{ $containerStyle }}"> 41 41 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></div> 42 42 - <div class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></div> 43 43 - <div class="px-2 invisible" aria-hidden="true">{{ .Content }}</div> 44 44 - </div> 40 40 + <span class="{{ $emptyStyle }} {{ $containerStyle }}"> 41 41 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></span> 42 42 + <span class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></span> 43 43 + <span class="px-2 invisible" aria-hidden="true">{{ .Content }}</span> 44 44 + </span> 45 45 {{- else if eq .Op.String "+" -}} 46 46 - <div class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}"> 47 47 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a></div> 48 48 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 49 49 - <div class="px-2" >{{ .Content }}</div> 50 50 - </div> 46 46 + <span class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}"> 47 47 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a></span> 48 48 + <span class="{{ $opStyle }}">{{ .Op.String }}</span> 49 49 + <span class="px-2 whitespace-pre">{{ .Content }}</span> 50 50 + </span> 51 51 {{- else if eq .Op.String " " -}} 52 52 - <div class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}"> 53 53 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a></div> 54 54 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 55 55 - <div class="px-2">{{ .Content }}</div> 56 56 - </div> 52 52 + <span class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}"> 53 53 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a> </span> 54 54 + <span class="{{ $opStyle }}">{{ .Op.String }}</span> 55 55 + <span class="px-2 whitespace-pre">{{ .Content }}</span> 56 56 + </span> 57 57 {{- end -}} 58 58 {{- end -}} 59 59 - {{- end -}}</div></div></pre> 59 59 + {{- end -}}</div></div></div> 60 60 </div> 61 61 {{ end }}

+21 -22

appview/pages/templates/repo/fragments/unifiedDiff.html

··· 1 1 {{ define "repo/fragments/unifiedDiff" }} 2 2 {{ $name := .Id }} 3 3 - <pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div> 3 3 + <div class="overflow-x-auto font-mono leading-normal"><div class="overflow-x-auto"><div class="inline-flex flex-col min-w-full">{{- range .TextFragments -}}<span class="block bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</span> 4 4 {{- $oldStart := .OldPosition -}} 5 5 {{- $newStart := .NewPosition -}} 6 6 {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800 target:bg-yellow-200 target:dark:bg-yellow-600" -}} 7 7 {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}} 8 8 {{- $lineNrSepStyle1 := "" -}} 9 9 {{- $lineNrSepStyle2 := "pr-2 border-r border-gray-200 dark:border-gray-700" -}} 10 10 - {{- $containerStyle := "flex min-w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 10 10 + {{- $containerStyle := "inline-flex w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 11 11 {{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 " -}} 12 12 {{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}} 13 13 {{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}} 14 14 {{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}} 15 15 {{- range .Lines -}} 16 16 {{- if eq .Op.String "+" -}} 17 17 - <div class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{$newStart}}"> 18 18 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><span aria-hidden="true" class="invisible">{{$newStart}}</span></div> 19 19 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div> 20 20 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 21 21 - <div class="px-2">{{ .Line }}</div> 22 22 - </div> 17 17 + <span class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{$newStart}}"> 18 18 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><span aria-hidden="true" class="invisible">{{$newStart}}</span></span> 19 19 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></span> 20 20 + <span class="{{ $opStyle }}">{{ .Op.String }}</span> 21 21 + <span class="px-2 whitespace-pre">{{ .Line }}</span> 22 22 + </span> 23 23 {{- $newStart = add64 $newStart 1 -}} 24 24 {{- end -}} 25 25 {{- if eq .Op.String "-" -}} 26 26 - <div class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}"> 27 27 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div> 28 28 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><span aria-hidden="true" class="invisible">{{$oldStart}}</span></div> 29 29 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 30 30 - <div class="px-2">{{ .Line }}</div> 31 31 - </div> 26 26 + <span class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}"> 27 27 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></span> 28 28 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><span aria-hidden="true" class="invisible">{{$oldStart}}</span></span> 29 29 + <span class="{{ $opStyle }}">{{ .Op.String }}</span> 30 30 + <span class="px-2 whitespace-pre">{{ .Line }}</span> 31 31 + </span> 32 32 {{- $oldStart = add64 $oldStart 1 -}} 33 33 {{- end -}} 34 34 {{- if eq .Op.String " " -}} 35 35 - <div class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}-N{{$newStart}}"> 36 36 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $oldStart }}</a></div> 37 37 - <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $newStart }}</a></div> 38 38 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 39 39 - <div class="px-2">{{ .Line }}</div> 40 40 - </div> 35 35 + <span class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}-N{{$newStart}}"> 36 36 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $oldStart }}</a></span> 37 37 + <span class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $newStart }}</a></span> 38 38 + <span class="{{ $opStyle }}">{{ .Op.String }}</span> 39 39 + <span class="px-2 whitespace-pre">{{ .Line }}</span> 40 40 + </span> 41 41 {{- $newStart = add64 $newStart 1 -}} 42 42 {{- $oldStart = add64 $oldStart 1 -}} 43 43 {{- end -}} 44 44 {{- end -}} 45 45 - {{- end -}}</div></div></pre> 45 45 + {{- end -}}</div></div></div> 46 46 {{ end }} 47 47 -

-14

appview/pages/templates/repo/pipelines/workflow.html

··· 12 12 {{ block "sidebar" . }} {{ end }} 13 13 </div> 14 14 <div class="col-span-1 md:col-span-3"> 15 15 - <!-- TODO(boltless): explictly check for pipeline cancel permission --> 16 16 - {{ if $.RepoInfo.Roles.IsOwner }} 17 17 - <div class="flex justify-between mb-2"> 18 18 - <div id="workflow-error" class="text-red-500 dark:text-red-400"></div> 19 19 - <button 20 20 - class="btn" 21 21 - hx-post="/{{ $.RepoInfo.FullName }}/pipelines/{{ .Pipeline.Id }}/workflow/{{ .Workflow }}/cancel" 22 22 - hx-swap="none" 23 23 - {{ if (index .Pipeline.Statuses .Workflow).Latest.Status.IsFinish -}} 24 24 - disabled 25 25 - {{- end }} 26 26 - >Cancel</button> 27 27 - </div> 28 28 - {{ end }} 29 15 {{ block "logs" . }} {{ end }} 30 16 </div> 31 17 </section>

+1 -86

appview/pipelines/pipelines.go

··· 4 4 "bytes" 5 5 "context" 6 6 "encoding/json" 7 7 - "fmt" 8 7 "log/slog" 9 8 "net/http" 10 9 "strings" 11 10 "time" 12 11 13 13 - "tangled.org/core/api/tangled" 14 12 "tangled.org/core/appview/config" 15 13 "tangled.org/core/appview/db" 16 16 - "tangled.org/core/appview/middleware" 17 17 - "tangled.org/core/appview/models" 18 14 "tangled.org/core/appview/oauth" 19 15 "tangled.org/core/appview/pages" 20 16 "tangled.org/core/appview/reporesolver" ··· 40 36 logger *slog.Logger 41 37 } 42 38 43 43 - func (p *Pipelines) Router(mw *middleware.Middleware) http.Handler { 39 39 + func (p *Pipelines) Router() http.Handler { 44 40 r := chi.NewRouter() 45 41 r.Get("/", p.Index) 46 42 r.Get("/{pipeline}/workflow/{workflow}", p.Workflow) 47 43 r.Get("/{pipeline}/workflow/{workflow}/logs", p.Logs) 48 48 - r. 49 49 - With(mw.RepoPermissionMiddleware("repo:owner")). 50 50 - Post("/{pipeline}/workflow/{workflow}/cancel", p.Cancel) 51 44 52 45 return r 53 46 } ··· 321 314 } 322 315 } 323 316 } 324 324 - } 325 325 - 326 326 - func (p *Pipelines) Cancel(w http.ResponseWriter, r *http.Request) { 327 327 - l := p.logger.With("handler", "Cancel") 328 328 - 329 329 - var ( 330 330 - pipelineId = chi.URLParam(r, "pipeline") 331 331 - workflow = chi.URLParam(r, "workflow") 332 332 - ) 333 333 - if pipelineId == "" || workflow == "" { 334 334 - http.Error(w, "missing pipeline ID or workflow", http.StatusBadRequest) 335 335 - return 336 336 - } 337 337 - 338 338 - f, err := p.repoResolver.Resolve(r) 339 339 - if err != nil { 340 340 - l.Error("failed to get repo and knot", "err", err) 341 341 - http.Error(w, "bad repo/knot", http.StatusBadRequest) 342 342 - return 343 343 - } 344 344 - 345 345 - pipeline, err := func() (models.Pipeline, error) { 346 346 - ps, err := db.GetPipelineStatuses( 347 347 - p.db, 348 348 - 1, 349 349 - orm.FilterEq("repo_owner", f.Did), 350 350 - orm.FilterEq("repo_name", f.Name), 351 351 - orm.FilterEq("knot", f.Knot), 352 352 - orm.FilterEq("id", pipelineId), 353 353 - ) 354 354 - if err != nil { 355 355 - return models.Pipeline{}, err 356 356 - } 357 357 - if len(ps) != 1 { 358 358 - return models.Pipeline{}, fmt.Errorf("wrong pipeline count %d", len(ps)) 359 359 - } 360 360 - return ps[0], nil 361 361 - }() 362 362 - if err != nil { 363 363 - l.Error("pipeline query failed", "err", err) 364 364 - http.Error(w, "pipeline not found", http.StatusNotFound) 365 365 - } 366 366 - var ( 367 367 - spindle = f.Spindle 368 368 - knot = f.Knot 369 369 - rkey = pipeline.Rkey 370 370 - ) 371 371 - 372 372 - if spindle == "" || knot == "" || rkey == "" { 373 373 - http.Error(w, "invalid repo info", http.StatusBadRequest) 374 374 - return 375 375 - } 376 376 - 377 377 - spindleClient, err := p.oauth.ServiceClient( 378 378 - r, 379 379 - oauth.WithService(f.Spindle), 380 380 - oauth.WithLxm(tangled.PipelineCancelPipelineNSID), 381 381 - oauth.WithDev(p.config.Core.Dev), 382 382 - oauth.WithTimeout(time.Second*30), // workflow cleanup usually takes time 383 383 - ) 384 384 - 385 385 - err = tangled.PipelineCancelPipeline( 386 386 - r.Context(), 387 387 - spindleClient, 388 388 - &tangled.PipelineCancelPipeline_Input{ 389 389 - Repo: string(f.RepoAt()), 390 390 - Pipeline: pipeline.AtUri().String(), 391 391 - Workflow: workflow, 392 392 - }, 393 393 - ) 394 394 - err = fmt.Errorf("boo! new error") 395 395 - errorId := "workflow-error" 396 396 - if err != nil { 397 397 - l.Error("failed to cancel workflow", "err", err) 398 398 - p.pages.Notice(w, errorId, "Failed to cancel workflow") 399 399 - return 400 400 - } 401 401 - l.Debug("canceled pipeline", "uri", pipeline.AtUri()) 402 317 } 403 318 404 319 // either a message or an error

+1 -1

appview/pulls/opengraph.go

··· 242 242 dollyX := dollyBounds.Min.X + (dollyBounds.Dx() / 2) - (dollySize / 2) 243 243 dollyY := statsY + iconBaselineOffset - dollySize/2 + 25 244 244 dollyColor := color.RGBA{180, 180, 180, 255} // light gray 245 245 - err = dollyArea.DrawDollySilhouette(dollyX, dollyY, dollySize, dollyColor) 245 245 + err = dollyArea.DrawDolly(dollyX, dollyY, dollySize, dollyColor) 246 246 if err != nil { 247 247 log.Printf("dolly silhouette not available (this is ok): %v", err) 248 248 }

+48 -36

appview/pulls/pulls.go

··· 1241 1241 return 1242 1242 } 1243 1243 1244 1244 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 1245 1245 + if err != nil { 1246 1246 + log.Println("failed to upload patch", err) 1247 1247 + s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1248 1248 + return 1249 1249 + } 1250 1250 + 1244 1251 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1245 1252 Collection: tangled.RepoPullNSID, 1246 1253 Repo: user.Did, ··· 1252 1259 Repo: string(repo.RepoAt()), 1253 1260 Branch: targetBranch, 1254 1261 }, 1255 1255 - Patch: patch, 1262 1262 + PatchBlob: blob.Blob, 1256 1263 Source: recordPullSource, 1257 1264 CreatedAt: time.Now().Format(time.RFC3339), 1258 1265 }, ··· 1328 1335 // apply all record creations at once 1329 1336 var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem 1330 1337 for _, p := range stack { 1338 1338 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(p.LatestPatch())) 1339 1339 + if err != nil { 1340 1340 + log.Println("failed to upload patch blob", err) 1341 1341 + s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1342 1342 + return 1343 1343 + } 1344 1344 + 1331 1345 record := p.AsRecord() 1332 1332 - write := comatproto.RepoApplyWrites_Input_Writes_Elem{ 1346 1346 + record.PatchBlob = blob.Blob 1347 1347 + writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{ 1333 1348 RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{ 1334 1349 Collection: tangled.RepoPullNSID, 1335 1350 Rkey: &p.Rkey, ··· 1337 1352 Val: &record, 1338 1353 }, 1339 1354 }, 1340 1340 - } 1341 1341 - writes = append(writes, &write) 1355 1355 + }) 1342 1356 } 1343 1357 _, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{ 1344 1358 Repo: user.Did, ··· 1871 1885 return 1872 1886 } 1873 1887 1874 1874 - var recordPullSource *tangled.RepoPull_Source 1875 1875 - if pull.IsBranchBased() { 1876 1876 - recordPullSource = &tangled.RepoPull_Source{ 1877 1877 - Branch: pull.PullSource.Branch, 1878 1878 - Sha: sourceRev, 1879 1879 - } 1888 1888 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 1889 1889 + if err != nil { 1890 1890 + log.Println("failed to upload patch blob", err) 1891 1891 + s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") 1892 1892 + return 1880 1893 } 1881 1881 - if pull.IsForkBased() { 1882 1882 - repoAt := pull.PullSource.RepoAt.String() 1883 1883 - recordPullSource = &tangled.RepoPull_Source{ 1884 1884 - Branch: pull.PullSource.Branch, 1885 1885 - Repo: &repoAt, 1886 1886 - Sha: sourceRev, 1887 1887 - } 1888 1888 - } 1894 1894 + record := pull.AsRecord() 1895 1895 + record.PatchBlob = blob.Blob 1896 1896 + record.CreatedAt = time.Now().Format(time.RFC3339) 1889 1897 1890 1898 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1891 1899 Collection: tangled.RepoPullNSID, ··· 1893 1901 Rkey: pull.Rkey, 1894 1902 SwapRecord: ex.Cid, 1895 1903 Record: &lexutil.LexiconTypeDecoder{ 1896 1896 - Val: &tangled.RepoPull{ 1897 1897 - Title: pull.Title, 1898 1898 - Target: &tangled.RepoPull_Target{ 1899 1899 - Repo: string(repo.RepoAt()), 1900 1900 - Branch: pull.TargetBranch, 1901 1901 - }, 1902 1902 - Patch: patch, // new patch 1903 1903 - Source: recordPullSource, 1904 1904 - CreatedAt: time.Now().Format(time.RFC3339), 1905 1905 - }, 1904 1904 + Val: &record, 1906 1905 }, 1907 1906 }) 1908 1907 if err != nil { ··· 1988 1987 } 1989 1988 defer tx.Rollback() 1990 1989 1990 1990 + client, err := s.oauth.AuthorizedClient(r) 1991 1991 + if err != nil { 1992 1992 + log.Println("failed to authorize client") 1993 1993 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1994 1994 + return 1995 1995 + } 1996 1996 + 1991 1997 // pds updates to make 1992 1998 var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem 1993 1999 ··· 2021 2027 return 2022 2028 } 2023 2029 2030 2030 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 2031 2031 + if err != nil { 2032 2032 + log.Println("failed to upload patch blob", err) 2033 2033 + s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") 2034 2034 + return 2035 2035 + } 2024 2036 record := p.AsRecord() 2037 2037 + record.PatchBlob = blob.Blob 2025 2038 writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{ 2026 2039 RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{ 2027 2040 Collection: tangled.RepoPullNSID, ··· 2056 2069 return 2057 2070 } 2058 2071 2072 2072 + blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch)) 2073 2073 + if err != nil { 2074 2074 + log.Println("failed to upload patch blob", err) 2075 2075 + s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") 2076 2076 + return 2077 2077 + } 2059 2078 record := np.AsRecord() 2060 2060 - 2079 2079 + record.PatchBlob = blob.Blob 2061 2080 writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{ 2062 2081 RepoApplyWrites_Update: &comatproto.RepoApplyWrites_Update{ 2063 2082 Collection: tangled.RepoPullNSID, ··· 2091 2110 if err != nil { 2092 2111 log.Println("failed to resubmit pull", err) 2093 2112 s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.") 2094 2094 - return 2095 2095 - } 2096 2096 - 2097 2097 - client, err := s.oauth.AuthorizedClient(r) 2098 2098 - if err != nil { 2099 2099 - log.Println("failed to authorize client") 2100 2100 - s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 2101 2113 return 2102 2114 } 2103 2115

+1

appview/repo/archive.go

··· 18 18 l := rp.logger.With("handler", "DownloadArchive") 19 19 ref := chi.URLParam(r, "ref") 20 20 ref, _ = url.PathUnescape(ref) 21 21 + ref = strings.TrimSuffix(ref, ".tar.gz") 21 22 f, err := rp.repoResolver.Resolve(r) 22 23 if err != nil { 23 24 l.Error("failed to get repo and knot", "err", err)

+1 -1

appview/repo/opengraph.go

··· 237 237 dollyX := dollyBounds.Min.X + (dollyBounds.Dx() / 2) - (dollySize / 2) 238 238 dollyY := statsY + iconBaselineOffset - dollySize/2 + 25 239 239 dollyColor := color.RGBA{180, 180, 180, 255} // light gray 240 240 - err = dollyArea.DrawDollySilhouette(dollyX, dollyY, dollySize, dollyColor) 240 240 + err = dollyArea.DrawDolly(dollyX, dollyY, dollySize, dollyColor) 241 241 if err != nil { 242 242 log.Printf("dolly silhouette not available (this is ok): %v", err) 243 243 }

+26 -1

appview/reporesolver/resolver.go

··· 63 63 } 64 64 65 65 // get dir/ref 66 66 - currentDir := path.Dir(extractPathAfterRef(r.URL.EscapedPath())) 66 66 + currentDir := extractCurrentDir(r.URL.EscapedPath()) 67 67 ref := chi.URLParam(r, "ref") 68 68 69 69 repoAt := repo.RepoAt() ··· 130 130 } 131 131 132 132 return repoInfo 133 133 + } 134 134 + 135 135 + // extractCurrentDir gets the current directory for markdown link resolution. 136 136 + // for blob paths, returns the parent dir. for tree paths, returns the path itself. 137 137 + // 138 138 + // /@user/repo/blob/main/docs/README.md => docs 139 139 + // /@user/repo/tree/main/docs => docs 140 140 + func extractCurrentDir(fullPath string) string { 141 141 + fullPath = strings.TrimPrefix(fullPath, "/") 142 142 + 143 143 + blobPattern := regexp.MustCompile(`blob/[^/]+/(.*)$`) 144 144 + if matches := blobPattern.FindStringSubmatch(fullPath); len(matches) > 1 { 145 145 + return path.Dir(matches[1]) 146 146 + } 147 147 + 148 148 + treePattern := regexp.MustCompile(`tree/[^/]+/(.*)$`) 149 149 + if matches := treePattern.FindStringSubmatch(fullPath); len(matches) > 1 { 150 150 + dir := strings.TrimSuffix(matches[1], "/") 151 151 + if dir == "" { 152 152 + return "." 153 153 + } 154 154 + return dir 155 155 + } 156 156 + 157 157 + return "." 133 158 } 134 159 135 160 // extractPathAfterRef gets the actual repository path

+22

appview/reporesolver/resolver_test.go

··· 1 1 + package reporesolver 2 2 + 3 3 + import "testing" 4 4 + 5 5 + func TestExtractCurrentDir(t *testing.T) { 6 6 + tests := []struct { 7 7 + path string 8 8 + want string 9 9 + }{ 10 10 + {"/@user/repo/blob/main/docs/README.md", "docs"}, 11 11 + {"/@user/repo/blob/main/README.md", "."}, 12 12 + {"/@user/repo/tree/main/docs", "docs"}, 13 13 + {"/@user/repo/tree/main/docs/", "docs"}, 14 14 + {"/@user/repo/tree/main", "."}, 15 15 + } 16 16 + 17 17 + for _, tt := range tests { 18 18 + if got := extractCurrentDir(tt.path); got != tt.want { 19 19 + t.Errorf("extractCurrentDir(%q) = %q, want %q", tt.path, got, tt.want) 20 20 + } 21 21 + } 22 22 + }

-5

appview/spindles/spindles.go

··· 653 653 s.Pages.Notice(w, noticeId, "Failed to remove member, identity resolution failed.") 654 654 return 655 655 } 656 656 - if memberId.Handle.IsInvalidHandle() { 657 657 - l.Error("failed to resolve member identity to handle") 658 658 - s.Pages.Notice(w, noticeId, "Failed to remove member, identity resolution failed.") 659 659 - return 660 660 - } 661 656 662 657 tx, err := s.Db.Begin() 663 658 if err != nil {

+86

appview/state/knotstream.go

··· 18 18 "tangled.org/core/log" 19 19 "tangled.org/core/orm" 20 20 "tangled.org/core/rbac" 21 21 + "tangled.org/core/workflow" 21 22 23 23 + "github.com/bluesky-social/indigo/atproto/syntax" 22 24 "github.com/go-git/go-git/v5/plumbing" 23 25 "github.com/posthog/posthog-go" 24 26 ) ··· 65 67 switch msg.Nsid { 66 68 case tangled.GitRefUpdateNSID: 67 69 return ingestRefUpdate(d, enforcer, posthog, dev, source, msg) 70 70 + case tangled.PipelineNSID: 71 71 + return ingestPipeline(d, source, msg) 68 72 } 69 73 70 74 return nil ··· 186 190 187 191 return tx.Commit() 188 192 } 193 193 + 194 194 + func ingestPipeline(d *db.DB, source ec.Source, msg ec.Message) error { 195 195 + var record tangled.Pipeline 196 196 + err := json.Unmarshal(msg.EventJson, &record) 197 197 + if err != nil { 198 198 + return err 199 199 + } 200 200 + 201 201 + if record.TriggerMetadata == nil { 202 202 + return fmt.Errorf("empty trigger metadata: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 203 203 + } 204 204 + 205 205 + if record.TriggerMetadata.Repo == nil { 206 206 + return fmt.Errorf("empty repo: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 207 207 + } 208 208 + 209 209 + // does this repo have a spindle configured? 210 210 + repos, err := db.GetRepos( 211 211 + d, 212 212 + 0, 213 213 + orm.FilterEq("did", record.TriggerMetadata.Repo.Did), 214 214 + orm.FilterEq("name", record.TriggerMetadata.Repo.Repo), 215 215 + ) 216 216 + if err != nil { 217 217 + return fmt.Errorf("failed to look for repo in DB: nsid %s, rkey %s, %w", msg.Nsid, msg.Rkey, err) 218 218 + } 219 219 + if len(repos) != 1 { 220 220 + return fmt.Errorf("incorrect number of repos returned: %d (expected 1)", len(repos)) 221 221 + } 222 222 + if repos[0].Spindle == "" { 223 223 + return fmt.Errorf("repo does not have a spindle configured yet: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 224 224 + } 225 225 + 226 226 + // trigger info 227 227 + var trigger models.Trigger 228 228 + var sha string 229 229 + trigger.Kind = workflow.TriggerKind(record.TriggerMetadata.Kind) 230 230 + switch trigger.Kind { 231 231 + case workflow.TriggerKindPush: 232 232 + trigger.PushRef = &record.TriggerMetadata.Push.Ref 233 233 + trigger.PushNewSha = &record.TriggerMetadata.Push.NewSha 234 234 + trigger.PushOldSha = &record.TriggerMetadata.Push.OldSha 235 235 + sha = *trigger.PushNewSha 236 236 + case workflow.TriggerKindPullRequest: 237 237 + trigger.PRSourceBranch = &record.TriggerMetadata.PullRequest.SourceBranch 238 238 + trigger.PRTargetBranch = &record.TriggerMetadata.PullRequest.TargetBranch 239 239 + trigger.PRSourceSha = &record.TriggerMetadata.PullRequest.SourceSha 240 240 + trigger.PRAction = &record.TriggerMetadata.PullRequest.Action 241 241 + sha = *trigger.PRSourceSha 242 242 + } 243 243 + 244 244 + tx, err := d.Begin() 245 245 + if err != nil { 246 246 + return fmt.Errorf("failed to start txn: %w", err) 247 247 + } 248 248 + 249 249 + triggerId, err := db.AddTrigger(tx, trigger) 250 250 + if err != nil { 251 251 + return fmt.Errorf("failed to add trigger entry: %w", err) 252 252 + } 253 253 + 254 254 + pipeline := models.Pipeline{ 255 255 + Rkey: msg.Rkey, 256 256 + Knot: source.Key(), 257 257 + RepoOwner: syntax.DID(record.TriggerMetadata.Repo.Did), 258 258 + RepoName: record.TriggerMetadata.Repo.Repo, 259 259 + TriggerId: int(triggerId), 260 260 + Sha: sha, 261 261 + } 262 262 + 263 263 + err = db.AddPipeline(tx, pipeline) 264 264 + if err != nil { 265 265 + return fmt.Errorf("failed to add pipeline: %w", err) 266 266 + } 267 267 + 268 268 + err = tx.Commit() 269 269 + if err != nil { 270 270 + return fmt.Errorf("failed to commit txn: %w", err) 271 271 + } 272 272 + 273 273 + return nil 274 274 + }

+29

appview/state/manifest.go

··· 1 1 + package state 2 2 + 3 3 + import ( 4 4 + "encoding/json" 5 5 + "net/http" 6 6 + ) 7 7 + 8 8 + // https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Manifest 9 9 + // https://www.w3.org/TR/appmanifest/ 10 10 + var manifestData = map[string]any{ 11 11 + "name": "tangled", 12 12 + "description": "tightly-knit social coding.", 13 13 + "icons": []map[string]string{ 14 14 + { 15 15 + "src": "/static/logos/dolly.svg", 16 16 + "sizes": "144x144", 17 17 + }, 18 18 + }, 19 19 + "start_url": "/", 20 20 + "id": "https://tangled.org", 21 21 + "display": "standalone", 22 22 + "background_color": "#111827", 23 23 + "theme_color": "#111827", 24 24 + } 25 25 + 26 26 + func (p *State) WebAppManifest(w http.ResponseWriter, r *http.Request) { 27 27 + w.Header().Set("Content-Type", "application/manifest+json") 28 28 + json.NewEncoder(w).Encode(manifestData) 29 29 + }

+6 -4

appview/state/profile.go

··· 163 163 } 164 164 165 165 // populate commit counts in the timeline, using the punchcard 166 166 - currentMonth := time.Now().Month() 166 166 + now := time.Now() 167 167 for _, p := range profile.Punchcard.Punches { 168 168 - idx := currentMonth - p.Date.Month() 169 169 - if int(idx) < len(timeline.ByMonth) { 170 170 - timeline.ByMonth[idx].Commits += p.Count 168 168 + years := now.Year() - p.Date.Year() 169 169 + months := int(now.Month() - p.Date.Month()) 170 170 + monthsAgo := years*12 + months 171 171 + if monthsAgo >= 0 && monthsAgo < len(timeline.ByMonth) { 172 172 + timeline.ByMonth[monthsAgo].Commits += p.Count 171 173 } 172 174 } 173 175

+6 -6

appview/state/router.go

··· 32 32 s.pages, 33 33 ) 34 34 35 35 - router.Get("/favicon.svg", s.Favicon) 36 36 - router.Get("/favicon.ico", s.Favicon) 37 37 - router.Get("/pwa-manifest.json", s.PWAManifest) 35 35 + router.Get("/pwa-manifest.json", s.WebAppManifest) 38 36 router.Get("/robots.txt", s.RobotsTxt) 39 37 40 38 userRouter := s.UserRouter(&middleware) ··· 96 94 r.Mount("/", s.RepoRouter(mw)) 97 95 r.Mount("/issues", s.IssuesRouter(mw)) 98 96 r.Mount("/pulls", s.PullsRouter(mw)) 99 99 - r.Mount("/pipelines", s.PipelinesRouter(mw)) 97 97 + r.Mount("/pipelines", s.PipelinesRouter()) 100 98 r.Mount("/labels", s.LabelsRouter()) 101 99 102 100 // These routes get proxied to the knot ··· 109 107 }) 110 108 111 109 r.NotFound(func(w http.ResponseWriter, r *http.Request) { 110 110 + w.WriteHeader(http.StatusNotFound) 112 111 s.pages.Error404(w) 113 112 }) 114 113 ··· 182 181 r.Get("/brand", s.Brand) 183 182 184 183 r.NotFound(func(w http.ResponseWriter, r *http.Request) { 184 184 + w.WriteHeader(http.StatusNotFound) 185 185 s.pages.Error404(w) 186 186 }) 187 187 return r ··· 313 313 return repo.Router(mw) 314 314 } 315 315 316 316 - func (s *State) PipelinesRouter(mw *middleware.Middleware) http.Handler { 316 316 + func (s *State) PipelinesRouter() http.Handler { 317 317 pipes := pipelines.New( 318 318 s.oauth, 319 319 s.repoResolver, ··· 325 325 s.enforcer, 326 326 log.SubLogger(s.logger, "pipelines"), 327 327 ) 328 328 - return pipes.Router(mw) 328 328 + return pipes.Router() 329 329 } 330 330 331 331 func (s *State) LabelsRouter() http.Handler {

-89

appview/state/spindlestream.go

··· 20 20 "tangled.org/core/orm" 21 21 "tangled.org/core/rbac" 22 22 spindle "tangled.org/core/spindle/models" 23 23 - "tangled.org/core/workflow" 24 23 ) 25 24 26 25 func Spindlestream(ctx context.Context, c *config.Config, d *db.DB, enforcer *rbac.Enforcer) (*ec.Consumer, error) { ··· 63 62 func spindleIngester(ctx context.Context, logger *slog.Logger, d *db.DB) ec.ProcessFunc { 64 63 return func(ctx context.Context, source ec.Source, msg ec.Message) error { 65 64 switch msg.Nsid { 66 66 - case tangled.PipelineNSID: 67 67 - return ingestPipeline(logger, d, source, msg) 68 65 case tangled.PipelineStatusNSID: 69 66 return ingestPipelineStatus(ctx, logger, d, source, msg) 70 67 } 71 68 72 69 return nil 73 70 } 74 74 - } 75 75 - 76 76 - func ingestPipeline(l *slog.Logger, d *db.DB, source ec.Source, msg ec.Message) error { 77 77 - var record tangled.Pipeline 78 78 - err := json.Unmarshal(msg.EventJson, &record) 79 79 - if err != nil { 80 80 - return err 81 81 - } 82 82 - 83 83 - if record.TriggerMetadata == nil { 84 84 - return fmt.Errorf("empty trigger metadata: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 85 85 - } 86 86 - 87 87 - if record.TriggerMetadata.Repo == nil { 88 88 - return fmt.Errorf("empty repo: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 89 89 - } 90 90 - 91 91 - // does this repo have a spindle configured? 92 92 - repos, err := db.GetRepos( 93 93 - d, 94 94 - 0, 95 95 - orm.FilterEq("did", record.TriggerMetadata.Repo.Did), 96 96 - orm.FilterEq("name", record.TriggerMetadata.Repo.Repo), 97 97 - ) 98 98 - if err != nil { 99 99 - return fmt.Errorf("failed to look for repo in DB: nsid %s, rkey %s, %w", msg.Nsid, msg.Rkey, err) 100 100 - } 101 101 - if len(repos) != 1 { 102 102 - return fmt.Errorf("incorrect number of repos returned: %d (expected 1)", len(repos)) 103 103 - } 104 104 - if repos[0].Spindle == "" { 105 105 - return fmt.Errorf("repo does not have a spindle configured yet: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 106 106 - } 107 107 - 108 108 - // trigger info 109 109 - var trigger models.Trigger 110 110 - var sha string 111 111 - trigger.Kind = workflow.TriggerKind(record.TriggerMetadata.Kind) 112 112 - switch trigger.Kind { 113 113 - case workflow.TriggerKindPush: 114 114 - trigger.PushRef = &record.TriggerMetadata.Push.Ref 115 115 - trigger.PushNewSha = &record.TriggerMetadata.Push.NewSha 116 116 - trigger.PushOldSha = &record.TriggerMetadata.Push.OldSha 117 117 - sha = *trigger.PushNewSha 118 118 - case workflow.TriggerKindPullRequest: 119 119 - trigger.PRSourceBranch = &record.TriggerMetadata.PullRequest.SourceBranch 120 120 - trigger.PRTargetBranch = &record.TriggerMetadata.PullRequest.TargetBranch 121 121 - trigger.PRSourceSha = &record.TriggerMetadata.PullRequest.SourceSha 122 122 - trigger.PRAction = &record.TriggerMetadata.PullRequest.Action 123 123 - sha = *trigger.PRSourceSha 124 124 - } 125 125 - 126 126 - tx, err := d.Begin() 127 127 - if err != nil { 128 128 - return fmt.Errorf("failed to start txn: %w", err) 129 129 - } 130 130 - 131 131 - triggerId, err := db.AddTrigger(tx, trigger) 132 132 - if err != nil { 133 133 - return fmt.Errorf("failed to add trigger entry: %w", err) 134 134 - } 135 135 - 136 136 - // TODO: we shouldn't even use knot to identify pipelines 137 137 - knot := record.TriggerMetadata.Repo.Knot 138 138 - pipeline := models.Pipeline{ 139 139 - Rkey: msg.Rkey, 140 140 - Knot: knot, 141 141 - RepoOwner: syntax.DID(record.TriggerMetadata.Repo.Did), 142 142 - RepoName: record.TriggerMetadata.Repo.Repo, 143 143 - TriggerId: int(triggerId), 144 144 - Sha: sha, 145 145 - } 146 146 - 147 147 - err = db.AddPipeline(tx, pipeline) 148 148 - if err != nil { 149 149 - return fmt.Errorf("failed to add pipeline: %w", err) 150 150 - } 151 151 - 152 152 - err = tx.Commit() 153 153 - if err != nil { 154 154 - return fmt.Errorf("failed to commit txn: %w", err) 155 155 - } 156 156 - 157 157 - l.Info("added pipeline", "pipeline", pipeline) 158 158 - 159 159 - return nil 160 71 } 161 72 162 73 func ingestPipelineStatus(ctx context.Context, logger *slog.Logger, d *db.DB, source ec.Source, msg ec.Message) error {

-36

appview/state/state.go

··· 202 202 return s.db.Close() 203 203 } 204 204 205 205 - func (s *State) Favicon(w http.ResponseWriter, r *http.Request) { 206 206 - w.Header().Set("Content-Type", "image/svg+xml") 207 207 - w.Header().Set("Cache-Control", "public, max-age=31536000") // one year 208 208 - w.Header().Set("ETag", `"favicon-svg-v1"`) 209 209 - 210 210 - if match := r.Header.Get("If-None-Match"); match == `"favicon-svg-v1"` { 211 211 - w.WriteHeader(http.StatusNotModified) 212 212 - return 213 213 - } 214 214 - 215 215 - s.pages.Favicon(w) 216 216 - } 217 217 - 218 205 func (s *State) RobotsTxt(w http.ResponseWriter, r *http.Request) { 219 206 w.Header().Set("Content-Type", "text/plain") 220 207 w.Header().Set("Cache-Control", "public, max-age=86400") // one day ··· 223 210 Allow: / 224 211 ` 225 212 w.Write([]byte(robotsTxt)) 226 226 - } 227 227 - 228 228 - // https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Manifest 229 229 - const manifestJson = `{ 230 230 - "name": "tangled", 231 231 - "description": "tightly-knit social coding.", 232 232 - "icons": [ 233 233 - { 234 234 - "src": "/favicon.svg", 235 235 - "sizes": "144x144" 236 236 - } 237 237 - ], 238 238 - "start_url": "/", 239 239 - "id": "org.tangled", 240 240 - 241 241 - "display": "standalone", 242 242 - "background_color": "#111827", 243 243 - "theme_color": "#111827" 244 244 - }` 245 245 - 246 246 - func (p *State) PWAManifest(w http.ResponseWriter, r *http.Request) { 247 247 - w.Header().Set("Content-Type", "application/json") 248 248 - w.Write([]byte(manifestJson)) 249 213 } 250 214 251 215 func (s *State) TermsOfService(w http.ResponseWriter, r *http.Request) {

+182

cmd/dolly/main.go

··· 1 1 + package main 2 2 + 3 3 + import ( 4 4 + "bytes" 5 5 + "flag" 6 6 + "fmt" 7 7 + "image" 8 8 + "image/color" 9 9 + "image/png" 10 10 + "os" 11 11 + "path/filepath" 12 12 + "strconv" 13 13 + "strings" 14 14 + "text/template" 15 15 + 16 16 + "github.com/srwiley/oksvg" 17 17 + "github.com/srwiley/rasterx" 18 18 + "golang.org/x/image/draw" 19 19 + "tangled.org/core/appview/pages" 20 20 + "tangled.org/core/ico" 21 21 + ) 22 22 + 23 23 + func main() { 24 24 + var ( 25 25 + size string 26 26 + fillColor string 27 27 + output string 28 28 + ) 29 29 + 30 30 + flag.StringVar(&size, "size", "512x512", "Output size in format WIDTHxHEIGHT (e.g., 512x512)") 31 31 + flag.StringVar(&fillColor, "color", "#000000", "Fill color in hex format (e.g., #FF5733)") 32 32 + flag.StringVar(&output, "output", "dolly.svg", "Output file path (format detected from extension: .svg, .png, or .ico)") 33 33 + flag.Parse() 34 34 + 35 35 + width, height, err := parseSize(size) 36 36 + if err != nil { 37 37 + fmt.Fprintf(os.Stderr, "Error parsing size: %v\n", err) 38 38 + os.Exit(1) 39 39 + } 40 40 + 41 41 + // Detect format from file extension 42 42 + ext := strings.ToLower(filepath.Ext(output)) 43 43 + format := strings.TrimPrefix(ext, ".") 44 44 + 45 45 + if format != "svg" && format != "png" && format != "ico" { 46 46 + fmt.Fprintf(os.Stderr, "Invalid file extension: %s. Must be .svg, .png, or .ico\n", ext) 47 47 + os.Exit(1) 48 48 + } 49 49 + 50 50 + if fillColor != "currentColor" && !isValidHexColor(fillColor) { 51 51 + fmt.Fprintf(os.Stderr, "Invalid color format: %s. Use hex format like #FF5733\n", fillColor) 52 52 + os.Exit(1) 53 53 + } 54 54 + 55 55 + svgData, err := dolly(fillColor) 56 56 + if err != nil { 57 57 + fmt.Fprintf(os.Stderr, "Error generating SVG: %v\n", err) 58 58 + os.Exit(1) 59 59 + } 60 60 + 61 61 + // Create output directory if it doesn't exist 62 62 + dir := filepath.Dir(output) 63 63 + if dir != "" && dir != "." { 64 64 + if err := os.MkdirAll(dir, 0755); err != nil { 65 65 + fmt.Fprintf(os.Stderr, "Error creating output directory: %v\n", err) 66 66 + os.Exit(1) 67 67 + } 68 68 + } 69 69 + 70 70 + switch format { 71 71 + case "svg": 72 72 + err = saveSVG(svgData, output, width, height) 73 73 + case "png": 74 74 + err = savePNG(svgData, output, width, height) 75 75 + case "ico": 76 76 + err = saveICO(svgData, output, width, height) 77 77 + } 78 78 + 79 79 + if err != nil { 80 80 + fmt.Fprintf(os.Stderr, "Error saving file: %v\n", err) 81 81 + os.Exit(1) 82 82 + } 83 83 + 84 84 + fmt.Printf("Successfully generated %s (%dx%d)\n", output, width, height) 85 85 + } 86 86 + 87 87 + func dolly(hexColor string) ([]byte, error) { 88 88 + tpl, err := template.New("dolly"). 89 89 + ParseFS(pages.Files, "templates/fragments/dolly/logo.html") 90 90 + if err != nil { 91 91 + return nil, err 92 92 + } 93 93 + 94 94 + var svgData bytes.Buffer 95 95 + if err := tpl.ExecuteTemplate(&svgData, "fragments/dolly/logo", pages.DollyParams{ 96 96 + FillColor: hexColor, 97 97 + }); err != nil { 98 98 + return nil, err 99 99 + } 100 100 + 101 101 + return svgData.Bytes(), nil 102 102 + } 103 103 + 104 104 + func svgToImage(svgData []byte, w, h int) (image.Image, error) { 105 105 + icon, err := oksvg.ReadIconStream(bytes.NewReader(svgData)) 106 106 + if err != nil { 107 107 + return nil, fmt.Errorf("error parsing SVG: %v", err) 108 108 + } 109 109 + 110 110 + icon.SetTarget(0, 0, float64(w), float64(h)) 111 111 + rgba := image.NewRGBA(image.Rect(0, 0, w, h)) 112 112 + draw.Draw(rgba, rgba.Bounds(), &image.Uniform{color.Transparent}, image.Point{}, draw.Src) 113 113 + scanner := rasterx.NewScannerGV(w, h, rgba, rgba.Bounds()) 114 114 + raster := rasterx.NewDasher(w, h, scanner) 115 115 + icon.Draw(raster, 1.0) 116 116 + 117 117 + return rgba, nil 118 118 + } 119 119 + 120 120 + func parseSize(size string) (int, int, error) { 121 121 + parts := strings.Split(size, "x") 122 122 + if len(parts) != 2 { 123 123 + return 0, 0, fmt.Errorf("invalid size format, use WIDTHxHEIGHT") 124 124 + } 125 125 + 126 126 + width, err := strconv.Atoi(parts[0]) 127 127 + if err != nil { 128 128 + return 0, 0, fmt.Errorf("invalid width: %v", err) 129 129 + } 130 130 + 131 131 + height, err := strconv.Atoi(parts[1]) 132 132 + if err != nil { 133 133 + return 0, 0, fmt.Errorf("invalid height: %v", err) 134 134 + } 135 135 + 136 136 + if width <= 0 || height <= 0 { 137 137 + return 0, 0, fmt.Errorf("width and height must be positive") 138 138 + } 139 139 + 140 140 + return width, height, nil 141 141 + } 142 142 + 143 143 + func isValidHexColor(hex string) bool { 144 144 + if len(hex) != 7 || hex[0] != '#' { 145 145 + return false 146 146 + } 147 147 + _, err := strconv.ParseUint(hex[1:], 16, 32) 148 148 + return err == nil 149 149 + } 150 150 + 151 151 + func saveSVG(svgData []byte, filepath string, _, _ int) error { 152 152 + return os.WriteFile(filepath, svgData, 0644) 153 153 + } 154 154 + 155 155 + func savePNG(svgData []byte, filepath string, width, height int) error { 156 156 + img, err := svgToImage(svgData, width, height) 157 157 + if err != nil { 158 158 + return err 159 159 + } 160 160 + 161 161 + f, err := os.Create(filepath) 162 162 + if err != nil { 163 163 + return err 164 164 + } 165 165 + defer f.Close() 166 166 + 167 167 + return png.Encode(f, img) 168 168 + } 169 169 + 170 170 + func saveICO(svgData []byte, filepath string, width, height int) error { 171 171 + img, err := svgToImage(svgData, width, height) 172 172 + if err != nil { 173 173 + return err 174 174 + } 175 175 + 176 176 + icoData, err := ico.ImageToIco(img) 177 177 + if err != nil { 178 178 + return err 179 179 + } 180 180 + 181 181 + return os.WriteFile(filepath, icoData, 0644) 182 182 + }

+23 -25

docs/DOCS.md

··· 2 2 title: Tangled docs 3 3 author: The Tangled Contributors 4 4 date: 21 Sun, Dec 2025 5 5 - --- 6 6 - 7 7 - # Introduction 8 8 - 9 9 - Tangled is a decentralized code hosting and collaboration 10 10 - platform. Every component of Tangled is open-source and 11 11 - self-hostable. [tangled.org](https://tangled.org) also 12 12 - provides hosting and CI services that are free to use. 5 5 + abstract: | 6 6 + Tangled is a decentralized code hosting and collaboration 7 7 + platform. Every component of Tangled is open-source and 8 8 + self-hostable. [tangled.org](https://tangled.org) also 9 9 + provides hosting and CI services that are free to use. 13 10 14 14 - There are several models for decentralized code 15 15 - collaboration platforms, ranging from ActivityPub’s 16 16 - (Forgejo) federated model, to Radicle’s entirely P2P model. 17 17 - Our approach attempts to be the best of both worlds by 18 18 - adopting the AT Protocol—a protocol for building decentralized 19 19 - social applications with a central identity 11 11 + There are several models for decentralized code 12 12 + collaboration platforms, ranging from ActivityPub’s 13 13 + (Forgejo) federated model, to Radicle’s entirely P2P model. 14 14 + Our approach attempts to be the best of both worlds by 15 15 + adopting the AT Protocol—a protocol for building decentralized 16 16 + social applications with a central identity 20 17 21 21 - Our approach to this is the idea of “knots”. Knots are 22 22 - lightweight, headless servers that enable users to host Git 23 23 - repositories with ease. Knots are designed for either single 24 24 - or multi-tenant use which is perfect for self-hosting on a 25 25 - Raspberry Pi at home, or larger “community” servers. By 26 26 - default, Tangled provides managed knots where you can host 27 27 - your repositories for free. 18 18 + Our approach to this is the idea of “knots”. Knots are 19 19 + lightweight, headless servers that enable users to host Git 20 20 + repositories with ease. Knots are designed for either single 21 21 + or multi-tenant use which is perfect for self-hosting on a 22 22 + Raspberry Pi at home, or larger “community” servers. By 23 23 + default, Tangled provides managed knots where you can host 24 24 + your repositories for free. 28 25 29 29 - The appview at tangled.org acts as a consolidated "view" 30 30 - into the whole network, allowing users to access, clone and 31 31 - contribute to repositories hosted across different knots 32 32 - seamlessly. 26 26 + The appview at tangled.org acts as a consolidated "view" 27 27 + into the whole network, allowing users to access, clone and 28 28 + contribute to repositories hosted across different knots 29 29 + seamlessly. 30 30 + --- 33 31 34 32 # Quick start guide 35 33

+6

docs/logo.html

··· 1 1 + <div class="flex items-center gap-2 w-fit mx-auto"> 2 2 + <span class="w-16 h-16 [&>svg]:w-full [&>svg]:h-full text-black dark:text-white"> 3 3 + ${ dolly.svg() } 4 4 + </span> 5 5 + <span class="font-bold text-4xl not-italic text-black dark:text-white">tangled</span> 6 6 + </div>

+3

docs/mode.html

··· 1 1 + <a class="px-4 py-2 mt-8 block text-center w-full rounded-sm shadow-sm border border-gray-200 dark:border-gray-700 no-underline hover:no-underline" href="$if(single-page)$/$else$/single-page.html$endif$"> 2 2 + $if(single-page)$View as multi-page$else$View as single-page$endif$ 3 3 + </a>

+7

docs/search.html

··· 1 1 + <form action="https://google.com/search" role="search" aria-label="Sitewide" class="w-full"> 2 2 + <input type="hidden" name="q" value="+[inurl:https://docs.tangled.org]"> 3 3 + <label> 4 4 + <span style="display:none;">Search</span> 5 5 + <input type="text" name="q" placeholder="Search docs ..." class="w-full font-normal"> 6 6 + </label> 7 7 + </form>

+76 -35

docs/template.html

··· 37 37 <link rel="preload" href="/static/fonts/InterVariable.woff2" as="font" type="font/woff2" crossorigin /> 38 38 39 39 </head> 40 40 - <body class="bg-white dark:bg-gray-900 min-h-screen flex flex-col min-h-screen"> 40 40 + <body class="bg-white dark:bg-gray-900 flex flex-col min-h-svh"> 41 41 $for(include-before)$ 42 42 $include-before$ 43 43 $endfor$ 44 44 45 45 $if(toc)$ 46 46 - <!-- mobile topbar toc --> 47 47 - <details id="mobile-$idprefix$TOC" role="doc-toc" class="md:hidden bg-gray-50 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 z-50 space-y-4 group px-6 py-4"> 48 48 - <summary class="cursor-pointer list-none text-sm font-semibold select-none flex gap-2 justify-between items-center dark:text-white"> 46 46 + <!-- mobile TOC trigger --> 47 47 + <div class="md:hidden px-6 py-4 border-b border-gray-200 dark:border-gray-700"> 48 48 + <button 49 49 + type="button" 50 50 + popovertarget="mobile-toc-popover" 51 51 + popovertargetaction="toggle" 52 52 + class="w-full flex gap-2 items-center text-sm font-semibold dark:text-white" 53 53 + > 54 54 + ${ menu.svg() } 49 55 $if(toc-title)$$toc-title$$else$Table of Contents$endif$ 50 50 - <span class="group-open:hidden inline">${ menu.svg() }</span> 51 51 - <span class="hidden group-open:inline">${ x.svg() }</span> 52 52 - </summary> 53 53 - ${ table-of-contents:toc.html() } 54 54 - </details> 56 56 + </button> 57 57 + </div> 58 58 + 59 59 + <div 60 60 + id="mobile-toc-popover" 61 61 + popover 62 62 + class="mobile-toc-popover 63 63 + bg-gray-50 dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 64 64 + h-full overflow-y-auto shadow-sm 65 65 + px-6 py-4 fixed inset-x-0 top-0 w-fit max-w-4/5 m-0" 66 66 + > 67 67 + <div class="flex flex-col min-h-full"> 68 68 + <div class="flex-1 space-y-4"> 69 69 + <button 70 70 + type="button" 71 71 + popovertarget="mobile-toc-popover" 72 72 + popovertargetaction="toggle" 73 73 + class="w-full flex gap-2 items-center text-sm font-semibold dark:text-white mb-4"> 74 74 + ${ x.svg() } 75 75 + $if(toc-title)$$toc-title$$else$Table of Contents$endif$ 76 76 + </button> 77 77 + ${ logo.html() } 78 78 + ${ search.html() } 79 79 + ${ table-of-contents:toc.html() } 80 80 + </div> 81 81 + ${ single-page:mode.html() } 82 82 + </div> 83 83 + </div> 84 84 + 55 85 <!-- desktop sidebar toc --> 56 56 - <nav id="$idprefix$TOC" role="doc-toc" class="hidden md:block fixed left-0 top-0 w-80 h-screen bg-gray-50 dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 overflow-y-auto p-4 z-50"> 57 57 - $if(toc-title)$ 58 58 - <h2 id="$idprefix$toc-title" class="text-lg font-semibold mb-4 text-gray-900">$toc-title$</h2> 59 59 - $endif$ 60 60 - ${ table-of-contents:toc.html() } 86 86 + <nav 87 87 + id="$idprefix$TOC" 88 88 + role="doc-toc" 89 89 + class="hidden md:flex md:flex-col gap-4 fixed left-0 top-0 w-80 h-screen 90 90 + bg-gray-50 dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 91 91 + p-4 z-50 overflow-y-auto"> 92 92 + ${ logo.html() } 93 93 + ${ search.html() } 94 94 + <div class="flex-1"> 95 95 + $if(toc-title)$ 96 96 + <h2 id="$idprefix$toc-title" class="text-lg font-semibold mb-4 text-gray-900">$toc-title$</h2> 97 97 + $endif$ 98 98 + ${ table-of-contents:toc.html() } 99 99 + </div> 100 100 + ${ single-page:mode.html() } 61 101 </nav> 62 102 $endif$ 63 103 64 104 <div class="$if(toc)$md:ml-80$endif$ flex-1 flex flex-col"> 65 105 <main class="max-w-4xl w-full mx-auto p-6 flex-1"> 66 106 $if(top)$ 67 67 - $-- only print title block if this is NOT the top page 107 107 + $-- only print title block if this is NOT the top page 68 108 $else$ 69 109 $if(title)$ 70 70 - <header id="title-block-header" class="mb-8 pb-8 border-b border-gray-200 dark:border-gray-700"> 71 71 - <h1 class="text-4xl font-bold mb-2 text-black dark:text-white">$title$</h1> 72 72 - $if(subtitle)$ 73 73 - <p class="text-xl text-gray-500 dark:text-gray-400 mb-2">$subtitle$</p> 74 74 - $endif$ 75 75 - $for(author)$ 76 76 - <p class="text-sm text-gray-500 dark:text-gray-400">$author$</p> 77 77 - $endfor$ 78 78 - $if(date)$ 79 79 - <p class="text-sm text-gray-500 dark:text-gray-400">Updated on $date$</p> 80 80 - $endif$ 81 81 - $if(abstract)$ 82 82 - <div class="mt-6 p-4 bg-gray-50 rounded-lg"> 83 83 - <div class="text-sm font-semibold text-gray-700 uppercase mb-2">$abstract-title$</div> 84 84 - <div class="text-gray-700">$abstract$</div> 85 85 - </div> 86 86 - $endif$ 87 87 - $endif$ 88 88 - </header> 110 110 + <header id="title-block-header" class="mb-8 pb-8 border-b border-gray-200 dark:border-gray-700"> 111 111 + <h1 class="text-4xl font-bold mb-2 text-black dark:text-white">$title$</h1> 112 112 + $if(subtitle)$ 113 113 + <p class="text-xl text-gray-500 dark:text-gray-400 mb-2">$subtitle$</p> 114 114 + $endif$ 115 115 + $for(author)$ 116 116 + <p class="text-sm text-gray-500 dark:text-gray-400">$author$</p> 117 117 + $endfor$ 118 118 + $if(date)$ 119 119 + <p class="text-sm text-gray-500 dark:text-gray-400">Updated on $date$</p> 120 120 + $endif$ 121 121 + $endif$ 122 122 + </header> 123 123 + $endif$ 124 124 + 125 125 + $if(abstract)$ 126 126 + <article class="prose dark:prose-invert max-w-none"> 127 127 + $abstract$ 128 128 + </article> 89 129 $endif$ 130 130 + 90 131 <article class="prose dark:prose-invert max-w-none"> 91 132 $body$ 92 133 </article> 93 134 </main> 94 94 - <nav id="sitenav" class="border-t border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-800 "> 135 135 + <nav id="sitenav" class="border-t border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-800"> 95 136 <div class="max-w-4xl mx-auto px-8 py-4"> 96 137 <div class="flex justify-between gap-4"> 97 138 <span class="flex-1">

+18 -32

flake.nix

··· 76 76 }; 77 77 buildGoApplication = 78 78 (self.callPackage "${gomod2nix}/builder" { 79 79 - gomod2nix = gomod2nix.legacyPackages.${pkgs.system}.gomod2nix; 79 79 + gomod2nix = gomod2nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}.gomod2nix; 80 80 }).buildGoApplication; 81 81 modules = ./nix/gomod2nix.toml; 82 82 sqlite-lib = self.callPackage ./nix/pkgs/sqlite-lib.nix { ··· 94 94 spindle = self.callPackage ./nix/pkgs/spindle.nix {}; 95 95 knot-unwrapped = self.callPackage ./nix/pkgs/knot-unwrapped.nix {}; 96 96 knot = self.callPackage ./nix/pkgs/knot.nix {}; 97 97 - did-method-plc = self.callPackage ./nix/pkgs/did-method-plc.nix {}; 98 98 - bluesky-jetstream = self.callPackage ./nix/pkgs/bluesky-jetstream.nix {}; 99 99 - bluesky-relay = self.callPackage ./nix/pkgs/bluesky-relay.nix {}; 100 100 - tap = self.callPackage ./nix/pkgs/tap.nix {}; 97 97 + dolly = self.callPackage ./nix/pkgs/dolly.nix {}; 101 98 }); 102 99 in { 103 100 overlays.default = final: prev: { 104 104 - inherit (mkPackageSet final) lexgen goat sqlite-lib spindle knot-unwrapped knot appview docs did-method-plc bluesky-jetstream bluesky-relay tap; 101 101 + inherit (mkPackageSet final) lexgen goat sqlite-lib spindle knot-unwrapped knot appview docs dolly; 105 102 }; 106 103 107 104 packages = forAllSystems (system: let ··· 110 107 staticPackages = mkPackageSet pkgs.pkgsStatic; 111 108 crossPackages = mkPackageSet pkgs.pkgsCross.gnu64.pkgsStatic; 112 109 in { 113 113 - inherit (packages) appview appview-static-files lexgen goat spindle knot knot-unwrapped sqlite-lib docs did-method-plc bluesky-jetstream bluesky-relay tap; 110 110 + inherit 111 111 + (packages) 112 112 + appview 113 113 + appview-static-files 114 114 + lexgen 115 115 + goat 116 116 + spindle 117 117 + knot 118 118 + knot-unwrapped 119 119 + sqlite-lib 120 120 + docs 121 121 + dolly 122 122 + ; 114 123 115 124 pkgsStatic-appview = staticPackages.appview; 116 125 pkgsStatic-knot = staticPackages.knot; 117 126 pkgsStatic-knot-unwrapped = staticPackages.knot-unwrapped; 118 127 pkgsStatic-spindle = staticPackages.spindle; 119 128 pkgsStatic-sqlite-lib = staticPackages.sqlite-lib; 129 129 + pkgsStatic-dolly = staticPackages.dolly; 120 130 121 131 pkgsCross-gnu64-pkgsStatic-appview = crossPackages.appview; 122 132 pkgsCross-gnu64-pkgsStatic-knot = crossPackages.knot; 123 133 pkgsCross-gnu64-pkgsStatic-knot-unwrapped = crossPackages.knot-unwrapped; 124 134 pkgsCross-gnu64-pkgsStatic-spindle = crossPackages.spindle; 135 135 + pkgsCross-gnu64-pkgsStatic-dolly = crossPackages.dolly; 125 136 126 137 treefmt-wrapper = pkgs.treefmt.withConfig { 127 138 settings.formatter = { ··· 309 320 imports = [./nix/modules/spindle.nix]; 310 321 311 322 services.tangled.spindle.package = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system}.spindle; 312 312 - services.tangled.spindle.tap-package = lib.mkDefault self.packages.${pkgs.system}.tap; 313 313 - }; 314 314 - nixosModules.did-method-plc = { 315 315 - lib, 316 316 - pkgs, 317 317 - ... 318 318 - }: { 319 319 - imports = [./nix/modules/did-method-plc.nix]; 320 320 - services.did-method-plc.package = lib.mkDefault self.packages.${pkgs.system}.did-method-plc; 321 321 - }; 322 322 - nixosModules.bluesky-relay = { 323 323 - lib, 324 324 - pkgs, 325 325 - ... 326 326 - }: { 327 327 - imports = [./nix/modules/bluesky-relay.nix]; 328 328 - services.bluesky-relay.package = lib.mkDefault self.packages.${pkgs.system}.bluesky-relay; 329 329 - }; 330 330 - nixosModules.bluesky-jetstream = { 331 331 - lib, 332 332 - pkgs, 333 333 - ... 334 334 - }: { 335 335 - imports = [./nix/modules/bluesky-jetstream.nix]; 336 336 - services.bluesky-jetstream.package = lib.mkDefault self.packages.${pkgs.system}.bluesky-jetstream; 337 323 }; 338 324 }; 339 325 }

-1

go.mod

··· 29 29 github.com/gorilla/feeds v1.2.0 30 30 github.com/gorilla/sessions v1.4.0 31 31 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 32 32 - github.com/hashicorp/go-version v1.8.0 33 32 github.com/hiddeco/sshsig v0.2.0 34 33 github.com/hpcloud/tail v1.0.0 35 34 github.com/ipfs/go-cid v0.5.0

-2

go.sum

··· 264 264 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= 265 265 github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw= 266 266 github.com/hashicorp/go-sockaddr v1.0.7/go.mod h1:FZQbEYa1pxkQ7WLpyXJ6cbjpT8q0YgQaK/JakXqGyWw= 267 267 - github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4= 268 268 - github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 269 267 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= 270 268 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= 271 269 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=

+88

ico/ico.go

··· 1 1 + package ico 2 2 + 3 3 + import ( 4 4 + "bytes" 5 5 + "encoding/binary" 6 6 + "fmt" 7 7 + "image" 8 8 + "image/png" 9 9 + ) 10 10 + 11 11 + type IconDir struct { 12 12 + Reserved uint16 // must be 0 13 13 + Type uint16 // 1 for ICO, 2 for CUR 14 14 + Count uint16 // number of images 15 15 + } 16 16 + 17 17 + type IconDirEntry struct { 18 18 + Width uint8 // 0 means 256 19 19 + Height uint8 // 0 means 256 20 20 + ColorCount uint8 21 21 + Reserved uint8 // must be 0 22 22 + ColorPlanes uint16 // 0 or 1 23 23 + BitsPerPixel uint16 24 24 + SizeInBytes uint32 25 25 + Offset uint32 26 26 + } 27 27 + 28 28 + func ImageToIco(img image.Image) ([]byte, error) { 29 29 + // encode image as png 30 30 + var pngBuf bytes.Buffer 31 31 + if err := png.Encode(&pngBuf, img); err != nil { 32 32 + return nil, fmt.Errorf("failed to encode PNG: %w", err) 33 33 + } 34 34 + pngData := pngBuf.Bytes() 35 35 + 36 36 + // get image dimensions 37 37 + bounds := img.Bounds() 38 38 + width := bounds.Dx() 39 39 + height := bounds.Dy() 40 40 + 41 41 + // prepare output buffer 42 42 + var icoBuf bytes.Buffer 43 43 + 44 44 + iconDir := IconDir{ 45 45 + Reserved: 0, 46 46 + Type: 1, // ICO format 47 47 + Count: 1, // One image 48 48 + } 49 49 + 50 50 + w := uint8(width) 51 51 + h := uint8(height) 52 52 + 53 53 + // width/height of 256 should be stored as 0 54 54 + if width == 256 { 55 55 + w = 0 56 56 + } 57 57 + if height == 256 { 58 58 + h = 0 59 59 + } 60 60 + 61 61 + iconDirEntry := IconDirEntry{ 62 62 + Width: w, 63 63 + Height: h, 64 64 + ColorCount: 0, // 0 for PNG (32-bit) 65 65 + Reserved: 0, 66 66 + ColorPlanes: 1, 67 67 + BitsPerPixel: 32, // PNG with alpha 68 68 + SizeInBytes: uint32(len(pngData)), 69 69 + Offset: 6 + 16, // Size of ICONDIR + ICONDIRENTRY 70 70 + } 71 71 + 72 72 + // write IconDir 73 73 + if err := binary.Write(&icoBuf, binary.LittleEndian, iconDir); err != nil { 74 74 + return nil, fmt.Errorf("failed to write ICONDIR: %w", err) 75 75 + } 76 76 + 77 77 + // write IconDirEntry 78 78 + if err := binary.Write(&icoBuf, binary.LittleEndian, iconDirEntry); err != nil { 79 79 + return nil, fmt.Errorf("failed to write ICONDIRENTRY: %w", err) 80 80 + } 81 81 + 82 82 + // write PNG data directly 83 83 + if _, err := icoBuf.Write(pngData); err != nil { 84 84 + return nil, fmt.Errorf("failed to write PNG data: %w", err) 85 85 + } 86 86 + 87 87 + return icoBuf.Bytes(), nil 88 88 + }

+1

input.css

··· 255 255 @apply py-1 text-gray-900 dark:text-gray-100; 256 256 } 257 257 } 258 258 + 258 259 } 259 260 260 261 /* Background */

+136

knotserver/ingester.go

··· 7 7 "io" 8 8 "net/http" 9 9 "net/url" 10 10 + "path/filepath" 10 11 "strings" 11 12 12 13 comatproto "github.com/bluesky-social/indigo/api/atproto" ··· 16 17 securejoin "github.com/cyphar/filepath-securejoin" 17 18 "tangled.org/core/api/tangled" 18 19 "tangled.org/core/knotserver/db" 20 20 + "tangled.org/core/knotserver/git" 19 21 "tangled.org/core/log" 20 22 "tangled.org/core/rbac" 23 23 + "tangled.org/core/workflow" 21 24 ) 22 25 23 26 func (h *Knot) processPublicKey(ctx context.Context, event *models.Event) error { ··· 82 85 return nil 83 86 } 84 87 88 88 + func (h *Knot) processPull(ctx context.Context, event *models.Event) error { 89 89 + raw := json.RawMessage(event.Commit.Record) 90 90 + did := event.Did 91 91 + 92 92 + var record tangled.RepoPull 93 93 + if err := json.Unmarshal(raw, &record); err != nil { 94 94 + return fmt.Errorf("failed to unmarshal record: %w", err) 95 95 + } 96 96 + 97 97 + l := log.FromContext(ctx) 98 98 + l = l.With("handler", "processPull") 99 99 + l = l.With("did", did) 100 100 + 101 101 + if record.Target == nil { 102 102 + return fmt.Errorf("ignoring pull record: target repo is nil") 103 103 + } 104 104 + 105 105 + l = l.With("target_repo", record.Target.Repo) 106 106 + l = l.With("target_branch", record.Target.Branch) 107 107 + 108 108 + if record.Source == nil { 109 109 + return fmt.Errorf("ignoring pull record: not a branch-based pull request") 110 110 + } 111 111 + 112 112 + if record.Source.Repo != nil { 113 113 + return fmt.Errorf("ignoring pull record: fork based pull") 114 114 + } 115 115 + 116 116 + repoAt, err := syntax.ParseATURI(record.Target.Repo) 117 117 + if err != nil { 118 118 + return fmt.Errorf("failed to parse ATURI: %w", err) 119 119 + } 120 120 + 121 121 + // resolve this aturi to extract the repo record 122 122 + ident, err := h.resolver.ResolveIdent(ctx, repoAt.Authority().String()) 123 123 + if err != nil || ident.Handle.IsInvalidHandle() { 124 124 + return fmt.Errorf("failed to resolve handle: %w", err) 125 125 + } 126 126 + 127 127 + xrpcc := xrpc.Client{ 128 128 + Host: ident.PDSEndpoint(), 129 129 + } 130 130 + 131 131 + resp, err := comatproto.RepoGetRecord(ctx, &xrpcc, "", tangled.RepoNSID, repoAt.Authority().String(), repoAt.RecordKey().String()) 132 132 + if err != nil { 133 133 + return fmt.Errorf("failed to resolver repo: %w", err) 134 134 + } 135 135 + 136 136 + repo := resp.Value.Val.(*tangled.Repo) 137 137 + 138 138 + if repo.Knot != h.c.Server.Hostname { 139 139 + return fmt.Errorf("rejected pull record: not this knot, %s != %s", repo.Knot, h.c.Server.Hostname) 140 140 + } 141 141 + 142 142 + didSlashRepo, err := securejoin.SecureJoin(ident.DID.String(), repo.Name) 143 143 + if err != nil { 144 144 + return fmt.Errorf("failed to construct relative repo path: %w", err) 145 145 + } 146 146 + 147 147 + repoPath, err := securejoin.SecureJoin(h.c.Repo.ScanPath, didSlashRepo) 148 148 + if err != nil { 149 149 + return fmt.Errorf("failed to construct absolute repo path: %w", err) 150 150 + } 151 151 + 152 152 + gr, err := git.Open(repoPath, record.Source.Sha) 153 153 + if err != nil { 154 154 + return fmt.Errorf("failed to open git repository: %w", err) 155 155 + } 156 156 + 157 157 + workflowDir, err := gr.FileTree(ctx, workflow.WorkflowDir) 158 158 + if err != nil { 159 159 + return fmt.Errorf("failed to open workflow directory: %w", err) 160 160 + } 161 161 + 162 162 + var pipeline workflow.RawPipeline 163 163 + for _, e := range workflowDir { 164 164 + if !e.IsFile() { 165 165 + continue 166 166 + } 167 167 + 168 168 + fpath := filepath.Join(workflow.WorkflowDir, e.Name) 169 169 + contents, err := gr.RawContent(fpath) 170 170 + if err != nil { 171 171 + continue 172 172 + } 173 173 + 174 174 + pipeline = append(pipeline, workflow.RawWorkflow{ 175 175 + Name: e.Name, 176 176 + Contents: contents, 177 177 + }) 178 178 + } 179 179 + 180 180 + trigger := tangled.Pipeline_PullRequestTriggerData{ 181 181 + Action: "create", 182 182 + SourceBranch: record.Source.Branch, 183 183 + SourceSha: record.Source.Sha, 184 184 + TargetBranch: record.Target.Branch, 185 185 + } 186 186 + 187 187 + compiler := workflow.Compiler{ 188 188 + Trigger: tangled.Pipeline_TriggerMetadata{ 189 189 + Kind: string(workflow.TriggerKindPullRequest), 190 190 + PullRequest: &trigger, 191 191 + Repo: &tangled.Pipeline_TriggerRepo{ 192 192 + Did: ident.DID.String(), 193 193 + Knot: repo.Knot, 194 194 + Repo: repo.Name, 195 195 + }, 196 196 + }, 197 197 + } 198 198 + 199 199 + cp := compiler.Compile(compiler.Parse(pipeline)) 200 200 + eventJson, err := json.Marshal(cp) 201 201 + if err != nil { 202 202 + return fmt.Errorf("failed to marshal pipeline event: %w", err) 203 203 + } 204 204 + 205 205 + // do not run empty pipelines 206 206 + if cp.Workflows == nil { 207 207 + return nil 208 208 + } 209 209 + 210 210 + ev := db.Event{ 211 211 + Rkey: TID(), 212 212 + Nsid: tangled.PipelineNSID, 213 213 + EventJson: string(eventJson), 214 214 + } 215 215 + 216 216 + return h.db.InsertEvent(ev, h.n) 217 217 + } 218 218 + 85 219 // duplicated from add collaborator 86 220 func (h *Knot) processCollaborator(ctx context.Context, event *models.Event) error { 87 221 raw := json.RawMessage(event.Commit.Record) ··· 204 338 err = h.processPublicKey(ctx, event) 205 339 case tangled.KnotMemberNSID: 206 340 err = h.processKnotMember(ctx, event) 341 341 + case tangled.RepoPullNSID: 342 342 + err = h.processPull(ctx, event) 207 343 case tangled.RepoCollaboratorNSID: 208 344 err = h.processCollaborator(ctx, event) 209 345 }

+109 -1

knotserver/internal.go

··· 23 23 "tangled.org/core/log" 24 24 "tangled.org/core/notifier" 25 25 "tangled.org/core/rbac" 26 26 + "tangled.org/core/workflow" 26 27 ) 27 28 28 29 type InternalHandle struct { ··· 175 176 } 176 177 177 178 for _, line := range lines { 178 178 - // TODO: pass pushOptions to refUpdate 179 179 err := h.insertRefUpdate(line, gitUserDid, repoDid, repoName) 180 180 if err != nil { 181 181 l.Error("failed to insert op", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir) ··· 185 185 err = h.emitCompareLink(&resp.Messages, line, repoDid, repoName) 186 186 if err != nil { 187 187 l.Error("failed to reply with compare link", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir) 188 188 + // non-fatal 189 189 + } 190 190 + 191 191 + err = h.triggerPipeline(&resp.Messages, line, gitUserDid, repoDid, repoName, pushOptions) 192 192 + if err != nil { 193 193 + l.Error("failed to trigger pipeline", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir) 188 194 // non-fatal 189 195 } 190 196 } ··· 235 241 } 236 242 237 243 return errors.Join(errs, h.db.InsertEvent(event, h.n)) 244 244 + } 245 245 + 246 246 + func (h *InternalHandle) triggerPipeline( 247 247 + clientMsgs *[]string, 248 248 + line git.PostReceiveLine, 249 249 + gitUserDid string, 250 250 + repoDid string, 251 251 + repoName string, 252 252 + pushOptions PushOptions, 253 253 + ) error { 254 254 + if pushOptions.skipCi { 255 255 + return nil 256 256 + } 257 257 + 258 258 + didSlashRepo, err := securejoin.SecureJoin(repoDid, repoName) 259 259 + if err != nil { 260 260 + return err 261 261 + } 262 262 + 263 263 + repoPath, err := securejoin.SecureJoin(h.c.Repo.ScanPath, didSlashRepo) 264 264 + if err != nil { 265 265 + return err 266 266 + } 267 267 + 268 268 + gr, err := git.Open(repoPath, line.Ref) 269 269 + if err != nil { 270 270 + return err 271 271 + } 272 272 + 273 273 + workflowDir, err := gr.FileTree(context.Background(), workflow.WorkflowDir) 274 274 + if err != nil { 275 275 + return err 276 276 + } 277 277 + 278 278 + var pipeline workflow.RawPipeline 279 279 + for _, e := range workflowDir { 280 280 + if !e.IsFile() { 281 281 + continue 282 282 + } 283 283 + 284 284 + fpath := filepath.Join(workflow.WorkflowDir, e.Name) 285 285 + contents, err := gr.RawContent(fpath) 286 286 + if err != nil { 287 287 + continue 288 288 + } 289 289 + 290 290 + pipeline = append(pipeline, workflow.RawWorkflow{ 291 291 + Name: e.Name, 292 292 + Contents: contents, 293 293 + }) 294 294 + } 295 295 + 296 296 + trigger := tangled.Pipeline_PushTriggerData{ 297 297 + Ref: line.Ref, 298 298 + OldSha: line.OldSha.String(), 299 299 + NewSha: line.NewSha.String(), 300 300 + } 301 301 + 302 302 + compiler := workflow.Compiler{ 303 303 + Trigger: tangled.Pipeline_TriggerMetadata{ 304 304 + Kind: string(workflow.TriggerKindPush), 305 305 + Push: &trigger, 306 306 + Repo: &tangled.Pipeline_TriggerRepo{ 307 307 + Did: repoDid, 308 308 + Knot: h.c.Server.Hostname, 309 309 + Repo: repoName, 310 310 + }, 311 311 + }, 312 312 + } 313 313 + 314 314 + cp := compiler.Compile(compiler.Parse(pipeline)) 315 315 + eventJson, err := json.Marshal(cp) 316 316 + if err != nil { 317 317 + return err 318 318 + } 319 319 + 320 320 + for _, e := range compiler.Diagnostics.Errors { 321 321 + *clientMsgs = append(*clientMsgs, e.String()) 322 322 + } 323 323 + 324 324 + if pushOptions.verboseCi { 325 325 + if compiler.Diagnostics.IsEmpty() { 326 326 + *clientMsgs = append(*clientMsgs, "success: pipeline compiled with no diagnostics") 327 327 + } 328 328 + 329 329 + for _, w := range compiler.Diagnostics.Warnings { 330 330 + *clientMsgs = append(*clientMsgs, w.String()) 331 331 + } 332 332 + } 333 333 + 334 334 + // do not run empty pipelines 335 335 + if cp.Workflows == nil { 336 336 + return nil 337 337 + } 338 338 + 339 339 + event := db.Event{ 340 340 + Rkey: TID(), 341 341 + Nsid: tangled.PipelineNSID, 342 342 + EventJson: string(eventJson), 343 343 + } 344 344 + 345 345 + return h.db.InsertEvent(event, h.n) 238 346 } 239 347 240 348 func (h *InternalHandle) emitCompareLink(

+1

knotserver/server.go

··· 79 79 jc, err := jetstream.NewJetstreamClient(c.Server.JetstreamEndpoint, "knotserver", []string{ 80 80 tangled.PublicKeyNSID, 81 81 tangled.KnotMemberNSID, 82 82 + tangled.RepoPullNSID, 82 83 tangled.RepoCollaboratorNSID, 83 84 }, nil, log.SubLogger(logger, "jetstream"), db, true, c.Server.LogDids) 84 85 if err != nil {

-33

lexicons/pipeline/cancelPipeline.json

··· 1 1 - { 2 2 - "lexicon": 1, 3 3 - "id": "sh.tangled.pipeline.cancelPipeline", 4 4 - "defs": { 5 5 - "main": { 6 6 - "type": "procedure", 7 7 - "description": "Cancel a running pipeline", 8 8 - "input": { 9 9 - "encoding": "application/json", 10 10 - "schema": { 11 11 - "type": "object", 12 12 - "required": ["repo", "pipeline", "workflow"], 13 13 - "properties": { 14 14 - "repo": { 15 15 - "type": "string", 16 16 - "format": "at-uri", 17 17 - "description": "repo at-uri, spindle can't resolve repo from pipeline at-uri yet" 18 18 - }, 19 19 - "pipeline": { 20 20 - "type": "string", 21 21 - "format": "at-uri", 22 22 - "description": "pipeline at-uri" 23 23 - }, 24 24 - "workflow": { 25 25 - "type": "string", 26 26 - "description": "workflow name" 27 27 - } 28 28 - } 29 29 - } 30 30 - } 31 31 - } 32 32 - } 33 33 - }

+10 -2

lexicons/pulls/pull.json

··· 12 12 "required": [ 13 13 "target", 14 14 "title", 15 15 - "patch", 15 15 + "patchBlob", 16 16 "createdAt" 17 17 ], 18 18 "properties": { ··· 27 27 "type": "string" 28 28 }, 29 29 "patch": { 30 30 - "type": "string" 30 30 + "type": "string", 31 31 + "description": "(deprecated) use patchBlob instead" 32 32 + }, 33 33 + "patchBlob": { 34 34 + "type": "blob", 35 35 + "accept": [ 36 36 + "text/x-patch" 37 37 + ], 38 38 + "description": "patch content" 31 39 }, 32 40 "source": { 33 41 "type": "ref",

-3

nix/gomod2nix.toml

··· 304 304 [mod."github.com/hashicorp/go-sockaddr"] 305 305 version = "v1.0.7" 306 306 hash = "sha256-p6eDOrGzN1jMmT/F/f/VJMq0cKNFhUcEuVVwTE6vSrs=" 307 307 - [mod."github.com/hashicorp/go-version"] 308 308 - version = "v1.8.0" 309 309 - hash = "sha256-KXtqERmYrWdpqPCViWcHbe6jnuH7k16bvBIcuJuevj8=" 310 307 [mod."github.com/hashicorp/golang-lru"] 311 308 version = "v1.0.2" 312 309 hash = "sha256-yy+5botc6T5wXgOe2mfNXJP3wr+MkVlUZ2JBkmmrA48="

-64

nix/modules/bluesky-jetstream.nix

··· 1 1 - { 2 2 - config, 3 3 - pkgs, 4 4 - lib, 5 5 - ... 6 6 - }: let 7 7 - cfg = config.services.bluesky-jetstream; 8 8 - in 9 9 - with lib; { 10 10 - options.services.bluesky-jetstream = { 11 11 - enable = mkEnableOption "jetstream server"; 12 12 - package = mkPackageOption pkgs "bluesky-jetstream" {}; 13 13 - 14 14 - # dataDir = mkOption { 15 15 - # type = types.str; 16 16 - # default = "/var/lib/jetstream"; 17 17 - # description = "directory to store data (pebbleDB)"; 18 18 - # }; 19 19 - livenessTtl = mkOption { 20 20 - type = types.int; 21 21 - default = 15; 22 22 - description = "time to restart when no event detected (seconds)"; 23 23 - }; 24 24 - websocketUrl = mkOption { 25 25 - type = types.str; 26 26 - default = "wss://bsky.network/xrpc/com.atproto.sync.subscribeRepos"; 27 27 - description = "full websocket path to the ATProto SubscribeRepos XRPC endpoint"; 28 28 - }; 29 29 - }; 30 30 - config = mkIf cfg.enable { 31 31 - systemd.services.bluesky-jetstream = { 32 32 - description = "bluesky jetstream"; 33 33 - after = ["network.target" "pds.service"]; 34 34 - wantedBy = ["multi-user.target"]; 35 35 - 36 36 - serviceConfig = { 37 37 - User = "jetstream"; 38 38 - Group = "jetstream"; 39 39 - StateDirectory = "jetstream"; 40 40 - StateDirectoryMode = "0755"; 41 41 - # preStart = '' 42 42 - # mkdir -p "${cfg.dataDir}" 43 43 - # chown -R jetstream:jetstream "${cfg.dataDir}" 44 44 - # ''; 45 45 - # WorkingDirectory = cfg.dataDir; 46 46 - Environment = [ 47 47 - "JETSTREAM_DATA_DIR=/var/lib/jetstream/data" 48 48 - "JETSTREAM_LIVENESS_TTL=${toString cfg.livenessTtl}s" 49 49 - "JETSTREAM_WS_URL=${cfg.websocketUrl}" 50 50 - ]; 51 51 - ExecStart = getExe cfg.package; 52 52 - Restart = "always"; 53 53 - RestartSec = 5; 54 54 - }; 55 55 - }; 56 56 - users = { 57 57 - users.jetstream = { 58 58 - group = "jetstream"; 59 59 - isSystemUser = true; 60 60 - }; 61 61 - groups.jetstream = {}; 62 62 - }; 63 63 - }; 64 64 - }

-48

nix/modules/bluesky-relay.nix

··· 1 1 - { 2 2 - config, 3 3 - pkgs, 4 4 - lib, 5 5 - ... 6 6 - }: let 7 7 - cfg = config.services.bluesky-relay; 8 8 - in 9 9 - with lib; { 10 10 - options.services.bluesky-relay = { 11 11 - enable = mkEnableOption "relay server"; 12 12 - package = mkPackageOption pkgs "bluesky-relay" {}; 13 13 - }; 14 14 - config = mkIf cfg.enable { 15 15 - systemd.services.bluesky-relay = { 16 16 - description = "bluesky relay"; 17 17 - after = ["network.target" "pds.service"]; 18 18 - wantedBy = ["multi-user.target"]; 19 19 - 20 20 - serviceConfig = { 21 21 - User = "relay"; 22 22 - Group = "relay"; 23 23 - StateDirectory = "relay"; 24 24 - StateDirectoryMode = "0755"; 25 25 - Environment = [ 26 26 - "RELAY_ADMIN_PASSWORD=password" 27 27 - "RELAY_PLC_HOST=https://plc.tngl.boltless.dev" 28 28 - "DATABASE_URL=sqlite:///var/lib/relay/relay.sqlite" 29 29 - "RELAY_IP_BIND=:2470" 30 30 - "RELAY_PERSIST_DIR=/var/lib/relay" 31 31 - "RELAY_DISABLE_REQUEST_CRAWL=0" 32 32 - "RELAY_INITIAL_SEQ_NUMBER=1" 33 33 - "RELAY_ALLOW_INSECURE_HOSTS=1" 34 34 - ]; 35 35 - ExecStart = "${getExe cfg.package} serve"; 36 36 - Restart = "always"; 37 37 - RestartSec = 5; 38 38 - }; 39 39 - }; 40 40 - users = { 41 41 - users.relay = { 42 42 - group = "relay"; 43 43 - isSystemUser = true; 44 44 - }; 45 45 - groups.relay = {}; 46 46 - }; 47 47 - }; 48 48 - }

-76

nix/modules/did-method-plc.nix

··· 1 1 - { 2 2 - config, 3 3 - pkgs, 4 4 - lib, 5 5 - ... 6 6 - }: let 7 7 - cfg = config.services.did-method-plc; 8 8 - in 9 9 - with lib; { 10 10 - options.services.did-method-plc = { 11 11 - enable = mkEnableOption "did-method-plc server"; 12 12 - package = mkPackageOption pkgs "did-method-plc" {}; 13 13 - }; 14 14 - config = mkIf cfg.enable { 15 15 - services.postgresql = { 16 16 - enable = true; 17 17 - package = pkgs.postgresql_14; 18 18 - ensureDatabases = ["plc"]; 19 19 - ensureUsers = [ 20 20 - { 21 21 - name = "pg"; 22 22 - # ensurePermissions."DATABASE plc" = "ALL PRIVILEGES"; 23 23 - } 24 24 - ]; 25 25 - authentication = '' 26 26 - local all all trust 27 27 - host all all 127.0.0.1/32 trust 28 28 - ''; 29 29 - }; 30 30 - systemd.services.did-method-plc = { 31 31 - description = "did-method-plc"; 32 32 - 33 33 - after = ["postgresql.service"]; 34 34 - wants = ["postgresql.service"]; 35 35 - wantedBy = ["multi-user.target"]; 36 36 - 37 37 - environment = let 38 38 - db_creds_json = builtins.toJSON { 39 39 - username = "pg"; 40 40 - password = ""; 41 41 - host = "127.0.0.1"; 42 42 - port = 5432; 43 43 - }; 44 44 - in { 45 45 - # TODO: inherit from config 46 46 - DEBUG_MODE = "1"; 47 47 - LOG_ENABLED = "true"; 48 48 - LOG_LEVEL = "debug"; 49 49 - LOG_DESTINATION = "1"; 50 50 - ENABLE_MIGRATIONS = "true"; 51 51 - DB_CREDS_JSON = db_creds_json; 52 52 - DB_MIGRATE_CREDS_JSON = db_creds_json; 53 53 - PLC_VERSION = "0.0.1"; 54 54 - PORT = "8080"; 55 55 - }; 56 56 - 57 57 - serviceConfig = { 58 58 - ExecStart = getExe cfg.package; 59 59 - User = "plc"; 60 60 - Group = "plc"; 61 61 - StateDirectory = "plc"; 62 62 - StateDirectoryMode = "0755"; 63 63 - Restart = "always"; 64 64 - 65 65 - # Hardening 66 66 - }; 67 67 - }; 68 68 - users = { 69 69 - users.plc = { 70 70 - group = "plc"; 71 71 - isSystemUser = true; 72 72 - }; 73 73 - groups.plc = {}; 74 74 - }; 75 75 - }; 76 76 - }

+12 -46

nix/modules/spindle.nix

··· 1 1 { 2 2 config, 3 3 - pkgs, 4 3 lib, 5 4 ... 6 5 }: let ··· 18 17 type = types.package; 19 18 description = "Package to use for the spindle"; 20 19 }; 21 21 - tap-package = mkOption { 22 22 - type = types.package; 23 23 - description = "Package to use for the spindle"; 24 24 - }; 25 25 - 26 26 - atpRelayUrl = mkOption { 27 27 - type = types.str; 28 28 - default = "https://relay1.us-east.bsky.network"; 29 29 - description = "atproto relay"; 30 30 - }; 31 20 32 21 server = { 33 22 listenAddr = mkOption { ··· 36 25 description = "Address to listen on"; 37 26 }; 38 27 39 39 - stateDir = mkOption { 28 28 + dbPath = mkOption { 40 29 type = types.path; 41 41 - default = "/var/lib/spindle"; 42 42 - description = "Tangled spindle data directory"; 30 30 + default = "/var/lib/spindle/spindle.db"; 31 31 + description = "Path to the database file"; 43 32 }; 44 33 45 34 hostname = mkOption { ··· 52 41 type = types.str; 53 42 default = "https://plc.directory"; 54 43 description = "atproto PLC directory"; 44 44 + }; 45 45 + 46 46 + jetstreamEndpoint = mkOption { 47 47 + type = types.str; 48 48 + default = "wss://jetstream1.us-west.bsky.network/subscribe"; 49 49 + description = "Jetstream endpoint to subscribe to"; 55 50 }; 56 51 57 52 dev = mkOption { ··· 119 114 config = mkIf cfg.enable { 120 115 virtualisation.docker.enable = true; 121 116 122 122 - systemd.services.spindle-tap = { 123 123 - description = "spindle tap service"; 124 124 - after = ["network.target" "docker.service"]; 125 125 - wantedBy = ["multi-user.target"]; 126 126 - serviceConfig = { 127 127 - LogsDirectory = "spindle-tap"; 128 128 - StateDirectory = "spindle-tap"; 129 129 - Environment = [ 130 130 - "TAP_BIND=:2480" 131 131 - "TAP_PLC_URL=${cfg.server.plcUrl}" 132 132 - "TAP_RELAY_URL=${cfg.atpRelayUrl}" 133 133 - "TAP_DATABASE_URL=sqlite:///var/lib/spindle-tap/tap.db" 134 134 - "TAP_RETRY_TIMEOUT=3s" 135 135 - "TAP_COLLECTION_FILTERS=${concatStringsSep "," [ 136 136 - "sh.tangled.repo" 137 137 - "sh.tangled.repo.collaborator" 138 138 - "sh.tangled.spindle.member" 139 139 - "sh.tangled.repo.pull" 140 140 - ]}" 141 141 - # temporary hack to listen for repo.pull from non-tangled users 142 142 - "TAP_SIGNAL_COLLECTION=sh.tangled.repo.pull" 143 143 - ]; 144 144 - ExecStart = "${getExe cfg.tap-package} run"; 145 145 - }; 146 146 - }; 147 147 - 148 117 systemd.services.spindle = { 149 118 description = "spindle service"; 150 150 - after = ["network.target" "docker.service" "spindle-tap.service"]; 119 119 + after = ["network.target" "docker.service"]; 151 120 wantedBy = ["multi-user.target"]; 152 152 - path = [ 153 153 - pkgs.git 154 154 - ]; 155 121 serviceConfig = { 156 122 LogsDirectory = "spindle"; 157 123 StateDirectory = "spindle"; 158 124 Environment = [ 159 125 "SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}" 160 160 - "SPINDLE_SERVER_DATA_DIR=${cfg.server.stateDir}" 126 126 + "SPINDLE_SERVER_DB_PATH=${cfg.server.dbPath}" 161 127 "SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}" 162 128 "SPINDLE_SERVER_PLC_URL=${cfg.server.plcUrl}" 129 129 + "SPINDLE_SERVER_JETSTREAM_ENDPOINT=${cfg.server.jetstreamEndpoint}" 163 130 "SPINDLE_SERVER_DEV=${lib.boolToString cfg.server.dev}" 164 131 "SPINDLE_SERVER_OWNER=${cfg.server.owner}" 165 132 "SPINDLE_SERVER_MAX_JOB_COUNT=${toString cfg.server.maxJobCount}" ··· 167 134 "SPINDLE_SERVER_SECRETS_PROVIDER=${cfg.server.secrets.provider}" 168 135 "SPINDLE_SERVER_SECRETS_OPENBAO_PROXY_ADDR=${cfg.server.secrets.openbao.proxyAddr}" 169 136 "SPINDLE_SERVER_SECRETS_OPENBAO_MOUNT=${cfg.server.secrets.openbao.mount}" 170 170 - "SPINDLE_SERVER_TAP_URL=http://localhost:2480" 171 137 "SPINDLE_NIXERY_PIPELINES_NIXERY=${cfg.pipelines.nixery}" 172 138 "SPINDLE_NIXERY_PIPELINES_WORKFLOW_TIMEOUT=${cfg.pipelines.workflowTimeout}" 173 139 ];

+6 -1

nix/pkgs/appview-static-files.nix

··· 8 8 actor-typeahead-src, 9 9 sqlite-lib, 10 10 tailwindcss, 11 11 + dolly, 11 12 src, 12 13 }: 13 14 runCommandLocal "appview-static-files" { ··· 17 18 (allow file-read* (subpath "/System/Library/OpenSSL")) 18 19 ''; 19 20 } '' 20 20 - mkdir -p $out/{fonts,icons} && cd $out 21 21 + mkdir -p $out/{fonts,icons,logos} && cd $out 21 22 cp -f ${htmx-src} htmx.min.js 22 23 cp -f ${htmx-ws-src} htmx-ext-ws.min.js 23 24 cp -rf ${lucide-src}/*.svg icons/ ··· 26 27 cp -f ${inter-fonts-src}/InterVariable*.ttf fonts/ 27 28 cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono*.woff2 fonts/ 28 29 cp -f ${actor-typeahead-src}/actor-typeahead.js . 30 30 + 31 31 + ${dolly}/bin/dolly -output logos/dolly.png -size 180x180 32 32 + ${dolly}/bin/dolly -output logos/dolly.ico -size 48x48 33 33 + ${dolly}/bin/dolly -output logos/dolly.svg -color currentColor 29 34 # tailwindcss -c $src/tailwind.config.js -i $src/input.css -o tw.css won't work 30 35 # for whatever reason (produces broken css), so we are doing this instead 31 36 cd ${src} && ${tailwindcss}/bin/tailwindcss -i input.css -o $out/tw.css

-20

nix/pkgs/bluesky-jetstream.nix

··· 1 1 - { 2 2 - buildGoModule, 3 3 - fetchFromGitHub, 4 4 - }: 5 5 - buildGoModule { 6 6 - pname = "bluesky-jetstream"; 7 7 - version = "0.1.0"; 8 8 - src = fetchFromGitHub { 9 9 - owner = "bluesky-social"; 10 10 - repo = "jetstream"; 11 11 - rev = "7d7efa58d7f14101a80ccc4f1085953948b7d5de"; 12 12 - sha256 = "sha256-1e9SL/8gaDPMA4YZed51ffzgpkptbMd0VTbTTDbPTFw="; 13 13 - }; 14 14 - subPackages = ["cmd/jetstream"]; 15 15 - vendorHash = "sha256-/21XJQH6fo9uPzlABUAbdBwt1O90odmppH6gXu2wkiQ="; 16 16 - doCheck = false; 17 17 - meta = { 18 18 - mainProgram = "jetstream"; 19 19 - }; 20 20 - }

-20

nix/pkgs/bluesky-relay.nix

··· 1 1 - { 2 2 - buildGoModule, 3 3 - fetchFromGitHub, 4 4 - }: 5 5 - buildGoModule { 6 6 - pname = "bluesky-relay"; 7 7 - version = "0.1.0"; 8 8 - src = fetchFromGitHub { 9 9 - owner = "boltlessengineer"; 10 10 - repo = "indigo"; 11 11 - rev = "7fe70a304d795b998f354d2b7b2050b909709c99"; 12 12 - sha256 = "sha256-+h34x67cqH5t30+8rua53/ucvbn3BanrmH0Og3moHok="; 13 13 - }; 14 14 - subPackages = ["cmd/relay"]; 15 15 - vendorHash = "sha256-UOedwNYnM8Jx6B7Y9tFcZX8IeUBESAFAPTRYk7n0yo8="; 16 16 - doCheck = false; 17 17 - meta = { 18 18 - mainProgram = "relay"; 19 19 - }; 20 20 - }

-65

nix/pkgs/did-method-plc.nix

··· 1 1 - # inspired by https://github.com/NixOS/nixpkgs/blob/333bfb7c258fab089a834555ea1c435674c459b4/pkgs/by-name/ga/gatsby-cli/package.nix 2 2 - { 3 3 - lib, 4 4 - stdenv, 5 5 - fetchFromGitHub, 6 6 - fetchYarnDeps, 7 7 - yarnConfigHook, 8 8 - yarnBuildHook, 9 9 - nodejs, 10 10 - makeBinaryWrapper, 11 11 - }: 12 12 - stdenv.mkDerivation (finalAttrs: { 13 13 - pname = "did-method-plc"; 14 14 - version = "0.0.1"; 15 15 - 16 16 - src = fetchFromGitHub { 17 17 - owner = "did-method-plc"; 18 18 - repo = "did-method-plc"; 19 19 - rev = "158ba5535ac3da4fd4309954bde41deab0b45972"; 20 20 - sha256 = "sha256-O5smubbrnTDMCvL6iRyMXkddr5G7YHxkQRVMRULHanQ="; 21 21 - }; 22 22 - postPatch = '' 23 23 - # remove dd-trace dependency 24 24 - sed -i '3d' packages/server/service/index.js 25 25 - ''; 26 26 - 27 27 - yarnOfflineCache = fetchYarnDeps { 28 28 - yarnLock = finalAttrs.src + "/yarn.lock"; 29 29 - hash = "sha256-g8GzaAbWSnWwbQjJMV2DL5/ZlWCCX0sRkjjvX3tqU4Y="; 30 30 - }; 31 31 - 32 32 - nativeBuildInputs = [ 33 33 - yarnConfigHook 34 34 - yarnBuildHook 35 35 - nodejs 36 36 - makeBinaryWrapper 37 37 - ]; 38 38 - yarnBuildScript = "lerna"; 39 39 - yarnBuildFlags = [ 40 40 - "run" 41 41 - "build" 42 42 - "--scope" 43 43 - "@did-plc/server" 44 44 - "--include-dependencies" 45 45 - ]; 46 46 - 47 47 - installPhase = '' 48 48 - runHook preInstall 49 49 - 50 50 - mkdir -p $out/lib/node_modules/ 51 51 - mv packages/ $out/lib/packages/ 52 52 - mv node_modules/* $out/lib/node_modules/ 53 53 - 54 54 - makeWrapper ${lib.getExe nodejs} $out/bin/plc \ 55 55 - --add-flags $out/lib/packages/server/service/index.js \ 56 56 - --add-flags --enable-source-maps \ 57 57 - --set NODE_PATH $out/lib/node_modules 58 58 - 59 59 - runHook postInstall 60 60 - ''; 61 61 - 62 62 - meta = { 63 63 - mainProgram = "plc"; 64 64 - }; 65 65 - })

+17 -1

nix/pkgs/docs.nix

··· 5 5 inter-fonts-src, 6 6 ibm-plex-mono-src, 7 7 lucide-src, 8 8 + dolly, 8 9 src, 9 10 }: 10 11 runCommandLocal "docs" {} '' ··· 18 19 # icons 19 20 cp -rf ${lucide-src}/*.svg working/ 20 21 21 21 - # content 22 22 + # logo 23 23 + ${dolly}/bin/dolly -output working/dolly.svg -color currentColor 24 24 + 25 25 + # content - chunked 22 26 ${pandoc}/bin/pandoc ${src}/docs/DOCS.md \ 23 27 -o $out/ \ 24 28 -t chunkedhtml \ 25 29 --variable toc \ 30 30 + --variable-json single-page=false \ 26 31 --toc-depth=2 \ 27 32 --css=stylesheet.css \ 28 33 --chunk-template="%i.html" \ 34 34 + --highlight-style=working/highlight.theme \ 35 35 + --template=working/template.html 36 36 + 37 37 + # content - single page 38 38 + ${pandoc}/bin/pandoc ${src}/docs/DOCS.md \ 39 39 + -o $out/single-page.html \ 40 40 + --toc \ 41 41 + --variable toc \ 42 42 + --variable single-page \ 43 43 + --toc-depth=2 \ 44 44 + --css=stylesheet.css \ 29 45 --highlight-style=working/highlight.theme \ 30 46 --template=working/template.html 31 47

+21

nix/pkgs/dolly.nix

··· 1 1 + { 2 2 + buildGoApplication, 3 3 + modules, 4 4 + src, 5 5 + }: 6 6 + buildGoApplication { 7 7 + pname = "dolly"; 8 8 + version = "0.1.0"; 9 9 + inherit src modules; 10 10 + 11 11 + # patch the static dir 12 12 + postUnpack = '' 13 13 + pushd source 14 14 + mkdir -p appview/pages/static 15 15 + touch appview/pages/static/x 16 16 + popd 17 17 + ''; 18 18 + 19 19 + doCheck = false; 20 20 + subPackages = ["cmd/dolly"]; 21 21 + }

-20

nix/pkgs/tap.nix

··· 1 1 - { 2 2 - buildGoModule, 3 3 - fetchFromGitHub, 4 4 - }: 5 5 - buildGoModule { 6 6 - pname = "tap"; 7 7 - version = "0.1.0"; 8 8 - src = fetchFromGitHub { 9 9 - owner = "bluesky-social"; 10 10 - repo = "indigo"; 11 11 - rev = "498ecb9693e8ae050f73234c86f340f51ad896a9"; 12 12 - sha256 = "sha256-KASCdwkg/hlKBt7RTW3e3R5J3hqJkphoarFbaMgtN1k="; 13 13 - }; 14 14 - subPackages = ["cmd/tap"]; 15 15 - vendorHash = "sha256-UOedwNYnM8Jx6B7Y9tFcZX8IeUBESAFAPTRYk7n0yo8="; 16 16 - doCheck = false; 17 17 - meta = { 18 18 - mainProgram = "tap"; 19 19 - }; 20 20 - }

+2 -8

nix/vm.nix

··· 19 19 20 20 plcUrl = envVarOr "TANGLED_VM_PLC_URL" "https://plc.directory"; 21 21 jetstream = envVarOr "TANGLED_VM_JETSTREAM_ENDPOINT" "wss://jetstream1.us-west.bsky.network/subscribe"; 22 22 - relayUrl = envVarOr "TANGLED_VM_RELAY_URL" "https://relay1.us-east.bsky.network"; 23 22 in 24 23 nixpkgs.lib.nixosSystem { 25 24 inherit system; ··· 58 57 host.port = 6555; 59 58 guest.port = 6555; 60 59 } 61 61 - { 62 62 - from = "host"; 63 63 - host.port = 6556; 64 64 - guest.port = 2480; 65 65 - } 66 60 ]; 67 61 sharedDirectories = { 68 62 # We can't use the 9p mounts directly for most of these ··· 101 95 }; 102 96 services.tangled.spindle = { 103 97 enable = true; 104 104 - atpRelayUrl = relayUrl; 105 98 server = { 106 99 owner = envVar "TANGLED_VM_SPINDLE_OWNER"; 107 100 hostname = envVarOr "TANGLED_VM_SPINDLE_HOST" "localhost:6555"; 108 101 plcUrl = plcUrl; 102 102 + jetstreamEndpoint = jetstream; 109 103 listenAddr = "0.0.0.0:6555"; 110 104 dev = true; 111 105 queueSize = 100; ··· 140 134 }; 141 135 in { 142 136 knot = mkDataSyncScripts "/mnt/knot-data" config.services.tangled.knot.stateDir; 143 143 - spindle = mkDataSyncScripts "/mnt/spindle-data" config.services.tangled.spindle.server.stateDir; 137 137 + spindle = mkDataSyncScripts "/mnt/spindle-data" (builtins.dirOf config.services.tangled.spindle.server.dbPath); 144 138 }; 145 139 }) 146 140 ];

-10

orm/orm.go

··· 20 20 } 21 21 defer tx.Rollback() 22 22 23 23 - _, err = tx.Exec(` 24 24 - create table if not exists migrations ( 25 25 - id integer primary key autoincrement, 26 26 - name text unique 27 27 - ); 28 28 - `) 29 29 - if err != nil { 30 30 - return fmt.Errorf("creating migrations table: %w", err) 31 31 - } 32 32 - 33 23 var exists bool 34 24 err = tx.QueryRow("select exists (select 1 from migrations where name = ?)", name).Scan(&exists) 35 25 if err != nil {

-52

rbac2/bytesadapter/adapter.go

··· 1 1 - package bytesadapter 2 2 - 3 3 - import ( 4 4 - "bufio" 5 5 - "bytes" 6 6 - "errors" 7 7 - "strings" 8 8 - 9 9 - "github.com/casbin/casbin/v2/model" 10 10 - "github.com/casbin/casbin/v2/persist" 11 11 - ) 12 12 - 13 13 - var ( 14 14 - errNotImplemented = errors.New("not implemented") 15 15 - ) 16 16 - 17 17 - type Adapter struct { 18 18 - b []byte 19 19 - } 20 20 - 21 21 - var _ persist.Adapter = &Adapter{} 22 22 - 23 23 - func NewAdapter(b []byte) *Adapter { 24 24 - return &Adapter{b} 25 25 - } 26 26 - 27 27 - func (a *Adapter) LoadPolicy(model model.Model) error { 28 28 - scanner := bufio.NewScanner(bytes.NewReader(a.b)) 29 29 - for scanner.Scan() { 30 30 - line := strings.TrimSpace(scanner.Text()) 31 31 - if err := persist.LoadPolicyLine(line, model); err != nil { 32 32 - return err 33 33 - } 34 34 - } 35 35 - return scanner.Err() 36 36 - } 37 37 - 38 38 - func (a *Adapter) AddPolicy(sec string, ptype string, rule []string) error { 39 39 - return errNotImplemented 40 40 - } 41 41 - 42 42 - func (a *Adapter) RemoveFilteredPolicy(sec string, ptype string, fieldIndex int, fieldValues ...string) error { 43 43 - return errNotImplemented 44 44 - } 45 45 - 46 46 - func (a *Adapter) RemovePolicy(sec string, ptype string, rule []string) error { 47 47 - return errNotImplemented 48 48 - } 49 49 - 50 50 - func (a *Adapter) SavePolicy(model model.Model) error { 51 51 - return errNotImplemented 52 52 - }

-139

rbac2/rbac2.go

··· 1 1 - package rbac2 2 2 - 3 3 - import ( 4 4 - "database/sql" 5 5 - _ "embed" 6 6 - "fmt" 7 7 - 8 8 - adapter "github.com/Blank-Xu/sql-adapter" 9 9 - "github.com/bluesky-social/indigo/atproto/syntax" 10 10 - "github.com/casbin/casbin/v2" 11 11 - "github.com/casbin/casbin/v2/model" 12 12 - "github.com/casbin/casbin/v2/util" 13 13 - "tangled.org/core/rbac2/bytesadapter" 14 14 - ) 15 15 - 16 16 - const ( 17 17 - Model = ` 18 18 - [request_definition] 19 19 - r = sub, dom, obj, act 20 20 - 21 21 - [policy_definition] 22 22 - p = sub, dom, obj, act 23 23 - 24 24 - [role_definition] 25 25 - g = _, _, _ 26 26 - 27 27 - [policy_effect] 28 28 - e = some(where (p.eft == allow)) 29 29 - 30 30 - [matchers] 31 31 - m = g(r.sub, p.sub, r.dom) && keyMatch4(r.dom, p.dom) && r.obj == p.obj && r.act == p.act 32 32 - ` 33 33 - ) 34 34 - 35 35 - type Enforcer struct { 36 36 - e *casbin.Enforcer 37 37 - } 38 38 - 39 39 - //go:embed tangled_policy.csv 40 40 - var tangledPolicy []byte 41 41 - 42 42 - func NewEnforcer(path string) (*Enforcer, error) { 43 43 - db, err := sql.Open("sqlite3", path+"?_foreign_keys=1") 44 44 - if err != nil { 45 45 - return nil, err 46 46 - } 47 47 - return NewEnforcerWithDB(db) 48 48 - } 49 49 - 50 50 - func NewEnforcerWithDB(db *sql.DB) (*Enforcer, error) { 51 51 - m, err := model.NewModelFromString(Model) 52 52 - if err != nil { 53 53 - return nil, err 54 54 - } 55 55 - 56 56 - a, err := adapter.NewAdapter(db, "sqlite3", "acl") 57 57 - if err != nil { 58 58 - return nil, err 59 59 - } 60 60 - 61 61 - // // PATCH: create unique index to make `AddPoliciesEx` work 62 62 - // _, err = db.Exec(fmt.Sprintf( 63 63 - // `create unique index if not exists uq_%[1]s on %[1]s (p_type,v0,v1,v2,v3,v4,v5);`, 64 64 - // tableName, 65 65 - // )) 66 66 - // if err != nil { 67 67 - // return nil, err 68 68 - // } 69 69 - 70 70 - e, _ := casbin.NewEnforcer() // NewEnforcer() without param won't return error 71 71 - // e.EnableLog(true) 72 72 - 73 73 - // NOTE: casbin clears the model on init, so we should intialize with temporary adapter first 74 74 - // and then override the adapter to sql-adapter. 75 75 - // `e.SetModel(m)` after init doesn't work for some reason 76 76 - if err := e.InitWithModelAndAdapter(m, bytesadapter.NewAdapter(tangledPolicy)); err != nil { 77 77 - return nil, err 78 78 - } 79 79 - 80 80 - // load dynamic policy from db 81 81 - e.EnableAutoSave(false) 82 82 - if err := a.LoadPolicy(e.GetModel()); err != nil { 83 83 - return nil, err 84 84 - } 85 85 - e.AddNamedDomainMatchingFunc("g", "keyMatch4", util.KeyMatch4) 86 86 - e.BuildRoleLinks() 87 87 - e.SetAdapter(a) 88 88 - e.EnableAutoSave(true) 89 89 - 90 90 - return &Enforcer{e}, nil 91 91 - } 92 92 - 93 93 - // CaptureModel returns copy of current model. Used for testing 94 94 - func (e *Enforcer) CaptureModel() model.Model { 95 95 - return e.e.GetModel().Copy() 96 96 - } 97 97 - 98 98 - func (e *Enforcer) hasImplicitRoleForUser(name string, role string, domain ...string) (bool, error) { 99 99 - roles, err := e.e.GetImplicitRolesForUser(name, domain...) 100 100 - if err != nil { 101 101 - return false, err 102 102 - } 103 103 - for _, r := range roles { 104 104 - if r == role { 105 105 - return true, nil 106 106 - } 107 107 - } 108 108 - return false, nil 109 109 - } 110 110 - 111 111 - // setRoleForUser sets single user role for specified domain. 112 112 - // All existing users with that role will be removed. 113 113 - func (e *Enforcer) setRoleForUser(name string, role string, domain ...string) error { 114 114 - currentUsers, err := e.e.GetUsersForRole(role, domain...) 115 115 - if err != nil { 116 116 - return err 117 117 - } 118 118 - 119 119 - for _, oldUser := range currentUsers { 120 120 - _, err = e.e.DeleteRoleForUser(oldUser, role, domain...) 121 121 - if err != nil { 122 122 - return err 123 123 - } 124 124 - } 125 125 - 126 126 - _, err = e.e.AddRoleForUser(name, role, domain...) 127 127 - return err 128 128 - } 129 129 - 130 130 - // validateAtUri enforeces AT-URI to have valid did as authority and match collection NSID. 131 131 - func validateAtUri(uri syntax.ATURI, expected string) error { 132 132 - if !uri.Authority().IsDID() { 133 133 - return fmt.Errorf("expected at-uri with did") 134 134 - } 135 135 - if expected != "" && uri.Collection().String() != expected { 136 136 - return fmt.Errorf("incorrect repo at-uri collection nsid '%s' (expected '%s')", uri.Collection(), expected) 137 137 - } 138 138 - return nil 139 139 - }

-150

rbac2/rbac2_test.go

··· 1 1 - package rbac2_test 2 2 - 3 3 - import ( 4 4 - "database/sql" 5 5 - "testing" 6 6 - 7 7 - "github.com/bluesky-social/indigo/atproto/syntax" 8 8 - _ "github.com/mattn/go-sqlite3" 9 9 - "github.com/stretchr/testify/assert" 10 10 - "tangled.org/core/rbac2" 11 11 - ) 12 12 - 13 13 - func setup(t *testing.T) *rbac2.Enforcer { 14 14 - enforcer, err := rbac2.NewEnforcer(":memory:") 15 15 - assert.NoError(t, err) 16 16 - 17 17 - return enforcer 18 18 - } 19 19 - 20 20 - func TestNewEnforcer(t *testing.T) { 21 21 - db, err := sql.Open("sqlite3", "/tmp/test/test.db?_foreign_keys=1") 22 22 - assert.NoError(t, err) 23 23 - 24 24 - enforcer1, err := rbac2.NewEnforcerWithDB(db) 25 25 - assert.NoError(t, err) 26 26 - enforcer1.AddRepo(syntax.ATURI("at://did:plc:foo/sh.tangled.repo/reporkey")) 27 27 - model1 := enforcer1.CaptureModel() 28 28 - 29 29 - enforcer2, err := rbac2.NewEnforcerWithDB(db) 30 30 - assert.NoError(t, err) 31 31 - model2 := enforcer2.CaptureModel() 32 32 - 33 33 - // model1.GetLogger().EnableLog(true) 34 34 - // model1.PrintModel() 35 35 - // model1.PrintPolicy() 36 36 - // model1.GetLogger().EnableLog(false) 37 37 - 38 38 - model2.GetLogger().EnableLog(true) 39 39 - model2.PrintModel() 40 40 - model2.PrintPolicy() 41 41 - model2.GetLogger().EnableLog(false) 42 42 - 43 43 - assert.Equal(t, model1, model2) 44 44 - } 45 45 - 46 46 - func TestRepoOwnerPermissions(t *testing.T) { 47 47 - var ( 48 48 - e = setup(t) 49 49 - ok bool 50 50 - err error 51 51 - fooRepo = syntax.ATURI("at://did:plc:foo/sh.tangled.repo/reporkey") 52 52 - fooUser = syntax.DID("did:plc:foo") 53 53 - ) 54 54 - 55 55 - assert.NoError(t, e.AddRepo(fooRepo)) 56 56 - 57 57 - ok, err = e.IsRepoOwner(fooUser, fooRepo) 58 58 - assert.NoError(t, err) 59 59 - assert.True(t, ok, "repo author should be repo owner") 60 60 - 61 61 - ok, err = e.IsRepoWriteAllowed(fooUser, fooRepo) 62 62 - assert.NoError(t, err) 63 63 - assert.True(t, ok, "repo owner should be able to modify the repo itself") 64 64 - 65 65 - ok, err = e.IsRepoCollaborator(fooUser, fooRepo) 66 66 - assert.NoError(t, err) 67 67 - assert.True(t, ok, "repo owner should inherit role role:collaborator") 68 68 - 69 69 - ok, err = e.IsRepoSettingsWriteAllowed(fooUser, fooRepo) 70 70 - assert.NoError(t, err) 71 71 - assert.True(t, ok, "repo owner should inherit collaborator permissions") 72 72 - } 73 73 - 74 74 - func TestRepoCollaboratorPermissions(t *testing.T) { 75 75 - var ( 76 76 - e = setup(t) 77 77 - ok bool 78 78 - err error 79 79 - fooRepo = syntax.ATURI("at://did:plc:foo/sh.tangled.repo/reporkey") 80 80 - barUser = syntax.DID("did:plc:bar") 81 81 - ) 82 82 - 83 83 - assert.NoError(t, e.AddRepo(fooRepo)) 84 84 - assert.NoError(t, e.AddRepoCollaborator(barUser, fooRepo)) 85 85 - 86 86 - ok, err = e.IsRepoCollaborator(barUser, fooRepo) 87 87 - assert.NoError(t, err) 88 88 - assert.True(t, ok, "should set repo collaborator") 89 89 - 90 90 - ok, err = e.IsRepoSettingsWriteAllowed(barUser, fooRepo) 91 91 - assert.NoError(t, err) 92 92 - assert.True(t, ok, "repo collaborator should be able to edit repo settings") 93 93 - 94 94 - ok, err = e.IsRepoWriteAllowed(barUser, fooRepo) 95 95 - assert.NoError(t, err) 96 96 - assert.False(t, ok, "repo collaborator shouldn't be able to modify the repo itself") 97 97 - } 98 98 - 99 99 - func TestGetByRole(t *testing.T) { 100 100 - var ( 101 101 - e = setup(t) 102 102 - err error 103 103 - fooRepo = syntax.ATURI("at://did:plc:foo/sh.tangled.repo/reporkey") 104 104 - owner = syntax.DID("did:plc:foo") 105 105 - collaborator1 = syntax.DID("did:plc:bar") 106 106 - collaborator2 = syntax.DID("did:plc:baz") 107 107 - ) 108 108 - 109 109 - assert.NoError(t, e.AddRepo(fooRepo)) 110 110 - assert.NoError(t, e.AddRepoCollaborator(collaborator1, fooRepo)) 111 111 - assert.NoError(t, e.AddRepoCollaborator(collaborator2, fooRepo)) 112 112 - 113 113 - collaborators, err := e.GetRepoCollaborators(fooRepo) 114 114 - assert.NoError(t, err) 115 115 - assert.ElementsMatch(t, []syntax.DID{ 116 116 - owner, 117 117 - collaborator1, 118 118 - collaborator2, 119 119 - }, collaborators) 120 120 - } 121 121 - 122 122 - func TestSpindleOwnerPermissions(t *testing.T) { 123 123 - var ( 124 124 - e = setup(t) 125 125 - ok bool 126 126 - err error 127 127 - spindle = syntax.DID("did:web:spindle.example.com") 128 128 - owner = syntax.DID("did:plc:foo") 129 129 - member = syntax.DID("did:plc:bar") 130 130 - ) 131 131 - 132 132 - assert.NoError(t, e.SetSpindleOwner(owner, spindle)) 133 133 - assert.NoError(t, e.AddSpindleMember(member, spindle)) 134 134 - 135 135 - ok, err = e.IsSpindleMember(owner, spindle) 136 136 - assert.NoError(t, err) 137 137 - assert.True(t, ok, "spindle owner is spindle member") 138 138 - 139 139 - ok, err = e.IsSpindleMember(member, spindle) 140 140 - assert.NoError(t, err) 141 141 - assert.True(t, ok, "spindle member is spindle member") 142 142 - 143 143 - ok, err = e.IsSpindleMemberInviteAllowed(owner, spindle) 144 144 - assert.NoError(t, err) 145 145 - assert.True(t, ok, "spindle owner can invite members") 146 146 - 147 147 - ok, err = e.IsSpindleMemberInviteAllowed(member, spindle) 148 148 - assert.NoError(t, err) 149 149 - assert.False(t, ok, "spindle member cannot invite members") 150 150 - }

-91

rbac2/repo.go

··· 1 1 - package rbac2 2 2 - 3 3 - import ( 4 4 - "slices" 5 5 - "strings" 6 6 - 7 7 - "github.com/bluesky-social/indigo/atproto/syntax" 8 8 - "tangled.org/core/api/tangled" 9 9 - ) 10 10 - 11 11 - // AddRepo adds new repo with its owner to rbac enforcer 12 12 - func (e *Enforcer) AddRepo(repo syntax.ATURI) error { 13 13 - if err := validateAtUri(repo, tangled.RepoNSID); err != nil { 14 14 - return err 15 15 - } 16 16 - user := repo.Authority() 17 17 - 18 18 - return e.setRoleForUser(user.String(), "repo:owner", repo.String()) 19 19 - } 20 20 - 21 21 - // DeleteRepo deletes all policies related to the repo 22 22 - func (e *Enforcer) DeleteRepo(repo syntax.ATURI) error { 23 23 - if err := validateAtUri(repo, tangled.RepoNSID); err != nil { 24 24 - return err 25 25 - } 26 26 - 27 27 - _, err := e.e.DeleteDomains(repo.String()) 28 28 - return err 29 29 - } 30 30 - 31 31 - // AddRepoCollaborator adds new collaborator to the repo 32 32 - func (e *Enforcer) AddRepoCollaborator(user syntax.DID, repo syntax.ATURI) error { 33 33 - if err := validateAtUri(repo, tangled.RepoNSID); err != nil { 34 34 - return err 35 35 - } 36 36 - 37 37 - _, err := e.e.AddRoleForUser(user.String(), "repo:collaborator", repo.String()) 38 38 - return err 39 39 - } 40 40 - 41 41 - // RemoveRepoCollaborator removes the collaborator from the repo. 42 42 - // This won't remove inherited roles like repository owner. 43 43 - func (e *Enforcer) RemoveRepoCollaborator(user syntax.DID, repo syntax.ATURI) error { 44 44 - if err := validateAtUri(repo, tangled.RepoNSID); err != nil { 45 45 - return err 46 46 - } 47 47 - 48 48 - _, err := e.e.DeleteRoleForUser(user.String(), "repo:collaborator", repo.String()) 49 49 - return err 50 50 - } 51 51 - 52 52 - func (e *Enforcer) GetRepoCollaborators(repo syntax.ATURI) ([]syntax.DID, error) { 53 53 - var collaborators []syntax.DID 54 54 - members, err := e.e.GetImplicitUsersForRole("repo:collaborator", repo.String()) 55 55 - if err != nil { 56 56 - return nil, err 57 57 - } 58 58 - for _, m := range members { 59 59 - if !strings.HasPrefix(m, "did:") { // skip non-user subjects like 'repo:owner' 60 60 - continue 61 61 - } 62 62 - collaborators = append(collaborators, syntax.DID(m)) 63 63 - } 64 64 - 65 65 - slices.Sort(collaborators) 66 66 - return slices.Compact(collaborators), nil 67 67 - } 68 68 - 69 69 - func (e *Enforcer) IsRepoOwner(user syntax.DID, repo syntax.ATURI) (bool, error) { 70 70 - return e.e.HasRoleForUser(user.String(), "repo:owner", repo.String()) 71 71 - } 72 72 - 73 73 - func (e *Enforcer) IsRepoCollaborator(user syntax.DID, repo syntax.ATURI) (bool, error) { 74 74 - return e.hasImplicitRoleForUser(user.String(), "repo:collaborator", repo.String()) 75 75 - } 76 76 - 77 77 - func (e *Enforcer) IsRepoWriteAllowed(user syntax.DID, repo syntax.ATURI) (bool, error) { 78 78 - return e.e.Enforce(user.String(), repo.String(), "/", "write") 79 79 - } 80 80 - 81 81 - func (e *Enforcer) IsRepoSettingsWriteAllowed(user syntax.DID, repo syntax.ATURI) (bool, error) { 82 82 - return e.e.Enforce(user.String(), repo.String(), "/settings", "write") 83 83 - } 84 84 - 85 85 - func (e *Enforcer) IsRepoCollaboratorInviteAllowed(user syntax.DID, repo syntax.ATURI) (bool, error) { 86 86 - return e.e.Enforce(user.String(), repo.String(), "/collaborator", "write") 87 87 - } 88 88 - 89 89 - func (e *Enforcer) IsRepoGitPushAllowed(user syntax.DID, repo syntax.ATURI) (bool, error) { 90 90 - return e.e.Enforce(user.String(), repo.String(), "/git", "write") 91 91 - }

-29

rbac2/spindle.go

··· 1 1 - package rbac2 2 2 - 3 3 - import "github.com/bluesky-social/indigo/atproto/syntax" 4 4 - 5 5 - func (e *Enforcer) SetSpindleOwner(user syntax.DID, spindle syntax.DID) error { 6 6 - return e.setRoleForUser(user.String(), "server:owner", intoSpindle(spindle)) 7 7 - } 8 8 - 9 9 - func (e *Enforcer) IsSpindleMember(user syntax.DID, spindle syntax.DID) (bool, error) { 10 10 - return e.hasImplicitRoleForUser(user.String(), "server:member", intoSpindle(spindle)) 11 11 - } 12 12 - 13 13 - func (e *Enforcer) AddSpindleMember(user syntax.DID, spindle syntax.DID) error { 14 14 - _, err := e.e.AddRoleForUser(user.String(), "server:member", intoSpindle(spindle)) 15 15 - return err 16 16 - } 17 17 - 18 18 - func (e *Enforcer) RemoveSpindleMember(user syntax.DID, spindle syntax.DID) error { 19 19 - _, err := e.e.DeleteRoleForUser(user.String(), "server:member", intoSpindle(spindle)) 20 20 - return err 21 21 - } 22 22 - 23 23 - func (e *Enforcer) IsSpindleMemberInviteAllowed(user syntax.DID, spindle syntax.DID) (bool, error) { 24 24 - return e.e.Enforce(user.String(), intoSpindle(spindle), "/member", "write") 25 25 - } 26 26 - 27 27 - func intoSpindle(did syntax.DID) string { 28 28 - return "/spindle/" + did.String() 29 29 - }

-19

rbac2/tangled_policy.csv

··· 1 1 - #, policies 2 2 - #, sub, dom, obj, act 3 3 - p, repo:owner, at://{did}/sh.tangled.repo/{rkey}, /, write 4 4 - p, repo:owner, at://{did}/sh.tangled.repo/{rkey}, /collaborator, write 5 5 - p, repo:collaborator, at://{did}/sh.tangled.repo/{rkey}, /settings, write 6 6 - p, repo:collaborator, at://{did}/sh.tangled.repo/{rkey}, /git, write 7 7 - 8 8 - p, server:owner, /knot/{did}, /member, write 9 9 - p, server:member, /knot/{did}, /git, write 10 10 - 11 11 - p, server:owner, /spindle/{did}, /member, write 12 12 - 13 13 - 14 14 - #, group policies 15 15 - #, sub, role, dom 16 16 - g, repo:owner, repo:collaborator, at://{did}/sh.tangled.repo/{rkey} 17 17 - 18 18 - g, server:owner, server:member, /knot/{did} 19 19 - g, server:owner, server:member, /spindle/{did}

+11 -20

spindle/config/config.go

··· 3 3 import ( 4 4 "context" 5 5 "fmt" 6 6 - "path/filepath" 7 6 8 7 "github.com/bluesky-social/indigo/atproto/syntax" 9 8 "github.com/sethvargo/go-envconfig" 10 9 ) 11 10 12 11 type Server struct { 13 13 - ListenAddr string `env:"LISTEN_ADDR, default=0.0.0.0:6555"` 14 14 - Hostname string `env:"HOSTNAME, required"` 15 15 - TapUrl string `env:"TAP_URL, required"` 16 16 - PlcUrl string `env:"PLC_URL, default=https://plc.directory"` 17 17 - Dev bool `env:"DEV, default=false"` 18 18 - Owner syntax.DID `env:"OWNER, required"` 19 19 - Secrets Secrets `env:",prefix=SECRETS_"` 20 20 - LogDir string `env:"LOG_DIR, default=/var/log/spindle"` 21 21 - DataDir string `env:"DATA_DIR, default=/var/lib/spindle"` 22 22 - QueueSize int `env:"QUEUE_SIZE, default=100"` 23 23 - MaxJobCount int `env:"MAX_JOB_COUNT, default=2"` // max number of jobs that run at a time 12 12 + ListenAddr string `env:"LISTEN_ADDR, default=0.0.0.0:6555"` 13 13 + DBPath string `env:"DB_PATH, default=spindle.db"` 14 14 + Hostname string `env:"HOSTNAME, required"` 15 15 + JetstreamEndpoint string `env:"JETSTREAM_ENDPOINT, default=wss://jetstream1.us-west.bsky.network/subscribe"` 16 16 + PlcUrl string `env:"PLC_URL, default=https://plc.directory"` 17 17 + Dev bool `env:"DEV, default=false"` 18 18 + Owner string `env:"OWNER, required"` 19 19 + Secrets Secrets `env:",prefix=SECRETS_"` 20 20 + LogDir string `env:"LOG_DIR, default=/var/log/spindle"` 21 21 + QueueSize int `env:"QUEUE_SIZE, default=100"` 22 22 + MaxJobCount int `env:"MAX_JOB_COUNT, default=2"` // max number of jobs that run at a time 24 23 } 25 24 26 25 func (s Server) Did() syntax.DID { 27 26 return syntax.DID(fmt.Sprintf("did:web:%s", s.Hostname)) 28 28 - } 29 29 - 30 30 - func (s Server) RepoDir() string { 31 31 - return filepath.Join(s.DataDir, "repos") 32 32 - } 33 33 - 34 34 - func (s Server) DBPath() string { 35 35 - return filepath.Join(s.DataDir, "spindle.db") 36 27 } 37 28 38 29 type Secrets struct {

+18 -73

spindle/db/db.go

··· 1 1 package db 2 2 3 3 import ( 4 4 - "context" 5 4 "database/sql" 6 5 "strings" 7 6 8 8 - "github.com/bluesky-social/indigo/atproto/syntax" 9 7 _ "github.com/mattn/go-sqlite3" 10 10 - "tangled.org/core/log" 11 11 - "tangled.org/core/orm" 12 8 ) 13 9 14 10 type DB struct { 15 11 *sql.DB 16 12 } 17 13 18 18 - func Make(ctx context.Context, dbPath string) (*DB, error) { 14 14 + func Make(dbPath string) (*DB, error) { 19 15 // https://github.com/mattn/go-sqlite3#connection-string 20 16 opts := []string{ 21 17 "_foreign_keys=1", ··· 24 20 "_auto_vacuum=incremental", 25 21 } 26 22 27 27 - logger := log.FromContext(ctx) 28 28 - logger = log.SubLogger(logger, "db") 29 29 - 30 23 db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&")) 31 24 if err != nil { 32 25 return nil, err 33 26 } 34 27 35 35 - conn, err := db.Conn(ctx) 36 36 - if err != nil { 37 37 - return nil, err 38 38 - } 39 39 - defer conn.Close() 28 28 + // NOTE: If any other migration is added here, you MUST 29 29 + // copy the pattern in appview: use a single sql.Conn 30 30 + // for every migration. 40 31 41 32 _, err = db.Exec(` 42 33 create table if not exists _jetstream ( ··· 58 49 unique(owner, name) 59 50 ); 60 51 61 61 - create table if not exists repo_collaborators ( 62 62 - -- identifiers 63 63 - id integer primary key autoincrement, 64 64 - did text not null, 65 65 - rkey text not null, 66 66 - at_uri text generated always as ('at://' || did || '/' || 'sh.tangled.repo.collaborator' || '/' || rkey) stored, 67 67 - 68 68 - repo text not null, 69 69 - subject text not null, 70 70 - 71 71 - addedAt text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 72 72 - unique(did, rkey) 73 73 - ); 74 74 - 75 52 create table if not exists spindle_members ( 76 53 -- identifiers for the record 77 54 id integer primary key autoincrement, ··· 99 76 return nil, err 100 77 } 101 78 102 102 - // run migrations 79 79 + return &DB{db}, nil 80 80 + } 103 81 104 104 - // NOTE: this won't migrate existing records 105 105 - // they will be fetched again with tap instead 106 106 - orm.RunMigration(conn, logger, "add-rkey-to-repos", func(tx *sql.Tx) error { 107 107 - // archive legacy repos (just in case) 108 108 - _, err = tx.Exec(`alter table repos rename to repos_old`) 109 109 - if err != nil { 110 110 - return err 111 111 - } 112 112 - 113 113 - _, err := tx.Exec(` 114 114 - create table repos ( 115 115 - -- identifiers 116 116 - id integer primary key autoincrement, 117 117 - did text not null, 118 118 - rkey text not null, 119 119 - at_uri text generated always as ('at://' || did || '/' || 'sh.tangled.repo' || '/' || rkey) stored, 120 120 - 121 121 - name text not null, 122 122 - knot text not null, 123 123 - 124 124 - addedAt text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 125 125 - unique(did, rkey) 126 126 - ); 127 127 - `) 128 128 - if err != nil { 129 129 - return err 130 130 - } 131 131 - 132 132 - return nil 133 133 - }) 134 134 - 135 135 - return &DB{db}, nil 82 82 + func (d *DB) SaveLastTimeUs(lastTimeUs int64) error { 83 83 + _, err := d.Exec(` 84 84 + insert into _jetstream (id, last_time_us) 85 85 + values (1, ?) 86 86 + on conflict(id) do update set last_time_us = excluded.last_time_us 87 87 + `, lastTimeUs) 88 88 + return err 136 89 } 137 90 138 138 - func (d *DB) IsKnownDid(did syntax.DID) (bool, error) { 139 139 - // is spindle member / repo collaborator 140 140 - var exists bool 141 141 - err := d.QueryRow( 142 142 - `select exists ( 143 143 - select 1 from repo_collaborators where subject = ? 144 144 - union all 145 145 - select 1 from spindle_members where did = ? 146 146 - )`, 147 147 - did, 148 148 - did, 149 149 - ).Scan(&exists) 150 150 - return exists, err 91 91 + func (d *DB) GetLastTimeUs() (int64, error) { 92 92 + var lastTimeUs int64 93 93 + row := d.QueryRow(`select last_time_us from _jetstream where id = 1;`) 94 94 + err := row.Scan(&lastTimeUs) 95 95 + return lastTimeUs, err 151 96 }

+8 -10

spindle/db/events.go

··· 18 18 EventJson string `json:"event"` 19 19 } 20 20 21 21 - func (d *DB) insertEvent(event Event, notifier *notifier.Notifier) error { 21 21 + func (d *DB) InsertEvent(event Event, notifier *notifier.Notifier) error { 22 22 _, err := d.Exec( 23 23 `insert into events (rkey, nsid, event, created) values (?, ?, ?, ?)`, 24 24 event.Rkey, ··· 70 70 return evts, nil 71 71 } 72 72 73 73 - func (d *DB) CreatePipelineEvent(rkey string, pipeline tangled.Pipeline, n *notifier.Notifier) error { 74 74 - eventJson, err := json.Marshal(pipeline) 73 73 + func (d *DB) CreateStatusEvent(rkey string, s tangled.PipelineStatus, n *notifier.Notifier) error { 74 74 + eventJson, err := json.Marshal(s) 75 75 if err != nil { 76 76 return err 77 77 } 78 78 + 78 79 event := Event{ 79 80 Rkey: rkey, 80 80 - Nsid: tangled.PipelineNSID, 81 81 + Nsid: tangled.PipelineStatusNSID, 81 82 Created: time.Now().UnixNano(), 82 83 EventJson: string(eventJson), 83 84 } 84 84 - return d.insertEvent(event, n) 85 85 + 86 86 + return d.InsertEvent(event, n) 85 87 } 86 88 87 89 func (d *DB) createStatusEvent( ··· 114 116 EventJson: string(eventJson), 115 117 } 116 118 117 117 - return d.insertEvent(event, n) 119 119 + return d.InsertEvent(event, n) 118 120 119 121 } 120 122 ··· 162 164 163 165 func (d *DB) StatusFailed(workflowId models.WorkflowId, workflowError string, exitCode int64, n *notifier.Notifier) error { 164 166 return d.createStatusEvent(workflowId, models.StatusKindFailed, &workflowError, &exitCode, n) 165 165 - } 166 166 - 167 167 - func (d *DB) StatusCancelled(workflowId models.WorkflowId, workflowError string, exitCode int64, n *notifier.Notifier) error { 168 168 - return d.createStatusEvent(workflowId, models.StatusKindCancelled, &workflowError, &exitCode, n) 169 167 } 170 168 171 169 func (d *DB) StatusSuccess(workflowId models.WorkflowId, n *notifier.Notifier) error {

+44

spindle/db/known_dids.go

··· 1 1 + package db 2 2 + 3 3 + func (d *DB) AddDid(did string) error { 4 4 + _, err := d.Exec(`insert or ignore into known_dids (did) values (?)`, did) 5 5 + return err 6 6 + } 7 7 + 8 8 + func (d *DB) RemoveDid(did string) error { 9 9 + _, err := d.Exec(`delete from known_dids where did = ?`, did) 10 10 + return err 11 11 + } 12 12 + 13 13 + func (d *DB) GetAllDids() ([]string, error) { 14 14 + var dids []string 15 15 + 16 16 + rows, err := d.Query(`select did from known_dids`) 17 17 + if err != nil { 18 18 + return nil, err 19 19 + } 20 20 + defer rows.Close() 21 21 + 22 22 + for rows.Next() { 23 23 + var did string 24 24 + if err := rows.Scan(&did); err != nil { 25 25 + return nil, err 26 26 + } 27 27 + dids = append(dids, did) 28 28 + } 29 29 + 30 30 + if err := rows.Err(); err != nil { 31 31 + return nil, err 32 32 + } 33 33 + 34 34 + return dids, nil 35 35 + } 36 36 + 37 37 + func (d *DB) HasKnownDids() bool { 38 38 + var count int 39 39 + err := d.QueryRow(`select count(*) from known_dids`).Scan(&count) 40 40 + if err != nil { 41 41 + return false 42 42 + } 43 43 + return count > 0 44 44 + }

+11 -119

spindle/db/repos.go

··· 1 1 package db 2 2 3 3 - import "github.com/bluesky-social/indigo/atproto/syntax" 4 4 - 5 3 type Repo struct { 6 6 - Did syntax.DID 7 7 - Rkey syntax.RecordKey 8 8 - Name string 9 9 - Knot string 4 4 + Knot string 5 5 + Owner string 6 6 + Name string 10 7 } 11 8 12 12 - type RepoCollaborator struct { 13 13 - Did syntax.DID 14 14 - Rkey syntax.RecordKey 15 15 - Repo syntax.ATURI 16 16 - Subject syntax.DID 17 17 - } 18 18 - 19 19 - func (d *DB) PutRepo(repo *Repo) error { 20 20 - _, err := d.Exec( 21 21 - `insert or ignore into repos (did, rkey, name, knot) 22 22 - values (?, ?, ?, ?) 23 23 - on conflict(did, rkey) do update set 24 24 - name = excluded.name, 25 25 - knot = excluded.knot`, 26 26 - repo.Did, 27 27 - repo.Rkey, 28 28 - repo.Name, 29 29 - repo.Knot, 30 30 - ) 31 31 - return err 32 32 - } 33 33 - 34 34 - func (d *DB) DeleteRepo(did syntax.DID, rkey syntax.RecordKey) error { 35 35 - _, err := d.Exec( 36 36 - `delete from repos where did = ? and rkey = ?`, 37 37 - did, 38 38 - rkey, 39 39 - ) 9 9 + func (d *DB) AddRepo(knot, owner, name string) error { 10 10 + _, err := d.Exec(`insert or ignore into repos (knot, owner, name) values (?, ?, ?)`, knot, owner, name) 40 11 return err 41 12 } 42 13 ··· 63 34 return knots, nil 64 35 } 65 36 66 66 - func (d *DB) GetRepo(repoAt syntax.ATURI) (*Repo, error) { 37 37 + func (d *DB) GetRepo(knot, owner, name string) (*Repo, error) { 67 38 var repo Repo 68 68 - err := d.DB.QueryRow( 69 69 - `select 70 70 - did, 71 71 - rkey, 72 72 - name, 73 73 - knot 74 74 - from repos where at_uri = ?`, 75 75 - repoAt, 76 76 - ).Scan( 77 77 - &repo.Did, 78 78 - &repo.Rkey, 79 79 - &repo.Name, 80 80 - &repo.Knot, 81 81 - ) 82 82 - if err != nil { 83 83 - return nil, err 84 84 - } 85 85 - return &repo, nil 86 86 - } 87 39 88 88 - func (d *DB) GetRepoWithName(did syntax.DID, name string) (*Repo, error) { 89 89 - var repo Repo 90 90 - err := d.DB.QueryRow( 91 91 - `select 92 92 - did, 93 93 - rkey, 94 94 - name, 95 95 - knot 96 96 - from repos where did = ? and name = ?`, 97 97 - did, 98 98 - name, 99 99 - ).Scan( 100 100 - &repo.Did, 101 101 - &repo.Rkey, 102 102 - &repo.Name, 103 103 - &repo.Knot, 104 104 - ) 40 40 + query := "select knot, owner, name from repos where knot = ? and owner = ? and name = ?" 41 41 + err := d.DB.QueryRow(query, knot, owner, name). 42 42 + Scan(&repo.Knot, &repo.Owner, &repo.Name) 43 43 + 105 44 if err != nil { 106 45 return nil, err 107 46 } 47 47 + 108 48 return &repo, nil 109 49 } 110 110 - 111 111 - func (d *DB) PutRepoCollaborator(collaborator *RepoCollaborator) error { 112 112 - _, err := d.Exec( 113 113 - `insert into repo_collaborators (did, rkey, repo, subject) 114 114 - values (?, ?, ?, ?) 115 115 - on conflict(did, rkey) do update set 116 116 - repo = excluded.repo, 117 117 - subject = excluded.subject`, 118 118 - collaborator.Did, 119 119 - collaborator.Rkey, 120 120 - collaborator.Repo, 121 121 - collaborator.Subject, 122 122 - ) 123 123 - return err 124 124 - } 125 125 - 126 126 - func (d *DB) RemoveRepoCollaborator(did syntax.DID, rkey syntax.RecordKey) error { 127 127 - _, err := d.Exec( 128 128 - `delete from repo_collaborators where did = ? and rkey = ?`, 129 129 - did, 130 130 - rkey, 131 131 - ) 132 132 - return err 133 133 - } 134 134 - 135 135 - func (d *DB) GetRepoCollaborator(did syntax.DID, rkey syntax.RecordKey) (*RepoCollaborator, error) { 136 136 - var collaborator RepoCollaborator 137 137 - err := d.DB.QueryRow( 138 138 - `select 139 139 - did, 140 140 - rkey, 141 141 - repo, 142 142 - subject 143 143 - from repo_collaborators 144 144 - where did = ? and rkey = ?`, 145 145 - did, 146 146 - rkey, 147 147 - ).Scan( 148 148 - &collaborator.Did, 149 149 - &collaborator.Rkey, 150 150 - &collaborator.Repo, 151 151 - &collaborator.Subject, 152 152 - ) 153 153 - if err != nil { 154 154 - return nil, err 155 155 - } 156 156 - return &collaborator, nil 157 157 - }

+13 -24

spindle/engines/nixery/engine.go

··· 179 179 return err 180 180 } 181 181 e.registerCleanup(wid, func(ctx context.Context) error { 182 182 - if err := e.docker.NetworkRemove(ctx, networkName(wid)); err != nil { 183 183 - return fmt.Errorf("removing network: %w", err) 184 184 - } 185 185 - return nil 182 182 + return e.docker.NetworkRemove(ctx, networkName(wid)) 186 183 }) 187 184 188 185 addl := wf.Data.(addlFields) ··· 232 229 return fmt.Errorf("creating container: %w", err) 233 230 } 234 231 e.registerCleanup(wid, func(ctx context.Context) error { 235 235 - if err := e.docker.ContainerStop(ctx, resp.ID, container.StopOptions{}); err != nil { 236 236 - return fmt.Errorf("stopping container: %w", err) 232 232 + err = e.docker.ContainerStop(ctx, resp.ID, container.StopOptions{}) 233 233 + if err != nil { 234 234 + return err 237 235 } 238 236 239 239 - err := e.docker.ContainerRemove(ctx, resp.ID, container.RemoveOptions{ 237 237 + return e.docker.ContainerRemove(ctx, resp.ID, container.RemoveOptions{ 240 238 RemoveVolumes: true, 241 239 RemoveLinks: false, 242 240 Force: false, 243 241 }) 244 244 - if err != nil { 245 245 - return fmt.Errorf("removing container: %w", err) 246 246 - } 247 247 - return nil 248 242 }) 249 243 250 250 - if err := e.docker.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil { 244 244 + err = e.docker.ContainerStart(ctx, resp.ID, container.StartOptions{}) 245 245 + if err != nil { 251 246 return fmt.Errorf("starting container: %w", err) 252 247 } 253 248 ··· 399 394 } 400 395 401 396 func (e *Engine) DestroyWorkflow(ctx context.Context, wid models.WorkflowId) error { 402 402 - fns := e.drainCleanups(wid) 397 397 + e.cleanupMu.Lock() 398 398 + key := wid.String() 399 399 + 400 400 + fns := e.cleanup[key] 401 401 + delete(e.cleanup, key) 402 402 + e.cleanupMu.Unlock() 403 403 404 404 for _, fn := range fns { 405 405 if err := fn(ctx); err != nil { ··· 415 415 416 416 key := wid.String() 417 417 e.cleanup[key] = append(e.cleanup[key], fn) 418 418 - } 419 419 - 420 420 - func (e *Engine) drainCleanups(wid models.WorkflowId) []cleanupFunc { 421 421 - e.cleanupMu.Lock() 422 422 - key := wid.String() 423 423 - 424 424 - fns := e.cleanup[key] 425 425 - delete(e.cleanup, key) 426 426 - e.cleanupMu.Unlock() 427 427 - 428 428 - return fns 429 418 } 430 419 431 420 func networkName(wid models.WorkflowId) string {

-73

spindle/git/git.go

··· 1 1 - package git 2 2 - 3 3 - import ( 4 4 - "bytes" 5 5 - "context" 6 6 - "fmt" 7 7 - "os" 8 8 - "os/exec" 9 9 - "strings" 10 10 - 11 11 - "github.com/hashicorp/go-version" 12 12 - ) 13 13 - 14 14 - func Version() (*version.Version, error) { 15 15 - var buf bytes.Buffer 16 16 - cmd := exec.Command("git", "version") 17 17 - cmd.Stdout = &buf 18 18 - cmd.Stderr = os.Stderr 19 19 - err := cmd.Run() 20 20 - if err != nil { 21 21 - return nil, err 22 22 - } 23 23 - fields := strings.Fields(buf.String()) 24 24 - if len(fields) < 3 { 25 25 - return nil, fmt.Errorf("invalid git version: %s", buf.String()) 26 26 - } 27 27 - 28 28 - // version string is like: "git version 2.29.3" or "git version 2.29.3.windows.1" 29 29 - versionString := fields[2] 30 30 - if pos := strings.Index(versionString, "windows"); pos >= 1 { 31 31 - versionString = versionString[:pos-1] 32 32 - } 33 33 - return version.NewVersion(versionString) 34 34 - } 35 35 - 36 36 - const WorkflowDir = `/.tangled/workflows` 37 37 - 38 38 - func SparseSyncGitRepo(ctx context.Context, cloneUri, path, rev string) error { 39 39 - exist, err := isDir(path) 40 40 - if err != nil { 41 41 - return err 42 42 - } 43 43 - if rev == "" { 44 44 - rev = "HEAD" 45 45 - } 46 46 - if !exist { 47 47 - if err := exec.Command("git", "clone", "--no-checkout", "--depth=1", "--filter=tree:0", "--revision="+rev, cloneUri, path).Run(); err != nil { 48 48 - return fmt.Errorf("git clone: %w", err) 49 49 - } 50 50 - if err := exec.Command("git", "-C", path, "sparse-checkout", "set", "--no-cone", WorkflowDir).Run(); err != nil { 51 51 - return fmt.Errorf("git sparse-checkout set: %w", err) 52 52 - } 53 53 - } else { 54 54 - if err := exec.Command("git", "-C", path, "fetch", "--depth=1", "--filter=tree:0", "origin", rev).Run(); err != nil { 55 55 - return fmt.Errorf("git pull: %w", err) 56 56 - } 57 57 - } 58 58 - if err := exec.Command("git", "-C", path, "checkout", rev).Run(); err != nil { 59 59 - return fmt.Errorf("git checkout: %w", err) 60 60 - } 61 61 - return nil 62 62 - } 63 63 - 64 64 - func isDir(path string) (bool, error) { 65 65 - info, err := os.Stat(path) 66 66 - if err == nil && info.IsDir() { 67 67 - return true, nil 68 68 - } 69 69 - if os.IsNotExist(err) { 70 70 - return false, nil 71 71 - } 72 72 - return false, err 73 73 - }

+300

spindle/ingester.go

··· 1 1 + package spindle 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "encoding/json" 6 6 + "errors" 7 7 + "fmt" 8 8 + "time" 9 9 + 10 10 + "tangled.org/core/api/tangled" 11 11 + "tangled.org/core/eventconsumer" 12 12 + "tangled.org/core/rbac" 13 13 + "tangled.org/core/spindle/db" 14 14 + 15 15 + comatproto "github.com/bluesky-social/indigo/api/atproto" 16 16 + "github.com/bluesky-social/indigo/atproto/identity" 17 17 + "github.com/bluesky-social/indigo/atproto/syntax" 18 18 + "github.com/bluesky-social/indigo/xrpc" 19 19 + "github.com/bluesky-social/jetstream/pkg/models" 20 20 + securejoin "github.com/cyphar/filepath-securejoin" 21 21 + ) 22 22 + 23 23 + type Ingester func(ctx context.Context, e *models.Event) error 24 24 + 25 25 + func (s *Spindle) ingest() Ingester { 26 26 + return func(ctx context.Context, e *models.Event) error { 27 27 + var err error 28 28 + defer func() { 29 29 + eventTime := e.TimeUS 30 30 + lastTimeUs := eventTime + 1 31 31 + if err := s.db.SaveLastTimeUs(lastTimeUs); err != nil { 32 32 + err = fmt.Errorf("(deferred) failed to save last time us: %w", err) 33 33 + } 34 34 + }() 35 35 + 36 36 + if e.Kind != models.EventKindCommit { 37 37 + return nil 38 38 + } 39 39 + 40 40 + switch e.Commit.Collection { 41 41 + case tangled.SpindleMemberNSID: 42 42 + err = s.ingestMember(ctx, e) 43 43 + case tangled.RepoNSID: 44 44 + err = s.ingestRepo(ctx, e) 45 45 + case tangled.RepoCollaboratorNSID: 46 46 + err = s.ingestCollaborator(ctx, e) 47 47 + } 48 48 + 49 49 + if err != nil { 50 50 + s.l.Debug("failed to process message", "nsid", e.Commit.Collection, "err", err) 51 51 + } 52 52 + 53 53 + return nil 54 54 + } 55 55 + } 56 56 + 57 57 + func (s *Spindle) ingestMember(_ context.Context, e *models.Event) error { 58 58 + var err error 59 59 + did := e.Did 60 60 + rkey := e.Commit.RKey 61 61 + 62 62 + l := s.l.With("component", "ingester", "record", tangled.SpindleMemberNSID) 63 63 + 64 64 + switch e.Commit.Operation { 65 65 + case models.CommitOperationCreate, models.CommitOperationUpdate: 66 66 + raw := e.Commit.Record 67 67 + record := tangled.SpindleMember{} 68 68 + err = json.Unmarshal(raw, &record) 69 69 + if err != nil { 70 70 + l.Error("invalid record", "error", err) 71 71 + return err 72 72 + } 73 73 + 74 74 + domain := s.cfg.Server.Hostname 75 75 + recordInstance := record.Instance 76 76 + 77 77 + if recordInstance != domain { 78 78 + l.Error("domain mismatch", "domain", recordInstance, "expected", domain) 79 79 + return fmt.Errorf("domain mismatch: %s != %s", record.Instance, domain) 80 80 + } 81 81 + 82 82 + ok, err := s.e.IsSpindleInviteAllowed(did, rbacDomain) 83 83 + if err != nil || !ok { 84 84 + l.Error("failed to add member", "did", did, "error", err) 85 85 + return fmt.Errorf("failed to enforce permissions: %w", err) 86 86 + } 87 87 + 88 88 + if err := db.AddSpindleMember(s.db, db.SpindleMember{ 89 89 + Did: syntax.DID(did), 90 90 + Rkey: rkey, 91 91 + Instance: recordInstance, 92 92 + Subject: syntax.DID(record.Subject), 93 93 + Created: time.Now(), 94 94 + }); err != nil { 95 95 + l.Error("failed to add member", "error", err) 96 96 + return fmt.Errorf("failed to add member: %w", err) 97 97 + } 98 98 + 99 99 + if err := s.e.AddSpindleMember(rbacDomain, record.Subject); err != nil { 100 100 + l.Error("failed to add member", "error", err) 101 101 + return fmt.Errorf("failed to add member: %w", err) 102 102 + } 103 103 + l.Info("added member from firehose", "member", record.Subject) 104 104 + 105 105 + if err := s.db.AddDid(record.Subject); err != nil { 106 106 + l.Error("failed to add did", "error", err) 107 107 + return fmt.Errorf("failed to add did: %w", err) 108 108 + } 109 109 + s.jc.AddDid(record.Subject) 110 110 + 111 111 + return nil 112 112 + 113 113 + case models.CommitOperationDelete: 114 114 + record, err := db.GetSpindleMember(s.db, did, rkey) 115 115 + if err != nil { 116 116 + l.Error("failed to find member", "error", err) 117 117 + return fmt.Errorf("failed to find member: %w", err) 118 118 + } 119 119 + 120 120 + if err := db.RemoveSpindleMember(s.db, did, rkey); err != nil { 121 121 + l.Error("failed to remove member", "error", err) 122 122 + return fmt.Errorf("failed to remove member: %w", err) 123 123 + } 124 124 + 125 125 + if err := s.e.RemoveSpindleMember(rbacDomain, record.Subject.String()); err != nil { 126 126 + l.Error("failed to add member", "error", err) 127 127 + return fmt.Errorf("failed to add member: %w", err) 128 128 + } 129 129 + l.Info("added member from firehose", "member", record.Subject) 130 130 + 131 131 + if err := s.db.RemoveDid(record.Subject.String()); err != nil { 132 132 + l.Error("failed to add did", "error", err) 133 133 + return fmt.Errorf("failed to add did: %w", err) 134 134 + } 135 135 + s.jc.RemoveDid(record.Subject.String()) 136 136 + 137 137 + } 138 138 + return nil 139 139 + } 140 140 + 141 141 + func (s *Spindle) ingestRepo(ctx context.Context, e *models.Event) error { 142 142 + var err error 143 143 + did := e.Did 144 144 + 145 145 + l := s.l.With("component", "ingester", "record", tangled.RepoNSID) 146 146 + 147 147 + l.Info("ingesting repo record", "did", did) 148 148 + 149 149 + switch e.Commit.Operation { 150 150 + case models.CommitOperationCreate, models.CommitOperationUpdate: 151 151 + raw := e.Commit.Record 152 152 + record := tangled.Repo{} 153 153 + err = json.Unmarshal(raw, &record) 154 154 + if err != nil { 155 155 + l.Error("invalid record", "error", err) 156 156 + return err 157 157 + } 158 158 + 159 159 + domain := s.cfg.Server.Hostname 160 160 + 161 161 + // no spindle configured for this repo 162 162 + if record.Spindle == nil { 163 163 + l.Info("no spindle configured", "name", record.Name) 164 164 + return nil 165 165 + } 166 166 + 167 167 + // this repo did not want this spindle 168 168 + if *record.Spindle != domain { 169 169 + l.Info("different spindle configured", "name", record.Name, "spindle", *record.Spindle, "domain", domain) 170 170 + return nil 171 171 + } 172 172 + 173 173 + // add this repo to the watch list 174 174 + if err := s.db.AddRepo(record.Knot, did, record.Name); err != nil { 175 175 + l.Error("failed to add repo", "error", err) 176 176 + return fmt.Errorf("failed to add repo: %w", err) 177 177 + } 178 178 + 179 179 + didSlashRepo, err := securejoin.SecureJoin(did, record.Name) 180 180 + if err != nil { 181 181 + return err 182 182 + } 183 183 + 184 184 + // add repo to rbac 185 185 + if err := s.e.AddRepo(did, rbac.ThisServer, didSlashRepo); err != nil { 186 186 + l.Error("failed to add repo to enforcer", "error", err) 187 187 + return fmt.Errorf("failed to add repo: %w", err) 188 188 + } 189 189 + 190 190 + // add collaborators to rbac 191 191 + owner, err := s.res.ResolveIdent(ctx, did) 192 192 + if err != nil || owner.Handle.IsInvalidHandle() { 193 193 + return err 194 194 + } 195 195 + if err := s.fetchAndAddCollaborators(ctx, owner, didSlashRepo); err != nil { 196 196 + return err 197 197 + } 198 198 + 199 199 + // add this knot to the event consumer 200 200 + src := eventconsumer.NewKnotSource(record.Knot) 201 201 + s.ks.AddSource(context.Background(), src) 202 202 + 203 203 + return nil 204 204 + 205 205 + } 206 206 + return nil 207 207 + } 208 208 + 209 209 + func (s *Spindle) ingestCollaborator(ctx context.Context, e *models.Event) error { 210 210 + var err error 211 211 + 212 212 + l := s.l.With("component", "ingester", "record", tangled.RepoCollaboratorNSID, "did", e.Did) 213 213 + 214 214 + l.Info("ingesting collaborator record") 215 215 + 216 216 + switch e.Commit.Operation { 217 217 + case models.CommitOperationCreate, models.CommitOperationUpdate: 218 218 + raw := e.Commit.Record 219 219 + record := tangled.RepoCollaborator{} 220 220 + err = json.Unmarshal(raw, &record) 221 221 + if err != nil { 222 222 + l.Error("invalid record", "error", err) 223 223 + return err 224 224 + } 225 225 + 226 226 + subjectId, err := s.res.ResolveIdent(ctx, record.Subject) 227 227 + if err != nil || subjectId.Handle.IsInvalidHandle() { 228 228 + return err 229 229 + } 230 230 + 231 231 + repoAt, err := syntax.ParseATURI(record.Repo) 232 232 + if err != nil { 233 233 + l.Info("rejecting record, invalid repoAt", "repoAt", record.Repo) 234 234 + return nil 235 235 + } 236 236 + 237 237 + // TODO: get rid of this entirely 238 238 + // resolve this aturi to extract the repo record 239 239 + owner, err := s.res.ResolveIdent(ctx, repoAt.Authority().String()) 240 240 + if err != nil || owner.Handle.IsInvalidHandle() { 241 241 + return fmt.Errorf("failed to resolve handle: %w", err) 242 242 + } 243 243 + 244 244 + xrpcc := xrpc.Client{ 245 245 + Host: owner.PDSEndpoint(), 246 246 + } 247 247 + 248 248 + resp, err := comatproto.RepoGetRecord(ctx, &xrpcc, "", tangled.RepoNSID, repoAt.Authority().String(), repoAt.RecordKey().String()) 249 249 + if err != nil { 250 250 + return err 251 251 + } 252 252 + 253 253 + repo := resp.Value.Val.(*tangled.Repo) 254 254 + didSlashRepo, _ := securejoin.SecureJoin(owner.DID.String(), repo.Name) 255 255 + 256 256 + // check perms for this user 257 257 + if ok, err := s.e.IsCollaboratorInviteAllowed(owner.DID.String(), rbac.ThisServer, didSlashRepo); !ok || err != nil { 258 258 + return fmt.Errorf("insufficient permissions: %w", err) 259 259 + } 260 260 + 261 261 + // add collaborator to rbac 262 262 + if err := s.e.AddCollaborator(record.Subject, rbac.ThisServer, didSlashRepo); err != nil { 263 263 + l.Error("failed to add repo to enforcer", "error", err) 264 264 + return fmt.Errorf("failed to add repo: %w", err) 265 265 + } 266 266 + 267 267 + return nil 268 268 + } 269 269 + return nil 270 270 + } 271 271 + 272 272 + func (s *Spindle) fetchAndAddCollaborators(ctx context.Context, owner *identity.Identity, didSlashRepo string) error { 273 273 + l := s.l.With("component", "ingester", "handler", "fetchAndAddCollaborators") 274 274 + 275 275 + l.Info("fetching and adding existing collaborators") 276 276 + 277 277 + xrpcc := xrpc.Client{ 278 278 + Host: owner.PDSEndpoint(), 279 279 + } 280 280 + 281 281 + resp, err := comatproto.RepoListRecords(ctx, &xrpcc, tangled.RepoCollaboratorNSID, "", 50, owner.DID.String(), false) 282 282 + if err != nil { 283 283 + return err 284 284 + } 285 285 + 286 286 + var errs error 287 287 + for _, r := range resp.Records { 288 288 + if r == nil { 289 289 + continue 290 290 + } 291 291 + record := r.Value.Val.(*tangled.RepoCollaborator) 292 292 + 293 293 + if err := s.e.AddCollaborator(record.Subject, rbac.ThisServer, didSlashRepo); err != nil { 294 294 + l.Error("failed to add repo to enforcer", "error", err) 295 295 + errors.Join(errs, fmt.Errorf("failed to add repo: %w", err)) 296 296 + } 297 297 + } 298 298 + 299 299 + return errs 300 300 + }

+1 -1

spindle/models/pipeline_env.go

··· 20 20 // Standard CI environment variable 21 21 env["CI"] = "true" 22 22 23 23 - env["TANGLED_PIPELINE_ID"] = pipelineId.AtUri().String() 23 23 + env["TANGLED_PIPELINE_ID"] = pipelineId.Rkey 24 24 25 25 // Repo info 26 26 if tr.Repo != nil {

+179 -234

spindle/server.go

··· 4 4 "context" 5 5 _ "embed" 6 6 "encoding/json" 7 7 - "errors" 8 7 "fmt" 9 8 "log/slog" 10 9 "maps" 11 10 "net/http" 12 12 - "path/filepath" 11 11 + "sync" 13 12 14 14 - "github.com/bluesky-social/indigo/atproto/syntax" 15 13 "github.com/go-chi/chi/v5" 16 16 - "github.com/go-git/go-git/v5/plumbing/object" 17 17 - "github.com/hashicorp/go-version" 18 14 "tangled.org/core/api/tangled" 19 15 "tangled.org/core/eventconsumer" 20 16 "tangled.org/core/eventconsumer/cursor" 21 17 "tangled.org/core/idresolver" 22 22 - kgit "tangled.org/core/knotserver/git" 18 18 + "tangled.org/core/jetstream" 23 19 "tangled.org/core/log" 24 20 "tangled.org/core/notifier" 25 25 - "tangled.org/core/rbac2" 21 21 + "tangled.org/core/rbac" 26 22 "tangled.org/core/spindle/config" 27 23 "tangled.org/core/spindle/db" 28 24 "tangled.org/core/spindle/engine" 29 25 "tangled.org/core/spindle/engines/nixery" 30 30 - "tangled.org/core/spindle/git" 31 26 "tangled.org/core/spindle/models" 32 27 "tangled.org/core/spindle/queue" 33 28 "tangled.org/core/spindle/secrets" 34 29 "tangled.org/core/spindle/xrpc" 35 35 - "tangled.org/core/tap" 36 36 - "tangled.org/core/tid" 37 37 - "tangled.org/core/workflow" 38 30 "tangled.org/core/xrpc/serviceauth" 39 31 ) 40 32 41 33 //go:embed motd 42 42 - var motd []byte 34 34 + var defaultMotd []byte 35 35 + 36 36 + const ( 37 37 + rbacDomain = "thisserver" 38 38 + ) 43 39 44 40 type Spindle struct { 45 45 - tap *tap.Client 46 46 - db *db.DB 47 47 - e *rbac2.Enforcer 48 48 - l *slog.Logger 49 49 - n *notifier.Notifier 50 50 - engs map[string]models.Engine 51 51 - jq *queue.Queue 52 52 - cfg *config.Config 53 53 - ks *eventconsumer.Consumer 54 54 - res *idresolver.Resolver 55 55 - vault secrets.Manager 41 41 + jc *jetstream.JetstreamClient 42 42 + db *db.DB 43 43 + e *rbac.Enforcer 44 44 + l *slog.Logger 45 45 + n *notifier.Notifier 46 46 + engs map[string]models.Engine 47 47 + jq *queue.Queue 48 48 + cfg *config.Config 49 49 + ks *eventconsumer.Consumer 50 50 + res *idresolver.Resolver 51 51 + vault secrets.Manager 52 52 + motd []byte 53 53 + motdMu sync.RWMutex 56 54 } 57 55 58 56 // New creates a new Spindle server with the provided configuration and engines. 59 57 func New(ctx context.Context, cfg *config.Config, engines map[string]models.Engine) (*Spindle, error) { 60 58 logger := log.FromContext(ctx) 61 59 62 62 - if err := ensureGitVersion(); err != nil { 63 63 - return nil, fmt.Errorf("ensuring git version: %w", err) 64 64 - } 65 65 - 66 66 - d, err := db.Make(ctx, cfg.Server.DBPath()) 60 60 + d, err := db.Make(cfg.Server.DBPath) 67 61 if err != nil { 68 62 return nil, fmt.Errorf("failed to setup db: %w", err) 69 63 } 70 64 71 71 - e, err := rbac2.NewEnforcer(cfg.Server.DBPath()) 65 65 + e, err := rbac.NewEnforcer(cfg.Server.DBPath) 72 66 if err != nil { 73 67 return nil, fmt.Errorf("failed to setup rbac enforcer: %w", err) 74 68 } 69 69 + e.E.EnableAutoSave(true) 75 70 76 71 n := notifier.New() 77 72 ··· 91 86 } 92 87 logger.Info("using openbao secrets provider", "proxy_address", cfg.Server.Secrets.OpenBao.ProxyAddr, "mount", cfg.Server.Secrets.OpenBao.Mount) 93 88 case "sqlite", "": 94 94 - vault, err = secrets.NewSQLiteManager(cfg.Server.DBPath(), secrets.WithTableName("secrets")) 89 89 + vault, err = secrets.NewSQLiteManager(cfg.Server.DBPath, secrets.WithTableName("secrets")) 95 90 if err != nil { 96 91 return nil, fmt.Errorf("failed to setup sqlite secrets provider: %w", err) 97 92 } 98 98 - logger.Info("using sqlite secrets provider", "path", cfg.Server.DBPath()) 93 93 + logger.Info("using sqlite secrets provider", "path", cfg.Server.DBPath) 99 94 default: 100 95 return nil, fmt.Errorf("unknown secrets provider: %s", cfg.Server.Secrets.Provider) 101 96 } ··· 103 98 jq := queue.NewQueue(cfg.Server.QueueSize, cfg.Server.MaxJobCount) 104 99 logger.Info("initialized queue", "queueSize", cfg.Server.QueueSize, "numWorkers", cfg.Server.MaxJobCount) 105 100 106 106 - tap := tap.NewClient(cfg.Server.TapUrl, "") 101 101 + collections := []string{ 102 102 + tangled.SpindleMemberNSID, 103 103 + tangled.RepoNSID, 104 104 + tangled.RepoCollaboratorNSID, 105 105 + } 106 106 + jc, err := jetstream.NewJetstreamClient(cfg.Server.JetstreamEndpoint, "spindle", collections, nil, log.SubLogger(logger, "jetstream"), d, true, true) 107 107 + if err != nil { 108 108 + return nil, fmt.Errorf("failed to setup jetstream client: %w", err) 109 109 + } 110 110 + jc.AddDid(cfg.Server.Owner) 111 111 + 112 112 + // Check if the spindle knows about any Dids; 113 113 + dids, err := d.GetAllDids() 114 114 + if err != nil { 115 115 + return nil, fmt.Errorf("failed to get all dids: %w", err) 116 116 + } 117 117 + for _, d := range dids { 118 118 + jc.AddDid(d) 119 119 + } 107 120 108 121 resolver := idresolver.DefaultResolver(cfg.Server.PlcUrl) 109 122 110 123 spindle := &Spindle{ 111 111 - tap: &tap, 124 124 + jc: jc, 112 125 e: e, 113 126 db: d, 114 127 l: logger, ··· 118 131 cfg: cfg, 119 132 res: resolver, 120 133 vault: vault, 134 134 + motd: defaultMotd, 121 135 } 122 136 123 123 - err = e.SetSpindleOwner(spindle.cfg.Server.Owner, spindle.cfg.Server.Did()) 137 137 + err = e.AddSpindle(rbacDomain) 138 138 + if err != nil { 139 139 + return nil, fmt.Errorf("failed to set rbac domain: %w", err) 140 140 + } 141 141 + err = spindle.configureOwner() 124 142 if err != nil { 125 143 return nil, err 126 144 } 127 145 logger.Info("owner set", "did", cfg.Server.Owner) 128 146 129 129 - cursorStore, err := cursor.NewSQLiteStore(cfg.Server.DBPath()) 147 147 + cursorStore, err := cursor.NewSQLiteStore(cfg.Server.DBPath) 130 148 if err != nil { 131 149 return nil, fmt.Errorf("failed to setup sqlite3 cursor store: %w", err) 132 150 } 133 151 134 134 - // spindle listen to knot stream for sh.tangled.git.refUpdate 135 135 - // which will sync the local workflow files in spindle and enqueues the 136 136 - // pipeline job for on-push workflows 152 152 + err = jc.StartJetstream(ctx, spindle.ingest()) 153 153 + if err != nil { 154 154 + return nil, fmt.Errorf("failed to start jetstream consumer: %w", err) 155 155 + } 156 156 + 157 157 + // for each incoming sh.tangled.pipeline, we execute 158 158 + // spindle.processPipeline, which in turn enqueues the pipeline 159 159 + // job in the above registered queue. 137 160 ccfg := eventconsumer.NewConsumerConfig() 138 161 ccfg.Logger = log.SubLogger(logger, "eventconsumer") 139 162 ccfg.Dev = cfg.Server.Dev 140 140 - ccfg.ProcessFunc = spindle.processKnotStream 163 163 + ccfg.ProcessFunc = spindle.processPipeline 141 164 ccfg.CursorStore = cursorStore 142 165 knownKnots, err := d.Knots() 143 166 if err != nil { ··· 178 201 } 179 202 180 203 // Enforcer returns the RBAC enforcer instance. 181 181 - func (s *Spindle) Enforcer() *rbac2.Enforcer { 204 204 + func (s *Spindle) Enforcer() *rbac.Enforcer { 182 205 return s.e 183 206 } 184 207 208 208 + // SetMotdContent sets custom MOTD content, replacing the embedded default. 209 209 + func (s *Spindle) SetMotdContent(content []byte) { 210 210 + s.motdMu.Lock() 211 211 + defer s.motdMu.Unlock() 212 212 + s.motd = content 213 213 + } 214 214 + 215 215 + // GetMotdContent returns the current MOTD content. 216 216 + func (s *Spindle) GetMotdContent() []byte { 217 217 + s.motdMu.RLock() 218 218 + defer s.motdMu.RUnlock() 219 219 + return s.motd 220 220 + } 221 221 + 185 222 // Start starts the Spindle server (blocking). 186 223 func (s *Spindle) Start(ctx context.Context) error { 187 224 // starts a job queue runner in the background ··· 196 233 go func() { 197 234 s.l.Info("starting knot event consumer") 198 235 s.ks.Start(ctx) 199 199 - }() 200 200 - 201 201 - // ensure server owner is tracked 202 202 - if err := s.tap.AddRepos(ctx, []syntax.DID{s.cfg.Server.Owner}); err != nil { 203 203 - return err 204 204 - } 205 205 - 206 206 - go func() { 207 207 - s.l.Info("starting tap stream consumer") 208 208 - s.tap.Connect(ctx, &tap.SimpleIndexer{ 209 209 - EventHandler: s.processEvent, 210 210 - }) 211 236 }() 212 237 213 238 s.l.Info("starting spindle server", "address", s.cfg.Server.ListenAddr) ··· 239 264 mux := chi.NewRouter() 240 265 241 266 mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { 242 242 - w.Write(motd) 267 267 + w.Write(s.GetMotdContent()) 243 268 }) 244 269 mux.HandleFunc("/events", s.Events) 245 270 mux.HandleFunc("/logs/{knot}/{rkey}/{name}", s.Logs) ··· 261 286 Config: s.cfg, 262 287 Resolver: s.res, 263 288 Vault: s.vault, 264 264 - Notifier: s.Notifier(), 265 289 ServiceAuth: serviceAuth, 266 290 } 267 291 268 292 return x.Router() 269 293 } 270 294 271 271 - func (s *Spindle) processKnotStream(ctx context.Context, src eventconsumer.Source, msg eventconsumer.Message) error { 272 272 - l := log.FromContext(ctx).With("handler", "processKnotStream") 273 273 - l = l.With("src", src.Key(), "msg.Nsid", msg.Nsid, "msg.Rkey", msg.Rkey) 274 274 - if msg.Nsid == tangled.GitRefUpdateNSID { 275 275 - event := tangled.GitRefUpdate{} 276 276 - if err := json.Unmarshal(msg.EventJson, &event); err != nil { 277 277 - l.Error("error unmarshalling", "err", err) 295 295 + func (s *Spindle) processPipeline(ctx context.Context, src eventconsumer.Source, msg eventconsumer.Message) error { 296 296 + if msg.Nsid == tangled.PipelineNSID { 297 297 + tpl := tangled.Pipeline{} 298 298 + err := json.Unmarshal(msg.EventJson, &tpl) 299 299 + if err != nil { 300 300 + fmt.Println("error unmarshalling", err) 278 301 return err 279 302 } 280 280 - l = l.With("repoDid", event.RepoDid, "repoName", event.RepoName) 281 303 282 282 - // resolve repo name to rkey 283 283 - // TODO: git.refUpdate should respond with rkey instead of repo name 284 284 - repo, err := s.db.GetRepoWithName(syntax.DID(event.RepoDid), event.RepoName) 285 285 - if err != nil { 286 286 - return fmt.Errorf("get repo with did and name (%s/%s): %w", event.RepoDid, event.RepoName, err) 304 304 + if tpl.TriggerMetadata == nil { 305 305 + return fmt.Errorf("no trigger metadata found") 287 306 } 288 307 289 289 - // NOTE: we are blindly trusting the knot that it will return only repos it own 290 290 - repoCloneUri := s.newRepoCloneUrl(src.Key(), event.RepoDid, event.RepoName) 291 291 - repoPath := s.newRepoPath(repo.Did, repo.Rkey) 292 292 - if err := git.SparseSyncGitRepo(ctx, repoCloneUri, repoPath, event.NewSha); err != nil { 293 293 - return fmt.Errorf("sync git repo: %w", err) 308 308 + if tpl.TriggerMetadata.Repo == nil { 309 309 + return fmt.Errorf("no repo data found") 294 310 } 295 295 - l.Info("synced git repo") 296 311 297 297 - compiler := workflow.Compiler{ 298 298 - Trigger: tangled.Pipeline_TriggerMetadata{ 299 299 - Kind: string(workflow.TriggerKindPush), 300 300 - Push: &tangled.Pipeline_PushTriggerData{ 301 301 - Ref: event.Ref, 302 302 - OldSha: event.OldSha, 303 303 - NewSha: event.NewSha, 304 304 - }, 305 305 - Repo: &tangled.Pipeline_TriggerRepo{ 306 306 - Did: repo.Did.String(), 307 307 - Knot: repo.Knot, 308 308 - Repo: repo.Name, 309 309 - }, 310 310 - }, 312 312 + if src.Key() != tpl.TriggerMetadata.Repo.Knot { 313 313 + return fmt.Errorf("repo knot does not match event source: %s != %s", src.Key(), tpl.TriggerMetadata.Repo.Knot) 311 314 } 312 315 313 313 - // load workflow definitions from rev (without spindle context) 314 314 - rawPipeline, err := s.loadPipeline(ctx, repoCloneUri, repoPath, event.NewSha) 316 316 + // filter by repos 317 317 + _, err = s.db.GetRepo( 318 318 + tpl.TriggerMetadata.Repo.Knot, 319 319 + tpl.TriggerMetadata.Repo.Did, 320 320 + tpl.TriggerMetadata.Repo.Repo, 321 321 + ) 315 322 if err != nil { 316 316 - return fmt.Errorf("loading pipeline: %w", err) 317 317 - } 318 318 - if len(rawPipeline) == 0 { 319 319 - l.Info("no workflow definition find for the repo. skipping the event") 320 320 - return nil 321 321 - } 322 322 - tpl := compiler.Compile(compiler.Parse(rawPipeline)) 323 323 - // TODO: pass compile error to workflow log 324 324 - for _, w := range compiler.Diagnostics.Errors { 325 325 - l.Error(w.String()) 326 326 - } 327 327 - for _, w := range compiler.Diagnostics.Warnings { 328 328 - l.Warn(w.String()) 323 323 + return err 329 324 } 330 325 331 326 pipelineId := models.PipelineId{ 332 332 - Knot: tpl.TriggerMetadata.Repo.Knot, 333 333 - Rkey: tid.TID(), 327 327 + Knot: src.Key(), 328 328 + Rkey: msg.Rkey, 334 329 } 335 335 - if err := s.db.CreatePipelineEvent(pipelineId.Rkey, tpl, s.n); err != nil { 336 336 - l.Error("failed to create pipeline event", "err", err) 337 337 - return nil 338 338 - } 339 339 - err = s.processPipeline(ctx, tpl, pipelineId) 340 340 - if err != nil { 341 341 - return err 342 342 - } 343 343 - } 330 330 + 331 331 + workflows := make(map[models.Engine][]models.Workflow) 344 332 345 345 - return nil 346 346 - } 333 333 + // Build pipeline environment variables once for all workflows 334 334 + pipelineEnv := models.PipelineEnvVars(tpl.TriggerMetadata, pipelineId, s.cfg.Server.Dev) 347 335 348 348 - func (s *Spindle) loadPipeline(ctx context.Context, repoUri, repoPath, rev string) (workflow.RawPipeline, error) { 349 349 - if err := git.SparseSyncGitRepo(ctx, repoUri, repoPath, rev); err != nil { 350 350 - return nil, fmt.Errorf("syncing git repo: %w", err) 351 351 - } 352 352 - gr, err := kgit.Open(repoPath, rev) 353 353 - if err != nil { 354 354 - return nil, fmt.Errorf("opening git repo: %w", err) 355 355 - } 336 336 + for _, w := range tpl.Workflows { 337 337 + if w != nil { 338 338 + if _, ok := s.engs[w.Engine]; !ok { 339 339 + err = s.db.StatusFailed(models.WorkflowId{ 340 340 + PipelineId: pipelineId, 341 341 + Name: w.Name, 342 342 + }, fmt.Sprintf("unknown engine %#v", w.Engine), -1, s.n) 343 343 + if err != nil { 344 344 + return err 345 345 + } 356 346 357 357 - workflowDir, err := gr.FileTree(ctx, workflow.WorkflowDir) 358 358 - if errors.Is(err, object.ErrDirectoryNotFound) { 359 359 - // return empty RawPipeline when directory doesn't exist 360 360 - return nil, nil 361 361 - } else if err != nil { 362 362 - return nil, fmt.Errorf("loading file tree: %w", err) 363 363 - } 347 347 + continue 348 348 + } 364 349 365 365 - var rawPipeline workflow.RawPipeline 366 366 - for _, e := range workflowDir { 367 367 - if !e.IsFile() { 368 368 - continue 369 369 - } 350 350 + eng := s.engs[w.Engine] 370 351 371 371 - fpath := filepath.Join(workflow.WorkflowDir, e.Name) 372 372 - contents, err := gr.RawContent(fpath) 373 373 - if err != nil { 374 374 - return nil, fmt.Errorf("reading raw content of '%s': %w", fpath, err) 375 375 - } 352 352 + if _, ok := workflows[eng]; !ok { 353 353 + workflows[eng] = []models.Workflow{} 354 354 + } 376 355 377 377 - rawPipeline = append(rawPipeline, workflow.RawWorkflow{ 378 378 - Name: e.Name, 379 379 - Contents: contents, 380 380 - }) 381 381 - } 356 356 + ewf, err := s.engs[w.Engine].InitWorkflow(*w, tpl) 357 357 + if err != nil { 358 358 + return err 359 359 + } 382 360 383 383 - return rawPipeline, nil 384 384 - } 361 361 + // inject TANGLED_* env vars after InitWorkflow 362 362 + // This prevents user-defined env vars from overriding them 363 363 + if ewf.Environment == nil { 364 364 + ewf.Environment = make(map[string]string) 365 365 + } 366 366 + maps.Copy(ewf.Environment, pipelineEnv) 385 367 386 386 - func (s *Spindle) processPipeline(ctx context.Context, tpl tangled.Pipeline, pipelineId models.PipelineId) error { 387 387 - // Build pipeline environment variables once for all workflows 388 388 - pipelineEnv := models.PipelineEnvVars(tpl.TriggerMetadata, pipelineId, s.cfg.Server.Dev) 368 368 + workflows[eng] = append(workflows[eng], *ewf) 389 369 390 390 - // filter & init workflows 391 391 - workflows := make(map[models.Engine][]models.Workflow) 392 392 - for _, w := range tpl.Workflows { 393 393 - if w == nil { 394 394 - continue 395 395 - } 396 396 - if _, ok := s.engs[w.Engine]; !ok { 397 397 - err := s.db.StatusFailed(models.WorkflowId{ 398 398 - PipelineId: pipelineId, 399 399 - Name: w.Name, 400 400 - }, fmt.Sprintf("unknown engine %#v", w.Engine), -1, s.n) 401 401 - if err != nil { 402 402 - return fmt.Errorf("db.StatusFailed: %w", err) 370 370 + err = s.db.StatusPending(models.WorkflowId{ 371 371 + PipelineId: pipelineId, 372 372 + Name: w.Name, 373 373 + }, s.n) 374 374 + if err != nil { 375 375 + return err 376 376 + } 403 377 } 404 404 - 405 405 - continue 406 378 } 407 379 408 408 - eng := s.engs[w.Engine] 409 409 - 410 410 - if _, ok := workflows[eng]; !ok { 411 411 - workflows[eng] = []models.Workflow{} 412 412 - } 413 413 - 414 414 - ewf, err := s.engs[w.Engine].InitWorkflow(*w, tpl) 415 415 - if err != nil { 416 416 - return fmt.Errorf("init workflow: %w", err) 417 417 - } 418 418 - 419 419 - // inject TANGLED_* env vars after InitWorkflow 420 420 - // This prevents user-defined env vars from overriding them 421 421 - if ewf.Environment == nil { 422 422 - ewf.Environment = make(map[string]string) 380 380 + ok := s.jq.Enqueue(queue.Job{ 381 381 + Run: func() error { 382 382 + engine.StartWorkflows(log.SubLogger(s.l, "engine"), s.vault, s.cfg, s.db, s.n, ctx, &models.Pipeline{ 383 383 + RepoOwner: tpl.TriggerMetadata.Repo.Did, 384 384 + RepoName: tpl.TriggerMetadata.Repo.Repo, 385 385 + Workflows: workflows, 386 386 + }, pipelineId) 387 387 + return nil 388 388 + }, 389 389 + OnFail: func(jobError error) { 390 390 + s.l.Error("pipeline run failed", "error", jobError) 391 391 + }, 392 392 + }) 393 393 + if ok { 394 394 + s.l.Info("pipeline enqueued successfully", "id", msg.Rkey) 395 395 + } else { 396 396 + s.l.Error("failed to enqueue pipeline: queue is full") 423 397 } 424 424 - maps.Copy(ewf.Environment, pipelineEnv) 425 425 - 426 426 - workflows[eng] = append(workflows[eng], *ewf) 427 398 } 428 399 429 429 - // enqueue pipeline 430 430 - ok := s.jq.Enqueue(queue.Job{ 431 431 - Run: func() error { 432 432 - engine.StartWorkflows(log.SubLogger(s.l, "engine"), s.vault, s.cfg, s.db, s.n, ctx, &models.Pipeline{ 433 433 - RepoOwner: tpl.TriggerMetadata.Repo.Did, 434 434 - RepoName: tpl.TriggerMetadata.Repo.Repo, 435 435 - Workflows: workflows, 436 436 - }, pipelineId) 437 437 - return nil 438 438 - }, 439 439 - OnFail: func(jobError error) { 440 440 - s.l.Error("pipeline run failed", "error", jobError) 441 441 - }, 442 442 - }) 443 443 - if !ok { 444 444 - return fmt.Errorf("failed to enqueue pipeline: queue is full") 445 445 - } 446 446 - s.l.Info("pipeline enqueued successfully", "id", pipelineId) 447 447 - 448 448 - // emit StatusPending for all workflows here (after successful enqueue) 449 449 - for _, ewfs := range workflows { 450 450 - for _, ewf := range ewfs { 451 451 - err := s.db.StatusPending(models.WorkflowId{ 452 452 - PipelineId: pipelineId, 453 453 - Name: ewf.Name, 454 454 - }, s.n) 455 455 - if err != nil { 456 456 - return fmt.Errorf("db.StatusPending: %w", err) 457 457 - } 458 458 - } 459 459 - } 460 400 return nil 461 401 } 462 402 463 463 - // newRepoPath creates a path to store repository by its did and rkey. 464 464 - // The path format would be: `/data/repos/did:plc:foo/sh.tangled.repo/repo-rkey 465 465 - func (s *Spindle) newRepoPath(did syntax.DID, rkey syntax.RecordKey) string { 466 466 - return filepath.Join(s.cfg.Server.RepoDir(), did.String(), tangled.RepoNSID, rkey.String()) 467 467 - } 403 403 + func (s *Spindle) configureOwner() error { 404 404 + cfgOwner := s.cfg.Server.Owner 468 405 469 469 - func (s *Spindle) newRepoCloneUrl(knot, did, name string) string { 470 470 - scheme := "https://" 471 471 - if s.cfg.Server.Dev { 472 472 - scheme = "http://" 406 406 + existing, err := s.e.GetSpindleUsersByRole("server:owner", rbacDomain) 407 407 + if err != nil { 408 408 + return err 473 409 } 474 474 - return fmt.Sprintf("%s%s/%s/%s", scheme, knot, did, name) 475 475 - } 410 410 + 411 411 + switch len(existing) { 412 412 + case 0: 413 413 + // no owner configured, continue 414 414 + case 1: 415 415 + // find existing owner 416 416 + existingOwner := existing[0] 476 417 477 477 - const RequiredVersion = "2.49.0" 418 418 + // no ownership change, this is okay 419 419 + if existingOwner == s.cfg.Server.Owner { 420 420 + break 421 421 + } 478 422 479 479 - func ensureGitVersion() error { 480 480 - v, err := git.Version() 481 481 - if err != nil { 482 482 - return fmt.Errorf("fetching git version: %w", err) 483 483 - } 484 484 - if v.LessThan(version.Must(version.NewVersion(RequiredVersion))) { 485 485 - return fmt.Errorf("installed git version %q is not supported, Spindle requires git version >= %q", v, RequiredVersion) 423 423 + // remove existing owner 424 424 + err = s.e.RemoveSpindleOwner(rbacDomain, existingOwner) 425 425 + if err != nil { 426 426 + return nil 427 427 + } 428 428 + default: 429 429 + return fmt.Errorf("more than one owner in DB, try deleting %q and starting over", s.cfg.Server.DBPath) 486 430 } 487 487 - return nil 431 431 + 432 432 + return s.e.AddSpindleOwner(rbacDomain, cfgOwner) 488 433 }

-391

spindle/tap.go

··· 1 1 - package spindle 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "encoding/json" 6 6 - "fmt" 7 7 - "time" 8 8 - 9 9 - "github.com/bluesky-social/indigo/atproto/syntax" 10 10 - "tangled.org/core/api/tangled" 11 11 - "tangled.org/core/eventconsumer" 12 12 - "tangled.org/core/spindle/db" 13 13 - "tangled.org/core/spindle/git" 14 14 - "tangled.org/core/spindle/models" 15 15 - "tangled.org/core/tap" 16 16 - "tangled.org/core/tid" 17 17 - "tangled.org/core/workflow" 18 18 - ) 19 19 - 20 20 - func (s *Spindle) processEvent(ctx context.Context, evt tap.Event) error { 21 21 - l := s.l.With("component", "tapIndexer") 22 22 - 23 23 - var err error 24 24 - switch evt.Type { 25 25 - case tap.EvtRecord: 26 26 - switch evt.Record.Collection.String() { 27 27 - case tangled.SpindleMemberNSID: 28 28 - err = s.processMember(ctx, evt) 29 29 - case tangled.RepoNSID: 30 30 - err = s.processRepo(ctx, evt) 31 31 - case tangled.RepoCollaboratorNSID: 32 32 - err = s.processCollaborator(ctx, evt) 33 33 - case tangled.RepoPullNSID: 34 34 - err = s.processPull(ctx, evt) 35 35 - } 36 36 - case tap.EvtIdentity: 37 37 - // no-op 38 38 - } 39 39 - 40 40 - if err != nil { 41 41 - l.Error("failed to process message. will retry later", "event.ID", evt.ID, "err", err) 42 42 - return err 43 43 - } 44 44 - return nil 45 45 - } 46 46 - 47 47 - // NOTE: make sure to return nil if we don't need to retry (e.g. forbidden, unrelated) 48 48 - 49 49 - func (s *Spindle) processMember(ctx context.Context, evt tap.Event) error { 50 50 - l := s.l.With("component", "tapIndexer", "record", evt.Record.AtUri()) 51 51 - 52 52 - l.Info("processing spindle.member record") 53 53 - 54 54 - // only listen to members 55 55 - if ok, err := s.e.IsSpindleMemberInviteAllowed(evt.Record.Did, s.cfg.Server.Did()); !ok || err != nil { 56 56 - l.Warn("forbidden request: member invite not allowed", "did", evt.Record.Did, "error", err) 57 57 - return nil 58 58 - } 59 59 - 60 60 - switch evt.Record.Action { 61 61 - case tap.RecordCreateAction, tap.RecordUpdateAction: 62 62 - record := tangled.SpindleMember{} 63 63 - if err := json.Unmarshal(evt.Record.Record, &record); err != nil { 64 64 - return fmt.Errorf("parsing record: %w", err) 65 65 - } 66 66 - 67 67 - domain := s.cfg.Server.Hostname 68 68 - if record.Instance != domain { 69 69 - l.Info("domain mismatch", "domain", record.Instance, "expected", domain) 70 70 - return nil 71 71 - } 72 72 - 73 73 - created, err := time.Parse(record.CreatedAt, time.RFC3339) 74 74 - if err != nil { 75 75 - created = time.Now() 76 76 - } 77 77 - if err := db.AddSpindleMember(s.db, db.SpindleMember{ 78 78 - Did: evt.Record.Did, 79 79 - Rkey: evt.Record.Rkey.String(), 80 80 - Instance: record.Instance, 81 81 - Subject: syntax.DID(record.Subject), 82 82 - Created: created, 83 83 - }); err != nil { 84 84 - l.Error("failed to add member", "error", err) 85 85 - return fmt.Errorf("adding member to db: %w", err) 86 86 - } 87 87 - if err := s.e.AddSpindleMember(syntax.DID(record.Subject), s.cfg.Server.Did()); err != nil { 88 88 - return fmt.Errorf("adding member to rbac: %w", err) 89 89 - } 90 90 - if err := s.tap.AddRepos(ctx, []syntax.DID{syntax.DID(record.Subject)}); err != nil { 91 91 - return fmt.Errorf("adding did to tap", err) 92 92 - } 93 93 - 94 94 - l.Info("added member", "member", record.Subject) 95 95 - return nil 96 96 - 97 97 - case tap.RecordDeleteAction: 98 98 - var ( 99 99 - did = evt.Record.Did.String() 100 100 - rkey = evt.Record.Rkey.String() 101 101 - ) 102 102 - member, err := db.GetSpindleMember(s.db, did, rkey) 103 103 - if err != nil { 104 104 - return fmt.Errorf("finding member: %w", err) 105 105 - } 106 106 - 107 107 - if err := db.RemoveSpindleMember(s.db, did, rkey); err != nil { 108 108 - return fmt.Errorf("removing member from db: %w", err) 109 109 - } 110 110 - if err := s.e.RemoveSpindleMember(member.Subject, s.cfg.Server.Did()); err != nil { 111 111 - return fmt.Errorf("removing member from rbac: %w", err) 112 112 - } 113 113 - if err := s.tapSafeRemoveDid(ctx, member.Subject); err != nil { 114 114 - return fmt.Errorf("removing did from tap: %w", err) 115 115 - } 116 116 - 117 117 - l.Info("removed member", "member", member.Subject) 118 118 - return nil 119 119 - } 120 120 - return nil 121 121 - } 122 122 - 123 123 - func (s *Spindle) processCollaborator(ctx context.Context, evt tap.Event) error { 124 124 - l := s.l.With("component", "tapIndexer", "record", evt.Record.AtUri()) 125 125 - 126 126 - l.Info("processing repo.collaborator record") 127 127 - 128 128 - // only listen to members 129 129 - if ok, err := s.e.IsSpindleMember(evt.Record.Did, s.cfg.Server.Did()); !ok || err != nil { 130 130 - l.Warn("forbidden request: not spindle member", "did", evt.Record.Did, "err", err) 131 131 - return nil 132 132 - } 133 133 - 134 134 - switch evt.Record.Action { 135 135 - case tap.RecordCreateAction, tap.RecordUpdateAction: 136 136 - record := tangled.RepoCollaborator{} 137 137 - if err := json.Unmarshal(evt.Record.Record, &record); err != nil { 138 138 - l.Error("invalid record", "err", err) 139 139 - return fmt.Errorf("parsing record: %w", err) 140 140 - } 141 141 - 142 142 - // retry later if target repo is not ingested yet 143 143 - if _, err := s.db.GetRepo(syntax.ATURI(record.Repo)); err != nil { 144 144 - l.Warn("target repo is not ingested yet", "repo", record.Repo, "err", err) 145 145 - return fmt.Errorf("target repo is unknown") 146 146 - } 147 147 - 148 148 - // check perms for this user 149 149 - if ok, err := s.e.IsRepoCollaboratorInviteAllowed(evt.Record.Did, syntax.ATURI(record.Repo)); !ok || err != nil { 150 150 - l.Warn("forbidden request collaborator invite not allowed", "did", evt.Record.Did, "err", err) 151 151 - return nil 152 152 - } 153 153 - 154 154 - if err := s.db.PutRepoCollaborator(&db.RepoCollaborator{ 155 155 - Did: evt.Record.Did, 156 156 - Rkey: evt.Record.Rkey, 157 157 - Repo: syntax.ATURI(record.Repo), 158 158 - Subject: syntax.DID(record.Subject), 159 159 - }); err != nil { 160 160 - return fmt.Errorf("adding collaborator to db: %w", err) 161 161 - } 162 162 - if err := s.e.AddRepoCollaborator(syntax.DID(record.Subject), syntax.ATURI(record.Repo)); err != nil { 163 163 - return fmt.Errorf("adding collaborator to rbac: %w", err) 164 164 - } 165 165 - if err := s.tap.AddRepos(ctx, []syntax.DID{syntax.DID(record.Subject)}); err != nil { 166 166 - return fmt.Errorf("adding did to tap: %w", err) 167 167 - } 168 168 - 169 169 - l.Info("add repo collaborator", "subejct", record.Subject, "repo", record.Repo) 170 170 - return nil 171 171 - 172 172 - case tap.RecordDeleteAction: 173 173 - // get existing collaborator 174 174 - collaborator, err := s.db.GetRepoCollaborator(evt.Record.Did, evt.Record.Rkey) 175 175 - if err != nil { 176 176 - return fmt.Errorf("failed to get existing collaborator info: %w", err) 177 177 - } 178 178 - 179 179 - // check perms for this user 180 180 - if ok, err := s.e.IsRepoCollaboratorInviteAllowed(evt.Record.Did, collaborator.Repo); !ok || err != nil { 181 181 - l.Warn("forbidden request collaborator invite not allowed", "did", evt.Record.Did, "err", err) 182 182 - return nil 183 183 - } 184 184 - 185 185 - if err := s.db.RemoveRepoCollaborator(collaborator.Subject, collaborator.Rkey); err != nil { 186 186 - return fmt.Errorf("removing collaborator from db: %w", err) 187 187 - } 188 188 - if err := s.e.RemoveRepoCollaborator(collaborator.Subject, collaborator.Repo); err != nil { 189 189 - return fmt.Errorf("removing collaborator from rbac: %w", err) 190 190 - } 191 191 - if err := s.tapSafeRemoveDid(ctx, collaborator.Subject); err != nil { 192 192 - return fmt.Errorf("removing did from tap: %w", err) 193 193 - } 194 194 - 195 195 - l.Info("removed repo collaborator", "subejct", collaborator.Subject, "repo", collaborator.Repo) 196 196 - return nil 197 197 - } 198 198 - return nil 199 199 - } 200 200 - 201 201 - func (s *Spindle) processRepo(ctx context.Context, evt tap.Event) error { 202 202 - l := s.l.With("component", "tapIndexer", "record", evt.Record.AtUri()) 203 203 - 204 204 - l.Info("processing repo record") 205 205 - 206 206 - // only listen to members 207 207 - if ok, err := s.e.IsSpindleMember(evt.Record.Did, s.cfg.Server.Did()); !ok || err != nil { 208 208 - l.Warn("forbidden request: not spindle member", "did", evt.Record.Did, "err", err) 209 209 - return nil 210 210 - } 211 211 - 212 212 - switch evt.Record.Action { 213 213 - case tap.RecordCreateAction, tap.RecordUpdateAction: 214 214 - record := tangled.Repo{} 215 215 - if err := json.Unmarshal(evt.Record.Record, &record); err != nil { 216 216 - return fmt.Errorf("parsing record: %w", err) 217 217 - } 218 218 - 219 219 - domain := s.cfg.Server.Hostname 220 220 - if record.Spindle == nil || *record.Spindle != domain { 221 221 - if record.Spindle == nil { 222 222 - l.Info("spindle isn't configured", "name", record.Name) 223 223 - } else { 224 224 - l.Info("different spindle configured", "name", record.Name, "spindle", *record.Spindle, "domain", domain) 225 225 - } 226 226 - if err := s.db.DeleteRepo(evt.Record.Did, evt.Record.Rkey); err != nil { 227 227 - return fmt.Errorf("deleting repo from db: %w", err) 228 228 - } 229 229 - return nil 230 230 - } 231 231 - 232 232 - repo := &db.Repo{ 233 233 - Did: evt.Record.Did, 234 234 - Rkey: evt.Record.Rkey, 235 235 - Name: record.Name, 236 236 - Knot: record.Knot, 237 237 - } 238 238 - 239 239 - if err := s.db.PutRepo(repo); err != nil { 240 240 - return fmt.Errorf("adding repo to db: %w", err) 241 241 - } 242 242 - 243 243 - if err := s.e.AddRepo(evt.Record.AtUri()); err != nil { 244 244 - return fmt.Errorf("adding repo to rbac") 245 245 - } 246 246 - 247 247 - // add this knot to the event consumer 248 248 - src := eventconsumer.NewKnotSource(record.Knot) 249 249 - s.ks.AddSource(context.Background(), src) 250 250 - 251 251 - // setup sparse sync 252 252 - repoCloneUri := s.newRepoCloneUrl(repo.Knot, repo.Did.String(), repo.Name) 253 253 - repoPath := s.newRepoPath(repo.Did, repo.Rkey) 254 254 - if err := git.SparseSyncGitRepo(ctx, repoCloneUri, repoPath, ""); err != nil { 255 255 - return fmt.Errorf("setting up sparse-clone git repo: %w", err) 256 256 - } 257 257 - 258 258 - l.Info("added repo", "repo", evt.Record.AtUri()) 259 259 - return nil 260 260 - 261 261 - case tap.RecordDeleteAction: 262 262 - // check perms for this user 263 263 - if ok, err := s.e.IsRepoOwner(evt.Record.Did, evt.Record.AtUri()); !ok || err != nil { 264 264 - l.Warn("forbidden request: not repo owner", "did", evt.Record.Did, "err", err) 265 265 - return nil 266 266 - } 267 267 - 268 268 - if err := s.db.DeleteRepo(evt.Record.Did, evt.Record.Rkey); err != nil { 269 269 - return fmt.Errorf("deleting repo from db: %w", err) 270 270 - } 271 271 - 272 272 - if err := s.e.DeleteRepo(evt.Record.AtUri()); err != nil { 273 273 - return fmt.Errorf("deleting repo from rbac: %w", err) 274 274 - } 275 275 - 276 276 - l.Info("deleted repo", "repo", evt.Record.AtUri()) 277 277 - return nil 278 278 - } 279 279 - return nil 280 280 - } 281 281 - 282 282 - func (s *Spindle) processPull(ctx context.Context, evt tap.Event) error { 283 283 - l := s.l.With("component", "tapIndexer", "record", evt.Record.AtUri()) 284 284 - 285 285 - l.Info("processing pull record") 286 286 - 287 287 - // only listen to live events 288 288 - if !evt.Record.Live { 289 289 - l.Info("skipping backfill event", "event", evt.Record.AtUri()) 290 290 - return nil 291 291 - } 292 292 - 293 293 - switch evt.Record.Action { 294 294 - case tap.RecordCreateAction, tap.RecordUpdateAction: 295 295 - record := tangled.RepoPull{} 296 296 - if err := json.Unmarshal(evt.Record.Record, &record); err != nil { 297 297 - l.Error("invalid record", "err", err) 298 298 - return fmt.Errorf("parsing record: %w", err) 299 299 - } 300 300 - 301 301 - // ignore legacy records 302 302 - if record.Target == nil { 303 303 - l.Info("ignoring pull record: target repo is nil") 304 304 - return nil 305 305 - } 306 306 - 307 307 - // ignore patch-based and fork-based PRs 308 308 - if record.Source == nil || record.Source.Repo != nil { 309 309 - l.Info("ignoring pull record: not a branch-based pull request") 310 310 - return nil 311 311 - } 312 312 - 313 313 - // skip if target repo is unknown 314 314 - repo, err := s.db.GetRepo(syntax.ATURI(record.Target.Repo)) 315 315 - if err != nil { 316 316 - l.Warn("target repo is not ingested yet", "repo", record.Target.Repo, "err", err) 317 317 - return fmt.Errorf("target repo is unknown") 318 318 - } 319 319 - 320 320 - compiler := workflow.Compiler{ 321 321 - Trigger: tangled.Pipeline_TriggerMetadata{ 322 322 - Kind: string(workflow.TriggerKindPullRequest), 323 323 - PullRequest: &tangled.Pipeline_PullRequestTriggerData{ 324 324 - Action: "create", 325 325 - SourceBranch: record.Source.Branch, 326 326 - SourceSha: record.Source.Sha, 327 327 - TargetBranch: record.Target.Branch, 328 328 - }, 329 329 - Repo: &tangled.Pipeline_TriggerRepo{ 330 330 - Did: repo.Did.String(), 331 331 - Knot: repo.Knot, 332 332 - Repo: repo.Name, 333 333 - }, 334 334 - }, 335 335 - } 336 336 - 337 337 - repoUri := s.newRepoCloneUrl(repo.Knot, repo.Did.String(), repo.Name) 338 338 - repoPath := s.newRepoPath(repo.Did, repo.Rkey) 339 339 - 340 340 - // load workflow definitions from rev (without spindle context) 341 341 - rawPipeline, err := s.loadPipeline(ctx, repoUri, repoPath, record.Source.Sha) 342 342 - if err != nil { 343 343 - // don't retry 344 344 - l.Error("failed loading pipeline", "err", err) 345 345 - return nil 346 346 - } 347 347 - if len(rawPipeline) == 0 { 348 348 - l.Info("no workflow definition find for the repo. skipping the event") 349 349 - return nil 350 350 - } 351 351 - tpl := compiler.Compile(compiler.Parse(rawPipeline)) 352 352 - // TODO: pass compile error to workflow log 353 353 - for _, w := range compiler.Diagnostics.Errors { 354 354 - l.Error(w.String()) 355 355 - } 356 356 - for _, w := range compiler.Diagnostics.Warnings { 357 357 - l.Warn(w.String()) 358 358 - } 359 359 - 360 360 - pipelineId := models.PipelineId{ 361 361 - Knot: tpl.TriggerMetadata.Repo.Knot, 362 362 - Rkey: tid.TID(), 363 363 - } 364 364 - if err := s.db.CreatePipelineEvent(pipelineId.Rkey, tpl, s.n); err != nil { 365 365 - l.Error("failed to create pipeline event", "err", err) 366 366 - return nil 367 367 - } 368 368 - err = s.processPipeline(ctx, tpl, pipelineId) 369 369 - if err != nil { 370 370 - // don't retry 371 371 - l.Error("failed processing pipeline", "err", err) 372 372 - return nil 373 373 - } 374 374 - case tap.RecordDeleteAction: 375 375 - // no-op 376 376 - } 377 377 - return nil 378 378 - } 379 379 - 380 380 - func (s *Spindle) tapSafeRemoveDid(ctx context.Context, did syntax.DID) error { 381 381 - known, err := s.db.IsKnownDid(syntax.DID(did)) 382 382 - if err != nil { 383 383 - return fmt.Errorf("ensuring did known state: %w", err) 384 384 - } 385 385 - if !known { 386 386 - if err := s.tap.RemoveRepos(ctx, []syntax.DID{did}); err != nil { 387 387 - return fmt.Errorf("removing did from tap: %w", err) 388 388 - } 389 389 - } 390 390 - return nil 391 391 - }

+2 -1

spindle/xrpc/add_secret.go

··· 11 11 "github.com/bluesky-social/indigo/xrpc" 12 12 securejoin "github.com/cyphar/filepath-securejoin" 13 13 "tangled.org/core/api/tangled" 14 14 + "tangled.org/core/rbac" 14 15 "tangled.org/core/spindle/secrets" 15 16 xrpcerr "tangled.org/core/xrpc/errors" 16 17 ) ··· 67 68 return 68 69 } 69 70 70 70 - if ok, err := x.Enforcer.IsRepoSettingsWriteAllowed(actorDid, repoAt); !ok || err != nil { 71 71 + if ok, err := x.Enforcer.IsSettingsAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { 71 72 l.Error("insufficent permissions", "did", actorDid.String()) 72 73 writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) 73 74 return

+2 -1

spindle/xrpc/list_secrets.go

··· 11 11 "github.com/bluesky-social/indigo/xrpc" 12 12 securejoin "github.com/cyphar/filepath-securejoin" 13 13 "tangled.org/core/api/tangled" 14 14 + "tangled.org/core/rbac" 14 15 "tangled.org/core/spindle/secrets" 15 16 xrpcerr "tangled.org/core/xrpc/errors" 16 17 ) ··· 62 63 return 63 64 } 64 65 65 65 - if ok, err := x.Enforcer.IsRepoSettingsWriteAllowed(actorDid, repoAt); !ok || err != nil { 66 66 + if ok, err := x.Enforcer.IsSettingsAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { 66 67 l.Error("insufficent permissions", "did", actorDid.String()) 67 68 writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) 68 69 return

+1 -1

spindle/xrpc/owner.go

··· 9 9 ) 10 10 11 11 func (x *Xrpc) Owner(w http.ResponseWriter, r *http.Request) { 12 12 - owner := x.Config.Server.Owner.String() 12 12 + owner := x.Config.Server.Owner 13 13 if owner == "" { 14 14 writeError(w, xrpcerr.OwnerNotFoundError, http.StatusInternalServerError) 15 15 return

-72

spindle/xrpc/pipeline_cancelPipeline.go

··· 1 1 - package xrpc 2 2 - 3 3 - import ( 4 4 - "encoding/json" 5 5 - "fmt" 6 6 - "net/http" 7 7 - "strings" 8 8 - 9 9 - "github.com/bluesky-social/indigo/atproto/syntax" 10 10 - "tangled.org/core/api/tangled" 11 11 - "tangled.org/core/spindle/models" 12 12 - xrpcerr "tangled.org/core/xrpc/errors" 13 13 - ) 14 14 - 15 15 - func (x *Xrpc) CancelPipeline(w http.ResponseWriter, r *http.Request) { 16 16 - l := x.Logger 17 17 - fail := func(e xrpcerr.XrpcError) { 18 18 - l.Error("failed", "kind", e.Tag, "error", e.Message) 19 19 - writeError(w, e, http.StatusBadRequest) 20 20 - } 21 21 - l.Debug("cancel pipeline") 22 22 - 23 23 - actorDid, ok := r.Context().Value(ActorDid).(syntax.DID) 24 24 - if !ok { 25 25 - fail(xrpcerr.MissingActorDidError) 26 26 - return 27 27 - } 28 28 - 29 29 - var input tangled.PipelineCancelPipeline_Input 30 30 - if err := json.NewDecoder(r.Body).Decode(&input); err != nil { 31 31 - fail(xrpcerr.GenericError(err)) 32 32 - return 33 33 - } 34 34 - 35 35 - aturi := syntax.ATURI(input.Pipeline) 36 36 - wid := models.WorkflowId{ 37 37 - PipelineId: models.PipelineId{ 38 38 - Knot: strings.TrimPrefix(aturi.Authority().String(), "did:web:"), 39 39 - Rkey: aturi.RecordKey().String(), 40 40 - }, 41 41 - Name: input.Workflow, 42 42 - } 43 43 - l.Debug("cancel pipeline", "wid", wid) 44 44 - 45 45 - // unfortunately we have to resolve repo-at here 46 46 - repoAt, err := syntax.ParseATURI(input.Repo) 47 47 - if err != nil { 48 48 - fail(xrpcerr.InvalidRepoError(input.Repo)) 49 49 - return 50 50 - } 51 51 - 52 52 - isRepoOwner, err := x.Enforcer.IsRepoOwner(actorDid, repoAt) 53 53 - if err != nil || !isRepoOwner { 54 54 - fail(xrpcerr.AccessControlError(actorDid.String())) 55 55 - return 56 56 - } 57 57 - for _, engine := range x.Engines { 58 58 - l.Debug("destorying workflow", "wid", wid) 59 59 - err = engine.DestroyWorkflow(r.Context(), wid) 60 60 - if err != nil { 61 61 - fail(xrpcerr.GenericError(fmt.Errorf("dailed to destroy workflow: %w", err))) 62 62 - return 63 63 - } 64 64 - err = x.Db.StatusCancelled(wid, "User canceled the workflow", -1, x.Notifier) 65 65 - if err != nil { 66 66 - fail(xrpcerr.GenericError(fmt.Errorf("dailed to emit status failed: %w", err))) 67 67 - return 68 68 - } 69 69 - } 70 70 - 71 71 - w.WriteHeader(http.StatusOK) 72 72 - }

+2 -1

spindle/xrpc/remove_secret.go

··· 10 10 "github.com/bluesky-social/indigo/xrpc" 11 11 securejoin "github.com/cyphar/filepath-securejoin" 12 12 "tangled.org/core/api/tangled" 13 13 + "tangled.org/core/rbac" 13 14 "tangled.org/core/spindle/secrets" 14 15 xrpcerr "tangled.org/core/xrpc/errors" 15 16 ) ··· 61 62 return 62 63 } 63 64 64 64 - if ok, err := x.Enforcer.IsRepoSettingsWriteAllowed(actorDid, repoAt); !ok || err != nil { 65 65 + if ok, err := x.Enforcer.IsSettingsAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { 65 66 l.Error("insufficent permissions", "did", actorDid.String()) 66 67 writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) 67 68 return

+2 -5

spindle/xrpc/xrpc.go

··· 10 10 11 11 "tangled.org/core/api/tangled" 12 12 "tangled.org/core/idresolver" 13 13 - "tangled.org/core/notifier" 14 14 - "tangled.org/core/rbac2" 13 13 + "tangled.org/core/rbac" 15 14 "tangled.org/core/spindle/config" 16 15 "tangled.org/core/spindle/db" 17 16 "tangled.org/core/spindle/models" ··· 25 24 type Xrpc struct { 26 25 Logger *slog.Logger 27 26 Db *db.DB 28 28 - Enforcer *rbac2.Enforcer 27 27 + Enforcer *rbac.Enforcer 29 28 Engines map[string]models.Engine 30 29 Config *config.Config 31 30 Resolver *idresolver.Resolver 32 31 Vault secrets.Manager 33 33 - Notifier *notifier.Notifier 34 32 ServiceAuth *serviceauth.ServiceAuth 35 33 } 36 34 ··· 43 41 r.Post("/"+tangled.RepoAddSecretNSID, x.AddSecret) 44 42 r.Post("/"+tangled.RepoRemoveSecretNSID, x.RemoveSecret) 45 43 r.Get("/"+tangled.RepoListSecretsNSID, x.ListSecrets) 46 46 - r.Post("/"+tangled.PipelineCancelPipelineNSID, x.CancelPipeline) 47 44 }) 48 45 49 46 // service query endpoints (no auth required)

-24

tap/simpleIndexer.go

··· 1 1 - package tap 2 2 - 3 3 - import "context" 4 4 - 5 5 - type SimpleIndexer struct { 6 6 - EventHandler func(ctx context.Context, evt Event) error 7 7 - ErrorHandler func(ctx context.Context, err error) 8 8 - } 9 9 - 10 10 - var _ Handler = (*SimpleIndexer)(nil) 11 11 - 12 12 - func (i *SimpleIndexer) OnEvent(ctx context.Context, evt Event) error { 13 13 - if i.EventHandler == nil { 14 14 - return nil 15 15 - } 16 16 - return i.EventHandler(ctx, evt) 17 17 - } 18 18 - 19 19 - func (i *SimpleIndexer) OnError(ctx context.Context, err error) { 20 20 - if i.ErrorHandler == nil { 21 21 - return 22 22 - } 23 23 - i.ErrorHandler(ctx, err) 24 24 - }

-169

tap/tap.go

··· 1 1 - /// heavily inspired by <https://github.com/bluesky-social/atproto/blob/c7f5a868837d3e9b3289f988fee2267789327b06/packages/tap/README.md> 2 2 - 3 3 - package tap 4 4 - 5 5 - import ( 6 6 - "bytes" 7 7 - "context" 8 8 - "encoding/json" 9 9 - "fmt" 10 10 - "net/http" 11 11 - "net/url" 12 12 - 13 13 - "github.com/bluesky-social/indigo/atproto/syntax" 14 14 - "github.com/gorilla/websocket" 15 15 - "tangled.org/core/log" 16 16 - ) 17 17 - 18 18 - // type WebsocketOptions struct { 19 19 - // maxReconnectSeconds int 20 20 - // heartbeatIntervalMs int 21 21 - // // onReconnectError 22 22 - // } 23 23 - 24 24 - type Handler interface { 25 25 - OnEvent(ctx context.Context, evt Event) error 26 26 - OnError(ctx context.Context, err error) 27 27 - } 28 28 - 29 29 - type Client struct { 30 30 - Url string 31 31 - AdminPassword string 32 32 - HTTPClient *http.Client 33 33 - } 34 34 - 35 35 - func NewClient(url, adminPassword string) Client { 36 36 - return Client{ 37 37 - Url: url, 38 38 - AdminPassword: adminPassword, 39 39 - HTTPClient: &http.Client{}, 40 40 - } 41 41 - } 42 42 - 43 43 - func (c *Client) AddRepos(ctx context.Context, dids []syntax.DID) error { 44 44 - body, err := json.Marshal(map[string][]syntax.DID{"dids": dids}) 45 45 - if err != nil { 46 46 - return err 47 47 - } 48 48 - req, err := http.NewRequestWithContext(ctx, "POST", c.Url+"/repos/add", bytes.NewReader(body)) 49 49 - if err != nil { 50 50 - return err 51 51 - } 52 52 - req.SetBasicAuth("admin", c.AdminPassword) 53 53 - req.Header.Set("Content-Type", "application/json") 54 54 - 55 55 - resp, err := c.HTTPClient.Do(req) 56 56 - if err != nil { 57 57 - return err 58 58 - } 59 59 - defer resp.Body.Close() 60 60 - if resp.StatusCode != http.StatusOK { 61 61 - return fmt.Errorf("tap: /repos/add failed with status %d", resp.StatusCode) 62 62 - } 63 63 - return nil 64 64 - } 65 65 - 66 66 - func (c *Client) RemoveRepos(ctx context.Context, dids []syntax.DID) error { 67 67 - body, err := json.Marshal(map[string][]syntax.DID{"dids": dids}) 68 68 - if err != nil { 69 69 - return err 70 70 - } 71 71 - req, err := http.NewRequestWithContext(ctx, "POST", c.Url+"/repos/remove", bytes.NewReader(body)) 72 72 - if err != nil { 73 73 - return err 74 74 - } 75 75 - req.SetBasicAuth("admin", c.AdminPassword) 76 76 - req.Header.Set("Content-Type", "application/json") 77 77 - 78 78 - resp, err := c.HTTPClient.Do(req) 79 79 - if err != nil { 80 80 - return err 81 81 - } 82 82 - defer resp.Body.Close() 83 83 - if resp.StatusCode != http.StatusOK { 84 84 - return fmt.Errorf("tap: /repos/remove failed with status %d", resp.StatusCode) 85 85 - } 86 86 - return nil 87 87 - } 88 88 - 89 89 - func (c *Client) Connect(ctx context.Context, handler Handler) error { 90 90 - l := log.FromContext(ctx) 91 91 - 92 92 - u, err := url.Parse(c.Url) 93 93 - if err != nil { 94 94 - return err 95 95 - } 96 96 - if u.Scheme == "https" { 97 97 - u.Scheme = "wss" 98 98 - } else { 99 99 - u.Scheme = "ws" 100 100 - } 101 101 - u.Path = "/channel" 102 102 - 103 103 - // TODO: set auth on dial 104 104 - 105 105 - url := u.String() 106 106 - 107 107 - // var backoff int 108 108 - // for { 109 109 - // select { 110 110 - // case <-ctx.Done(): 111 111 - // return ctx.Err() 112 112 - // default: 113 113 - // } 114 114 - // 115 115 - // header := http.Header{ 116 116 - // "Authorization": []string{""}, 117 117 - // } 118 118 - // conn, res, err := websocket.DefaultDialer.DialContext(ctx, url, header) 119 119 - // if err != nil { 120 120 - // l.Warn("dialing failed", "url", url, "err", err, "backoff", backoff) 121 121 - // time.Sleep(time.Duration(5+backoff) * time.Second) 122 122 - // backoff++ 123 123 - // 124 124 - // continue 125 125 - // } else { 126 126 - // backoff = 0 127 127 - // } 128 128 - // 129 129 - // l.Info("event subscription response", "code", res.StatusCode) 130 130 - // } 131 131 - 132 132 - // TODO: keep websocket connection alive 133 133 - conn, _, err := websocket.DefaultDialer.DialContext(ctx, url, nil) 134 134 - if err != nil { 135 135 - return err 136 136 - } 137 137 - defer conn.Close() 138 138 - 139 139 - for { 140 140 - select { 141 141 - case <-ctx.Done(): 142 142 - return ctx.Err() 143 143 - default: 144 144 - } 145 145 - _, message, err := conn.ReadMessage() 146 146 - if err != nil { 147 147 - return err 148 148 - } 149 149 - 150 150 - var ev Event 151 151 - if err := json.Unmarshal(message, &ev); err != nil { 152 152 - handler.OnError(ctx, fmt.Errorf("failed to parse message: %w", err)) 153 153 - continue 154 154 - } 155 155 - if err := handler.OnEvent(ctx, ev); err != nil { 156 156 - handler.OnError(ctx, fmt.Errorf("failed to process event %d: %w", ev.ID, err)) 157 157 - continue 158 158 - } 159 159 - 160 160 - ack := map[string]any{ 161 161 - "type": "ack", 162 162 - "id": ev.ID, 163 163 - } 164 164 - if err := conn.WriteJSON(ack); err != nil { 165 165 - l.Warn("failed to send ack", "err", err) 166 166 - continue 167 167 - } 168 168 - } 169 169 - }

-62

tap/types.go

··· 1 1 - package tap 2 2 - 3 3 - import ( 4 4 - "encoding/json" 5 5 - "fmt" 6 6 - 7 7 - "github.com/bluesky-social/indigo/atproto/syntax" 8 8 - ) 9 9 - 10 10 - type EventType string 11 11 - 12 12 - const ( 13 13 - EvtRecord EventType = "record" 14 14 - EvtIdentity EventType = "identity" 15 15 - ) 16 16 - 17 17 - type Event struct { 18 18 - ID int64 `json:"id"` 19 19 - Type EventType `json:"type"` 20 20 - Record *RecordEventData `json:"record,omitempty"` 21 21 - Identity *IdentityEventData `json:"identity,omitempty"` 22 22 - } 23 23 - 24 24 - type RecordEventData struct { 25 25 - Live bool `json:"live"` 26 26 - Did syntax.DID `json:"did"` 27 27 - Rev string `json:"rev"` 28 28 - Collection syntax.NSID `json:"collection"` 29 29 - Rkey syntax.RecordKey `json:"rkey"` 30 30 - Action RecordAction `json:"action"` 31 31 - Record json.RawMessage `json:"record,omitempty"` 32 32 - CID *syntax.CID `json:"cid,omitempty"` 33 33 - } 34 34 - 35 35 - func (r *RecordEventData) AtUri() syntax.ATURI { 36 36 - return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", r.Did, r.Collection, r.Rkey)) 37 37 - } 38 38 - 39 39 - type RecordAction string 40 40 - 41 41 - const ( 42 42 - RecordCreateAction RecordAction = "create" 43 43 - RecordUpdateAction RecordAction = "update" 44 44 - RecordDeleteAction RecordAction = "delete" 45 45 - ) 46 46 - 47 47 - type IdentityEventData struct { 48 48 - DID syntax.DID `json:"did"` 49 49 - Handle string `json:"handle"` 50 50 - IsActive bool `json:"is_active"` 51 51 - Status RepoStatus `json:"status"` 52 52 - } 53 53 - 54 54 - type RepoStatus string 55 55 - 56 56 - const ( 57 57 - RepoStatusActive RepoStatus = "active" 58 58 - RepoStatusTakendown RepoStatus = "takendown" 59 59 - RepoStatusSuspended RepoStatus = "suspended" 60 60 - RepoStatusDeactivated RepoStatus = "deactivated" 61 61 - RepoStatusDeleted RepoStatus = "deleted" 62 62 - )

+3

types/diff.go

··· 74 74 75 75 // used by html elements as a unique ID for hrefs 76 76 func (d *Diff) Id() string { 77 77 + if d.IsDelete { 78 78 + return d.Name.Old 79 79 + } 77 80 return d.Name.New 78 81 } 79 82

+112

types/diff_test.go

··· 1 1 + package types 2 2 + 3 3 + import "testing" 4 4 + 5 5 + func TestDiffId(t *testing.T) { 6 6 + tests := []struct { 7 7 + name string 8 8 + diff Diff 9 9 + expected string 10 10 + }{ 11 11 + { 12 12 + name: "regular file uses new name", 13 13 + diff: Diff{ 14 14 + Name: struct { 15 15 + Old string `json:"old"` 16 16 + New string `json:"new"` 17 17 + }{Old: "", New: "src/main.go"}, 18 18 + }, 19 19 + expected: "src/main.go", 20 20 + }, 21 21 + { 22 22 + name: "new file uses new name", 23 23 + diff: Diff{ 24 24 + Name: struct { 25 25 + Old string `json:"old"` 26 26 + New string `json:"new"` 27 27 + }{Old: "", New: "src/new.go"}, 28 28 + IsNew: true, 29 29 + }, 30 30 + expected: "src/new.go", 31 31 + }, 32 32 + { 33 33 + name: "deleted file uses old name", 34 34 + diff: Diff{ 35 35 + Name: struct { 36 36 + Old string `json:"old"` 37 37 + New string `json:"new"` 38 38 + }{Old: "src/deleted.go", New: ""}, 39 39 + IsDelete: true, 40 40 + }, 41 41 + expected: "src/deleted.go", 42 42 + }, 43 43 + { 44 44 + name: "renamed file uses new name", 45 45 + diff: Diff{ 46 46 + Name: struct { 47 47 + Old string `json:"old"` 48 48 + New string `json:"new"` 49 49 + }{Old: "src/old.go", New: "src/renamed.go"}, 50 50 + IsRename: true, 51 51 + }, 52 52 + expected: "src/renamed.go", 53 53 + }, 54 54 + } 55 55 + 56 56 + for _, tt := range tests { 57 57 + t.Run(tt.name, func(t *testing.T) { 58 58 + if got := tt.diff.Id(); got != tt.expected { 59 59 + t.Errorf("Diff.Id() = %q, want %q", got, tt.expected) 60 60 + } 61 61 + }) 62 62 + } 63 63 + } 64 64 + 65 65 + func TestChangedFilesMatchesDiffId(t *testing.T) { 66 66 + // ChangedFiles() must return values matching each Diff's Id() 67 67 + // so that sidebar links point to the correct anchors. 68 68 + // Tests existing, deleted, new, and renamed files. 69 69 + nd := NiceDiff{ 70 70 + Diff: []Diff{ 71 71 + { 72 72 + Name: struct { 73 73 + Old string `json:"old"` 74 74 + New string `json:"new"` 75 75 + }{Old: "", New: "src/modified.go"}, 76 76 + }, 77 77 + { 78 78 + Name: struct { 79 79 + Old string `json:"old"` 80 80 + New string `json:"new"` 81 81 + }{Old: "src/deleted.go", New: ""}, 82 82 + IsDelete: true, 83 83 + }, 84 84 + { 85 85 + Name: struct { 86 86 + Old string `json:"old"` 87 87 + New string `json:"new"` 88 88 + }{Old: "", New: "src/new.go"}, 89 89 + IsNew: true, 90 90 + }, 91 91 + { 92 92 + Name: struct { 93 93 + Old string `json:"old"` 94 94 + New string `json:"new"` 95 95 + }{Old: "src/old.go", New: "src/renamed.go"}, 96 96 + IsRename: true, 97 97 + }, 98 98 + }, 99 99 + } 100 100 + 101 101 + changedFiles := nd.ChangedFiles() 102 102 + 103 103 + if len(changedFiles) != len(nd.Diff) { 104 104 + t.Fatalf("ChangedFiles() returned %d items, want %d", len(changedFiles), len(nd.Diff)) 105 105 + } 106 106 + 107 107 + for i, diff := range nd.Diff { 108 108 + if changedFiles[i] != diff.Id() { 109 109 + t.Errorf("ChangedFiles()[%d] = %q, but Diff.Id() = %q", i, changedFiles[i], diff.Id()) 110 110 + } 111 111 + } 112 112 + }