lewis.moe
forked from
tangled.org/core
Monorepo for Tangled
appview: repo: show verified commits
Signed-off-by: Anirudh Oppiliappan <anirudh@tangled.sh>
authored by
Tangled
b663bac6
fec4117e
+2
-2
.air/knotserver.toml
+2
-2
.air/knotserver.toml
+3
-3
appview/db/pubkeys.go
+3
-3
appview/db/pubkeys.go
···
15
16
func DeletePublicKey(e Execer, did, name, key string) error {
17
_, err := e.Exec(`
18
-
delete from public_keys
19
where did = ? and name = ? and key = ?`,
20
did, name, key)
21
return err
···
23
24
func DeletePublicKeyByRkey(e Execer, did, rkey string) error {
25
_, err := e.Exec(`
26
-
delete from public_keys
27
where did = ? and rkey = ?`,
28
did, rkey)
29
return err
···
75
return keys, nil
76
}
77
78
-
func GetPublicKeys(e Execer, did string) ([]PublicKey, error) {
79
var keys []PublicKey
80
81
rows, err := e.Query(`select did, key, name, rkey, created from public_keys where did = ?`, did)
···
15
16
func DeletePublicKey(e Execer, did, name, key string) error {
17
_, err := e.Exec(`
18
+
delete from public_keys
19
where did = ? and name = ? and key = ?`,
20
did, name, key)
21
return err
···
23
24
func DeletePublicKeyByRkey(e Execer, did, rkey string) error {
25
_, err := e.Exec(`
26
+
delete from public_keys
27
where did = ? and rkey = ?`,
28
did, rkey)
29
return err
···
75
return keys, nil
76
}
77
78
+
func GetPublicKeysForDid(e Execer, did string) ([]PublicKey, error) {
79
var keys []PublicKey
80
81
rows, err := e.Query(`select did, key, name, rkey, created from public_keys where did = ?`, did)
+3
appview/pages/pages.go
+3
appview/pages/pages.go
···
414
HTMLReadme template.HTML
415
Raw bool
416
EmailToDidOrHandle map[string]string
417
Languages *types.RepoLanguageResponse
418
types.RepoIndexResponse
419
}
···
452
types.RepoLogResponse
453
Active string
454
EmailToDidOrHandle map[string]string
455
}
456
457
func (p *Pages) RepoLog(w io.Writer, params RepoLogParams) error {
···
464
RepoInfo repoinfo.RepoInfo
465
Active string
466
EmailToDidOrHandle map[string]string
467
468
types.RepoCommitResponse
469
}
···
414
HTMLReadme template.HTML
415
Raw bool
416
EmailToDidOrHandle map[string]string
417
+
VerifiedCommits map[string]bool
418
Languages *types.RepoLanguageResponse
419
types.RepoIndexResponse
420
}
···
453
types.RepoLogResponse
454
Active string
455
EmailToDidOrHandle map[string]string
456
+
VerifiedCommits map[string]bool
457
}
458
459
func (p *Pages) RepoLog(w io.Writer, params RepoLogParams) error {
···
466
RepoInfo repoinfo.RepoInfo
467
Active string
468
EmailToDidOrHandle map[string]string
469
+
Verified bool
470
471
types.RepoCommitResponse
472
}
+11
-2
appview/pages/templates/repo/commit.html
+11
-2
appview/pages/templates/repo/commit.html
···
3
{{ define "extrameta" }}
4
{{ $title := printf "commit %s · %s" .Diff.Commit.This .RepoInfo.FullName }}
5
{{ $url := printf "https://tangled.sh/%s/commit/%s" .RepoInfo.FullName .Diff.Commit.This }}
6
-
7
{{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
8
{{ end }}
9
···
24
</div>
25
</div>
26
27
-
<div class="flex items-center">
28
<p class="text-sm text-gray-500 dark:text-gray-300">
29
{{ $didOrHandle := index $.EmailToDidOrHandle $commit.Author.Email }}
30
···
45
<a href="/{{ $repo }}/commit/{{ $commit.Parent }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ slice $commit.Parent 0 8 }}</a>
46
{{ end }}
47
</p>
48
</div>
49
50
</section>
···
3
{{ define "extrameta" }}
4
{{ $title := printf "commit %s · %s" .Diff.Commit.This .RepoInfo.FullName }}
5
{{ $url := printf "https://tangled.sh/%s/commit/%s" .RepoInfo.FullName .Diff.Commit.This }}
6
+
7
{{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}
8
{{ end }}
9
···
24
</div>
25
</div>
26
27
+
<div class="flex items-center space-x-2">
28
<p class="text-sm text-gray-500 dark:text-gray-300">
29
{{ $didOrHandle := index $.EmailToDidOrHandle $commit.Author.Email }}
30
···
45
<a href="/{{ $repo }}/commit/{{ $commit.Parent }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ slice $commit.Parent 0 8 }}</a>
46
{{ end }}
47
</p>
48
+
49
+
{{ if .Verified }}
50
+
<span class="text-sm bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 px-2 py-1 rounded">
51
+
<div class="flex items-center gap-2">
52
+
{{ i "shield-check" "w-4 h-4" }}
53
+
verified
54
+
</div>
55
+
</span>
56
+
{{ end }}
57
</div>
58
59
</section>
+16
-8
appview/pages/templates/repo/index.html
+16
-8
appview/pages/templates/repo/index.html
···
222
</div>
223
</div>
224
225
-
<div class="text-xs text-gray-500 dark:text-gray-400">
226
-
<span class="font-mono">
227
-
<a
228
-
href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"
229
-
class="text-gray-500 dark:text-gray-400 no-underline hover:underline"
230
-
>{{ slice .Hash.String 0 8 }}</a
231
-
></span
232
-
>
233
<span
234
class="mx-2 before:content-['·'] before:select-none"
235
></span>
···
222
</div>
223
</div>
224
225
+
<div class="text-xs mt-2 text-gray-500 dark:text-gray-400 flex items-center">
226
+
{{ $verified := false }}
227
+
{{ $verified = index $.VerifiedCommits .Hash.String }}
228
+
{{ $hashStyle := "text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-gray-900" }}
229
+
{{ if $verified }}
230
+
{{ $hashStyle = "bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 px-2 rounded" }}
231
+
{{ end }}
232
+
<span class="font-mono">
233
+
<a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"
234
+
class="no-underline hover:underline {{ $hashStyle }} px-2 py-1 rounded flex items-center gap-2">
235
+
{{ slice .Hash.String 0 8 }}
236
+
{{ if $verified }}
237
+
{{ i "shield-check" "w-3 h-3" }}
238
+
{{ end }}
239
+
</a>
240
+
</span>
241
<span
242
class="mx-2 before:content-['·'] before:select-none"
243
></span>
+26
-6
appview/pages/templates/repo/log.html
+26
-6
appview/pages/templates/repo/log.html
···
35
<a href="mailto:{{ $commit.Author.Email }}" class="text-gray-700 dark:text-gray-300 no-underline hover:underline">{{ $commit.Author.Name }}</a>
36
{{ end }}
37
</td>
38
-
<td class=" py-3 align-top font-mono flex items-end">
39
-
<a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" class="text-gray-700 dark:text-gray-300 no-underline hover:underline">{{ slice $commit.Hash.String 0 8 }}</a>
40
-
<div class="inline-flex">
41
<button class="p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded"
42
title="Copy SHA"
43
onclick="navigator.clipboard.writeText('{{ $commit.Hash.String }}'); this.innerHTML=`{{ i "copy-check" "w-4 h-4" }}`; setTimeout(() => this.innerHTML=`{{ i "copy" "w-4 h-4" }}`, 1500)">
···
80
<!-- mobile view (visible only on small screens) -->
81
<div class="md:hidden">
82
{{ range $index, $commit := .Commits }}
83
-
<div class="relative p-2 {{ if ne $index (sub (len $.Commits) 1) }}border-b border-gray-200 dark:border-gray-700{{ end }}">
84
<div id="commit-message">
85
{{ $messageParts := splitN $commit.Message "\n\n" 2 }}
86
<div class="text-base cursor-pointer">
···
125
</div>
126
</div>
127
128
-
<div class="text-xs text-gray-500 dark:text-gray-400">
129
<span class="font-mono">
130
<a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}"
131
-
class="text-gray-500 dark:text-gray-400 no-underline hover:underline">
132
{{ slice $commit.Hash.String 0 8 }}
133
</a>
134
</span>
135
<span class="mx-2 before:content-['·'] before:select-none"></span>
···
35
<a href="mailto:{{ $commit.Author.Email }}" class="text-gray-700 dark:text-gray-300 no-underline hover:underline">{{ $commit.Author.Name }}</a>
36
{{ end }}
37
</td>
38
+
<td class="py-3 align-top font-mono flex items-center">
39
+
{{ $verified := false }}
40
+
{{ $verified = index $.VerifiedCommits $commit.Hash.String }}
41
+
{{ $hashStyle := "text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-gray-900" }}
42
+
{{ if $verified }}
43
+
{{ $hashStyle = "bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 px-2 rounded" }}
44
+
{{ end }}
45
+
<a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" class="no-underline hover:underline {{ $hashStyle }} px-2 py-1/2 rounded flex items-center gap-2">
46
+
{{ slice $commit.Hash.String 0 8 }}
47
+
{{ if $verified }}
48
+
{{ i "shield-check" "w-4 h-4" }}
49
+
{{ end }}
50
+
</a>
51
+
<div class="{{ if not $verified }} ml-6 {{ end }}inline-flex">
52
<button class="p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded"
53
title="Copy SHA"
54
onclick="navigator.clipboard.writeText('{{ $commit.Hash.String }}'); this.innerHTML=`{{ i "copy-check" "w-4 h-4" }}`; setTimeout(() => this.innerHTML=`{{ i "copy" "w-4 h-4" }}`, 1500)">
···
91
<!-- mobile view (visible only on small screens) -->
92
<div class="md:hidden">
93
{{ range $index, $commit := .Commits }}
94
+
<div class="relative p-2 mb-2 {{ if ne $index (sub (len $.Commits) 1) }}border-b border-gray-200 dark:border-gray-700{{ end }}">
95
<div id="commit-message">
96
{{ $messageParts := splitN $commit.Message "\n\n" 2 }}
97
<div class="text-base cursor-pointer">
···
136
</div>
137
</div>
138
139
+
<div class="text-xs mt-2 text-gray-500 dark:text-gray-400 flex items-center">
140
+
{{ $verified := false }}
141
+
{{ $verified = index $.VerifiedCommits $commit.Hash.String }}
142
+
{{ $hashStyle := "text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-gray-900" }}
143
+
{{ if $verified }}
144
+
{{ $hashStyle = "bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 px-2 rounded" }}
145
+
{{ end }}
146
<span class="font-mono">
147
<a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}"
148
+
class="no-underline hover:underline {{ $hashStyle }} px-2 py-1 rounded flex items-center gap-2">
149
{{ slice $commit.Hash.String 0 8 }}
150
+
{{ if $verified }}
151
+
{{ i "shield-check" "w-3 h-3" }}
152
+
{{ end }}
153
</a>
154
</span>
155
<span class="mx-2 before:content-['·'] before:select-none"></span>
+36
-3
appview/repo/repo.go
+36
-3
appview/repo/repo.go
···
138
branchesTrunc := result.Branches[:min(branchCount, len(result.Branches))]
139
140
emails := uniqueEmails(commitsTrunc)
141
142
user := rp.oauth.GetUser(r)
143
repoInfo := f.RepoInfo(user)
···
178
TagsTrunc: tagsTrunc,
179
ForkInfo: forkInfo,
180
BranchesTrunc: branchesTrunc,
181
-
EmailToDidOrHandle: EmailToDidOrHandle(rp, emails),
182
Languages: repoLanguages,
183
})
184
return
···
293
}
294
295
user := rp.oauth.GetUser(r)
296
rp.pages.RepoLog(w, pages.RepoLogParams{
297
LoggedInUser: user,
298
TagMap: tagMap,
299
RepoInfo: f.RepoInfo(user),
300
RepoLogResponse: *repolog,
301
-
EmailToDidOrHandle: EmailToDidOrHandle(rp, uniqueEmails(repolog.Commits)),
302
})
303
return
304
}
···
438
return
439
}
440
441
user := rp.oauth.GetUser(r)
442
rp.pages.RepoCommit(w, pages.RepoCommitParams{
443
LoggedInUser: user,
444
RepoInfo: f.RepoInfo(user),
445
RepoCommitResponse: result,
446
-
EmailToDidOrHandle: EmailToDidOrHandle(rp, []string{result.Diff.Commit.Author.Email}),
447
})
448
return
449
}
···
138
branchesTrunc := result.Branches[:min(branchCount, len(result.Branches))]
139
140
emails := uniqueEmails(commitsTrunc)
141
+
emailToDidMap, err := db.GetEmailToDid(rp.db, emails, true)
142
+
if err != nil {
143
+
log.Println("failed to get email to did map", err)
144
+
}
145
+
146
+
vc, err := verifiedObjectCommits(rp, emailToDidMap, commitsTrunc)
147
+
if err != nil {
148
+
log.Println(err)
149
+
}
150
151
user := rp.oauth.GetUser(r)
152
repoInfo := f.RepoInfo(user)
···
187
TagsTrunc: tagsTrunc,
188
ForkInfo: forkInfo,
189
BranchesTrunc: branchesTrunc,
190
+
EmailToDidOrHandle: emailToDidOrHandle(rp, emailToDidMap),
191
+
VerifiedCommits: vc,
192
Languages: repoLanguages,
193
})
194
return
···
303
}
304
305
user := rp.oauth.GetUser(r)
306
+
307
+
emailToDidMap, err := db.GetEmailToDid(rp.db, uniqueEmails(repolog.Commits), true)
308
+
if err != nil {
309
+
log.Println("failed to fetch email to did mapping", err)
310
+
}
311
+
312
+
vc, err := verifiedObjectCommits(rp, emailToDidMap, repolog.Commits)
313
+
if err != nil {
314
+
log.Println(err)
315
+
}
316
+
317
rp.pages.RepoLog(w, pages.RepoLogParams{
318
LoggedInUser: user,
319
TagMap: tagMap,
320
RepoInfo: f.RepoInfo(user),
321
RepoLogResponse: *repolog,
322
+
EmailToDidOrHandle: emailToDidOrHandle(rp, emailToDidMap),
323
+
VerifiedCommits: vc,
324
})
325
return
326
}
···
460
return
461
}
462
463
+
emailToDidMap, err := db.GetEmailToDid(rp.db, []string{result.Diff.Commit.Author.Email}, true)
464
+
if err != nil {
465
+
log.Println("failed to get email to did mapping:", err)
466
+
}
467
+
468
+
vc, err := verifiedCommits(rp, emailToDidMap, []types.NiceDiff{*result.Diff})
469
+
if err != nil {
470
+
log.Println(err)
471
+
}
472
+
473
user := rp.oauth.GetUser(r)
474
rp.pages.RepoCommit(w, pages.RepoCommitParams{
475
LoggedInUser: user,
476
RepoInfo: f.RepoInfo(user),
477
RepoCommitResponse: result,
478
+
EmailToDidOrHandle: emailToDidOrHandle(rp, emailToDidMap),
479
+
Verified: vc[result.Diff.Commit.This],
480
})
481
return
482
}
+56
-6
appview/repo/repo_util.go
+56
-6
appview/repo/repo_util.go
···
9
10
"github.com/go-git/go-git/v5/plumbing/object"
11
"tangled.sh/tangled.sh/core/appview/db"
12
)
13
14
func uniqueEmails(commits []*object.Commit) []string {
···
56
return
57
}
58
59
-
func EmailToDidOrHandle(r *Repo, emails []string) map[string]string {
60
-
emailToDid, err := db.GetEmailToDid(r.db, emails, true) // only get verified emails for mapping
61
-
if err != nil {
62
-
log.Printf("error fetching dids for emails: %v", err)
63
return nil
64
}
65
66
var dids []string
67
-
for _, v := range emailToDid {
68
dids = append(dids, v)
69
}
70
resolvedIdents := r.idResolver.ResolveIdents(context.Background(), dids)
···
80
81
// Create map of email to didOrHandle for commit display
82
emailToDidOrHandle := make(map[string]string)
83
-
for email, did := range emailToDid {
84
if didOrHandle, ok := didHandleMap[did]; ok {
85
emailToDidOrHandle[email] = didOrHandle
86
}
87
}
88
89
return emailToDidOrHandle
90
}
91
92
func randomString(n int) string {
···
9
10
"github.com/go-git/go-git/v5/plumbing/object"
11
"tangled.sh/tangled.sh/core/appview/db"
12
+
"tangled.sh/tangled.sh/core/crypto"
13
+
"tangled.sh/tangled.sh/core/types"
14
)
15
16
func uniqueEmails(commits []*object.Commit) []string {
···
58
return
59
}
60
61
+
// emailToDidOrHandle takes an emailToDidMap from db.GetEmailToDid
62
+
// and resolves all dids to handles and returns a new map[string]string
63
+
func emailToDidOrHandle(r *Repo, emailToDidMap map[string]string) map[string]string {
64
+
if emailToDidMap == nil {
65
return nil
66
}
67
68
var dids []string
69
+
for _, v := range emailToDidMap {
70
dids = append(dids, v)
71
}
72
resolvedIdents := r.idResolver.ResolveIdents(context.Background(), dids)
···
82
83
// Create map of email to didOrHandle for commit display
84
emailToDidOrHandle := make(map[string]string)
85
+
for email, did := range emailToDidMap {
86
if didOrHandle, ok := didHandleMap[did]; ok {
87
emailToDidOrHandle[email] = didOrHandle
88
}
89
}
90
91
return emailToDidOrHandle
92
+
}
93
+
94
+
func verifiedObjectCommits(r *Repo, emailToDid map[string]string, commits []*object.Commit) (map[string]bool, error) {
95
+
ndCommits := []types.NiceDiff{}
96
+
for _, commit := range commits {
97
+
ndCommits = append(ndCommits, types.ObjectCommitToNiceDiff(commit))
98
+
}
99
+
return verifiedCommits(r, emailToDid, ndCommits)
100
+
}
101
+
102
+
func verifiedCommits(r *Repo, emailToDid map[string]string, ndCommits []types.NiceDiff) (map[string]bool, error) {
103
+
hashToVerified := make(map[string]bool)
104
+
105
+
didPubkeyCache := make(map[string][]db.PublicKey)
106
+
107
+
for _, commit := range ndCommits {
108
+
c := commit.Commit
109
+
110
+
committerEmail := c.Committer.Email
111
+
if did, exists := emailToDid[committerEmail]; exists {
112
+
// check if we've already fetched public keys for this did
113
+
pubKeys, ok := didPubkeyCache[did]
114
+
if !ok {
115
+
// fetch and cache public keys
116
+
keys, err := db.GetPublicKeysForDid(r.db, did)
117
+
if err != nil {
118
+
log.Printf("failed to fetch pubkey for %s: %v", committerEmail, err)
119
+
continue
120
+
}
121
+
pubKeys = keys
122
+
didPubkeyCache[did] = pubKeys
123
+
}
124
+
125
+
verified := false
126
+
127
+
// try to verify with any associated pubkeys
128
+
for _, pk := range pubKeys {
129
+
if _, ok := crypto.VerifyCommitSignature(pk.Key, commit); ok {
130
+
verified = true
131
+
break
132
+
}
133
+
}
134
+
135
+
hashToVerified[c.This] = verified
136
+
}
137
+
}
138
+
139
+
return hashToVerified, nil
140
}
141
142
func randomString(n int) string {
+1
-1
appview/settings/settings.go
+1
-1
appview/settings/settings.go
+1
-1
appview/state/state.go
+1
-1
appview/state/state.go
+30
types/diff.go
+30
types/diff.go
···
77
78
return files
79
}
80
+
81
+
// ObjectCommitToNiceDiff is a compatibility function to convert a
82
+
// commit object into a NiceDiff structure.
83
+
func ObjectCommitToNiceDiff(c *object.Commit) NiceDiff {
84
+
var niceDiff NiceDiff
85
+
86
+
// set commit information
87
+
niceDiff.Commit.Message = c.Message
88
+
niceDiff.Commit.Author = c.Author
89
+
niceDiff.Commit.This = c.Hash.String()
90
+
niceDiff.Commit.Committer = c.Committer
91
+
niceDiff.Commit.Tree = c.TreeHash.String()
92
+
niceDiff.Commit.PGPSignature = c.PGPSignature
93
+
94
+
changeId, ok := c.ExtraHeaders["change-id"]
95
+
if ok {
96
+
niceDiff.Commit.ChangedId = string(changeId)
97
+
}
98
+
99
+
// set parent hash if available
100
+
if len(c.ParentHashes) > 0 {
101
+
niceDiff.Commit.Parent = c.ParentHashes[0].String()
102
+
}
103
+
104
+
// XXX: Stats and Diff fields are typically populated
105
+
// after fetching the actual diff information, which isn't
106
+
// directly available in the commit object itself.
107
+
108
+
return niceDiff
109
+
}