forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
appview: improve spindle verification process
Signed-off-by: oppiliappan <me@oppi.li>
+74
-15
+7
-2
appview/db/spindle.go
+7
-2
appview/db/spindle.go
···
51
51
for rows.Next() {
52
52
var spindle Spindle
53
53
var createdAt string
54
-
var verified sql.NullTime
54
+
var verified sql.NullString
55
55
56
56
if err := rows.Scan(
57
57
&spindle.Id,
···
69
69
}
70
70
71
71
if verified.Valid {
72
-
spindle.Verified = &verified.Time
72
+
t, err := time.Parse(time.RFC3339, verified.String)
73
+
if err != nil {
74
+
now := time.Now()
75
+
spindle.Verified = &now
76
+
}
77
+
spindle.Verified = &t
73
78
}
74
79
75
80
spindles = append(spindles, spindle)
+2
-2
appview/pages/templates/repo/new.html
+2
-2
appview/pages/templates/repo/new.html
···
60
60
</fieldset>
61
61
62
62
<div class="space-y-2">
63
-
<button type="submit" class="btn flex gap-2 items-center">
63
+
<button type="submit" class="btn flex items-center">
64
64
create repo
65
65
<span id="spinner" class="group">
66
-
{{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
66
+
{{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
67
67
</span>
68
68
</button>
69
69
<div id="repo" class="error"></div>
+3
-3
appview/pages/templates/repo/settings.html
+3
-3
appview/pages/templates/repo/settings.html
···
83
83
84
84
{{ if .RepoInfo.Roles.IsOwner }}
85
85
<form
86
-
hx-put="/{{ $.RepoInfo.FullName }}/settings/spindle"
86
+
hx-post="/{{ $.RepoInfo.FullName }}/settings/spindle"
87
87
class="mt-6 group"
88
88
>
89
89
<label for="spindle">spindle</label>
···
100
100
<option
101
101
value="{{ . }}"
102
102
class="py-1"
103
-
{{ if .eq . $.Repo.Spindle }}
103
+
{{ if eq . $.CurrentSpindle }}
104
104
selected
105
105
{{ end }}
106
106
>
···
127
127
<button class="btn my-2 flex items-center" type="text">
128
128
<span>delete</span>
129
129
<span id="delete-repo-spinner" class="group">
130
-
{{ i "loader-circle" "pl-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
130
+
{{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
131
131
</span>
132
132
</button>
133
133
<span>
+2
-2
appview/pages/templates/spindles/fragments/spindleListing.html
+2
-2
appview/pages/templates/spindles/fragments/spindleListing.html
···
24
24
<button
25
25
class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"
26
26
title="Delete spindle"
27
-
hx-delete="/spindles/{{ urlquery .Instance }}"
27
+
hx-delete="/spindles/{{ .Instance }}"
28
28
hx-swap="outerHTML"
29
29
hx-target="#spindle-{{.Id}}"
30
30
hx-confirm="Are you sure you want to delete the spindle '{{ .Instance }}'?"
···
40
40
<button
41
41
class="btn gap-2 group"
42
42
title="Retry spindle verification"
43
-
hx-post="/spindles/{{ urlquery .Instance }}/retry"
43
+
hx-post="/spindles/{{ .Instance }}/retry"
44
44
hx-swap="none"
45
45
hx-target="#spindle-{{.Id}}"
46
46
>
+1
appview/repo/repo.go
+1
appview/repo/repo.go
+46
appview/spindles/spindles.go
+46
appview/spindles/spindles.go
···
54
54
)
55
55
if err != nil {
56
56
s.Logger.Error("failed to fetch spindles", "err", err)
57
+
w.WriteHeader(http.StatusInternalServerError)
58
+
return
57
59
}
58
60
59
61
s.Pages.Spindles(w, pages.SpindlesParams{
···
148
146
if expectedOwner != user.Did {
149
147
// verification failed
150
148
l.Error("verification failed", "expectedOwner", expectedOwner, "observedOwner", user.Did)
149
+
s.Pages.HxRefresh(w)
150
+
return
151
+
}
152
+
153
+
tx, err = s.Db.Begin()
154
+
if err != nil {
155
+
l.Error("failed to commit verification info", "err", err)
156
+
s.Pages.HxRefresh(w)
157
+
return
158
+
}
159
+
defer func() {
160
+
tx.Rollback()
161
+
s.Enforcer.E.LoadPolicy()
162
+
}()
163
+
164
+
// mark this spindle as verified in the db
165
+
_, err = db.VerifySpindle(
166
+
tx,
167
+
db.FilterEq("owner", user.Did),
168
+
db.FilterEq("instance", instance),
169
+
)
170
+
171
+
err = s.Enforcer.AddSpindleOwner(instance, user.Did)
172
+
if err != nil {
173
+
l.Error("failed to update ACL", "err", err)
174
+
s.Pages.HxRefresh(w)
175
+
return
176
+
}
177
+
178
+
err = tx.Commit()
179
+
if err != nil {
180
+
l.Error("failed to commit verification info", "err", err)
181
+
s.Pages.HxRefresh(w)
182
+
return
183
+
}
184
+
185
+
err = s.Enforcer.E.SavePolicy()
186
+
if err != nil {
187
+
l.Error("failed to update ACL", "err", err)
151
188
s.Pages.HxRefresh(w)
152
189
return
153
190
}
···
296
255
db.FilterEq("owner", user.Did),
297
256
db.FilterEq("instance", instance),
298
257
)
258
+
if err != nil {
259
+
l.Error("verification failed", "err", err)
260
+
fail()
261
+
return
262
+
}
299
263
300
264
verifiedSpindle := db.Spindle{
301
265
Id: int(rowId),
+6
-5
spindle/ingester.go
+6
-5
spindle/ingester.go
···
59
59
if s.cfg.Server.Dev {
60
60
domain = s.cfg.Server.ListenAddr
61
61
}
62
-
recordInstance := *record.Instance
62
+
recordInstance := record.Instance
63
63
64
64
if recordInstance != domain {
65
65
l.Error("domain mismatch", "domain", recordInstance, "expected", domain)
66
-
return fmt.Errorf("domain mismatch: %s != %s", *record.Instance, domain)
66
+
return fmt.Errorf("domain mismatch: %s != %s", record.Instance, domain)
67
67
}
68
68
69
69
ok, err := s.e.E.Enforce(did, rbacDomain, rbacDomain, "server:invite")
···
95
95
96
96
l := s.l.With("component", "ingester", "record", tangled.RepoNSID)
97
97
98
+
l.Info("ingesting repo record")
99
+
98
100
switch e.Commit.Operation {
99
101
case models.CommitOperationCreate, models.CommitOperationUpdate:
100
102
raw := e.Commit.Record
···
108
106
}
109
107
110
108
domain := s.cfg.Server.Hostname
111
-
if s.cfg.Server.Dev {
112
-
domain = s.cfg.Server.ListenAddr
113
-
}
114
109
115
110
// no spindle configured for this repo
116
111
if record.Spindle == nil {
112
+
l.Info("no spindle configured", "did", record.Owner, "name", record.Name)
117
113
return nil
118
114
}
119
115
120
116
// this repo did not want this spindle
121
117
if *record.Spindle != domain {
118
+
l.Info("different spindle configured", "did", record.Owner, "name", record.Name, "spindle", *record.Spindle, "domain", domain)
122
119
return nil
123
120
}
124
121
+7
-1
spindle/server.go
+7
-1
spindle/server.go
···
66
66
67
67
jq := queue.NewQueue(100, 2)
68
68
69
-
collections := []string{tangled.SpindleMemberNSID}
69
+
collections := []string{
70
+
tangled.SpindleMemberNSID,
71
+
tangled.RepoNSID,
72
+
}
70
73
jc, err := jetstream.NewJetstreamClient(cfg.Server.JetstreamEndpoint, "spindle", collections, nil, logger, d, false, false)
71
74
if err != nil {
72
75
return fmt.Errorf("failed to setup jetstream client: %w", err)
···
143
140
mux := chi.NewRouter()
144
141
145
142
mux.HandleFunc("/events", s.Events)
143
+
mux.HandleFunc("/owner", func(w http.ResponseWriter, r *http.Request) {
144
+
w.Write([]byte(s.cfg.Server.Owner))
145
+
})
146
146
mux.HandleFunc("/logs/{knot}/{rkey}/{name}", s.Logs)
147
147
return mux
148
148
}