forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
lexicons: remove sh.tangled.repo::owner
Signed-off-by: oppiliappan <me@oppi.li>
+18
-64
api/tangled/cbor_gen.go
api/tangled/cbor_gen.go
This is a binary file and will not be displayed.
api/tangled/tangledrepo.go
api/tangled/tangledrepo.go
This is a binary file and will not be displayed.
-3
appview/repo/repo.go
-3
appview/repo/repo.go
···
313
313
Val: &tangled.Repo{
314
314
Knot: f.Knot,
315
315
Name: f.Name,
316
-
Owner: user.Did,
317
316
CreatedAt: f.Created.Format(time.RFC3339),
318
317
Description: &newDescription,
319
318
Spindle: &f.Spindle,
···
949
950
Val: &tangled.Repo{
950
951
Knot: f.Knot,
951
952
Name: f.Name,
952
-
Owner: user.Did,
953
953
CreatedAt: f.Created.Format(time.RFC3339),
954
954
Description: &f.Description,
955
955
Spindle: spindlePtr,
···
1634
1636
Knot: repo.Knot,
1635
1637
Name: repo.Name,
1636
1638
CreatedAt: createdAt,
1637
-
Owner: user.Did,
1638
1639
Source: &sourceAt,
1639
1640
}},
1640
1641
})
-3
appview/state/router.go
-3
appview/state/router.go
-1
appview/state/state.go
-1
appview/state/state.go
-6
appview/strings/strings.go
-6
appview/strings/strings.go
···
9
9
"time"
10
10
11
11
"tangled.org/core/api/tangled"
12
-
"tangled.org/core/appview/config"
13
12
"tangled.org/core/appview/db"
14
13
"tangled.org/core/appview/middleware"
15
14
"tangled.org/core/appview/notify"
16
15
"tangled.org/core/appview/oauth"
17
16
"tangled.org/core/appview/pages"
18
17
"tangled.org/core/appview/pages/markup"
19
-
"tangled.org/core/eventconsumer"
20
18
"tangled.org/core/idresolver"
21
-
"tangled.org/core/rbac"
22
19
"tangled.org/core/tid"
23
20
24
21
"github.com/bluesky-social/indigo/api/atproto"
···
29
32
Db *db.DB
30
33
OAuth *oauth.OAuth
31
34
Pages *pages.Pages
32
-
Config *config.Config
33
-
Enforcer *rbac.Enforcer
34
35
IdResolver *idresolver.Resolver
35
36
Logger *slog.Logger
36
-
Knotstream *eventconsumer.Consumer
37
37
Notifier notify.Notifier
38
38
}
39
39
+2
-2
knotserver/ingester.go
+2
-2
knotserver/ingester.go
···
141
141
return fmt.Errorf("rejected pull record: not this knot, %s != %s", repo.Knot, h.c.Server.Hostname)
142
142
}
143
143
144
-
didSlashRepo, err := securejoin.SecureJoin(repo.Owner, repo.Name)
144
+
didSlashRepo, err := securejoin.SecureJoin(ident.DID.String(), repo.Name)
145
145
if err != nil {
146
146
return fmt.Errorf("failed to construct relative repo path: %w", err)
147
147
}
···
191
191
Kind: string(workflow.TriggerKindPullRequest),
192
192
PullRequest: &trigger,
193
193
Repo: &tangled.Pipeline_TriggerRepo{
194
-
Did: repo.Owner,
194
+
Did: ident.DID.String(),
195
195
Knot: repo.Knot,
196
196
Repo: repo.Name,
197
197
},
-36
knotserver/util.go
-36
knotserver/util.go
···
1
1
package knotserver
2
2
3
3
import (
4
-
"net/http"
5
-
"os"
6
-
"path/filepath"
7
-
8
4
"github.com/bluesky-social/indigo/atproto/syntax"
9
-
securejoin "github.com/cyphar/filepath-securejoin"
10
-
"github.com/go-chi/chi/v5"
11
5
)
12
-
13
-
func didPath(r *http.Request) string {
14
-
did := chi.URLParam(r, "did")
15
-
name := chi.URLParam(r, "name")
16
-
path, _ := securejoin.SecureJoin(did, name)
17
-
filepath.Clean(path)
18
-
return path
19
-
}
20
-
21
-
func getDescription(path string) (desc string) {
22
-
db, err := os.ReadFile(filepath.Join(path, "description"))
23
-
if err == nil {
24
-
desc = string(db)
25
-
} else {
26
-
desc = ""
27
-
}
28
-
return
29
-
}
30
-
func setContentDisposition(w http.ResponseWriter, name string) {
31
-
h := "inline; filename=\"" + name + "\""
32
-
w.Header().Add("Content-Disposition", h)
33
-
}
34
-
35
-
func setGZipMIME(w http.ResponseWriter) {
36
-
setMIME(w, "application/gzip")
37
-
}
38
-
39
-
func setMIME(w http.ResponseWriter, mime string) {
40
-
w.Header().Add("Content-Type", mime)
41
-
}
42
6
43
7
var TIDClock = syntax.NewTIDClock(0)
44
8
+8
-5
lexicons/repo/repo.json
+8
-5
lexicons/repo/repo.json
···
12
12
"required": [
13
13
"name",
14
14
"knot",
15
-
"owner",
16
15
"createdAt"
17
16
],
18
17
"properties": {
19
18
"name": {
20
19
"type": "string",
21
20
"description": "name of the repo"
22
-
},
23
-
"owner": {
24
-
"type": "string",
25
-
"format": "did"
26
21
},
27
22
"knot": {
28
23
"type": "string",
···
36
41
"type": "string",
37
42
"format": "uri",
38
43
"description": "source of the repo"
44
+
},
45
+
"labels": {
46
+
"type": "array",
47
+
"description": "List of labels that this repo subscribes to",
48
+
"items": {
49
+
"type": "string",
50
+
"format": "at-uri"
51
+
}
39
52
},
40
53
"createdAt": {
41
54
"type": "string",
+5
-5
spindle/ingester.go
+5
-5
spindle/ingester.go
···
162
162
163
163
// no spindle configured for this repo
164
164
if record.Spindle == nil {
165
-
l.Info("no spindle configured", "did", record.Owner, "name", record.Name)
165
+
l.Info("no spindle configured", "name", record.Name)
166
166
return nil
167
167
}
168
168
169
169
// this repo did not want this spindle
170
170
if *record.Spindle != domain {
171
-
l.Info("different spindle configured", "did", record.Owner, "name", record.Name, "spindle", *record.Spindle, "domain", domain)
171
+
l.Info("different spindle configured", "name", record.Name, "spindle", *record.Spindle, "domain", domain)
172
172
return nil
173
173
}
174
174
175
175
// add this repo to the watch list
176
-
if err := s.db.AddRepo(record.Knot, record.Owner, record.Name); err != nil {
176
+
if err := s.db.AddRepo(record.Knot, did, record.Name); err != nil {
177
177
l.Error("failed to add repo", "error", err)
178
178
return fmt.Errorf("failed to add repo: %w", err)
179
179
}
180
180
181
-
didSlashRepo, err := securejoin.SecureJoin(record.Owner, record.Name)
181
+
didSlashRepo, err := securejoin.SecureJoin(did, record.Name)
182
182
if err != nil {
183
183
return err
184
184
}
185
185
186
186
// add repo to rbac
187
-
if err := s.e.AddRepo(record.Owner, rbac.ThisServer, didSlashRepo); err != nil {
187
+
if err := s.e.AddRepo(did, rbac.ThisServer, didSlashRepo); err != nil {
188
188
l.Error("failed to add repo to enforcer", "error", err)
189
189
return fmt.Errorf("failed to add repo: %w", err)
190
190
}
+1
-1
spindle/xrpc/add_secret.go
+1
-1
spindle/xrpc/add_secret.go
+1
-1
spindle/xrpc/list_secrets.go
+1
-1
spindle/xrpc/list_secrets.go
+1
-1
spindle/xrpc/remove_secret.go
+1
-1
spindle/xrpc/remove_secret.go