patch of types,appview,knotserver: replace object.Commit with types.Commit · round #0 · pull #860 · tangled.org/core

+6 -45

appview/commitverify/verify.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"log"

     

       5
       5
        
       

     

       6
       6
       -
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       7
       6
        
       	"tangled.org/core/appview/db"

     

       8
       7
        
       	"tangled.org/core/appview/models"

     

       9
       8
        
       	"tangled.org/core/crypto"

     
···

       35
       34
        
       	return ""

     

       36
       35
        
       }

     

       37
       36
        
       

     

       38
       38
       -
       func GetVerifiedObjectCommits(e db.Execer, emailToDid map[string]string, commits []*object.Commit) (VerifiedCommits, error) {

     

       39
       39
       -
       	ndCommits := []types.NiceDiff{}

     

       40
       40
       -
       	for _, commit := range commits {

     

       41
       41
       -
       		ndCommits = append(ndCommits, ObjectCommitToNiceDiff(commit))

     

       42
       42
       -
       	}

     

       43
       43
       -
       	return GetVerifiedCommits(e, emailToDid, ndCommits)

     

       44
       44
       -
       }

     

       45
       45
       -
       

     

       46
       46
       -
       func GetVerifiedCommits(e db.Execer, emailToDid map[string]string, ndCommits []types.NiceDiff) (VerifiedCommits, error) {

     

       37
       37
       +
       func GetVerifiedCommits(e db.Execer, emailToDid map[string]string, ndCommits []types.Commit) (VerifiedCommits, error) {

     

       47
       38
        
       	vcs := VerifiedCommits{}

     

       48
       39
        
       

     

       49
       40
        
       	didPubkeyCache := make(map[string][]models.PublicKey)

     

       50
       41
        
       

     

       51
       42
        
       	for _, commit := range ndCommits {

     

       52
       52
       -
       		c := commit.Commit

     

       53
       53
       -
       

     

       54
       54
       -
       		committerEmail := c.Committer.Email

     

       43
       43
       +
       		committerEmail := commit.Committer.Email

     

       55
       44
        
       		if did, exists := emailToDid[committerEmail]; exists {

     

       56
       45
        
       			// check if we've already fetched public keys for this did

     

       57
       46
        
       			pubKeys, ok := didPubkeyCache[did]

     
···

       67
       56
        
       			}

     

       68
       57
        
       

     

       69
       58
        
       			// try to verify with any associated pubkeys

     

       59
       59
       +
       			payload := commit.Payload()

     

       60
       60
       +
       			signature := commit.PGPSignature

     

       70
       61
        
       			for _, pk := range pubKeys {

     

       71
       71
       -
       				if _, ok := crypto.VerifyCommitSignature(pk.Key, commit); ok {

     

       62
       62
       +
       				if _, ok := crypto.VerifySignature([]byte(pk.Key), []byte(signature), []byte(payload)); ok {

     

       72
       63
        
       

     

       73
       64
        
       					fp, err := crypto.SSHFingerprint(pk.Key)

     

       74
       65
        
       					if err != nil {

     

       75
       66
        
       						log.Println("error computing ssh fingerprint:", err)

     

       76
       67
        
       					}

     

       77
       68
        
       

     

       78
       78
       -
       					vc := verifiedCommit{fingerprint: fp, hash: c.This}

     

       69
       69
       +
       					vc := verifiedCommit{fingerprint: fp, hash: commit.This}

     

       79
       70
        
       					vcs[vc] = struct{}{}

     

       80
       71
        
       					break

     

       81
       72
        
       				}

     
···

       86
       77
        
       

     

       87
       78
        
       	return vcs, nil

     

       88
       79
        
       }

     

       89
       89
       -
       

     

       90
       90
       -
       // ObjectCommitToNiceDiff is a compatibility function to convert a

     

       91
       91
       -
       // commit object into a NiceDiff structure.

     

       92
       92
       -
       func ObjectCommitToNiceDiff(c *object.Commit) types.NiceDiff {

     

       93
       93
       -
       	var niceDiff types.NiceDiff

     

       94
       94
       -
       

     

       95
       95
       -
       	// set commit information

     

       96
       96
       -
       	niceDiff.Commit.Message = c.Message

     

       97
       97
       -
       	niceDiff.Commit.Author = c.Author

     

       98
       98
       -
       	niceDiff.Commit.This = c.Hash.String()

     

       99
       99
       -
       	niceDiff.Commit.Committer = c.Committer

     

       100
       100
       -
       	niceDiff.Commit.Tree = c.TreeHash.String()

     

       101
       101
       -
       	niceDiff.Commit.PGPSignature = c.PGPSignature

     

       102
       102
       -
       

     

       103
       103
       -
       	changeId, ok := c.ExtraHeaders["change-id"]

     

       104
       104
       -
       	if ok {

     

       105
       105
       -
       		niceDiff.Commit.ChangedId = string(changeId)

     

       106
       106
       -
       	}

     

       107
       107
       -
       

     

       108
       108
       -
       	// set parent hash if available

     

       109
       109
       -
       	if len(c.ParentHashes) > 0 {

     

       110
       110
       -
       		niceDiff.Commit.Parent = c.ParentHashes[0].String()

     

       111
       111
       -
       	}

     

       112
       112
       -
       

     

       113
       113
       -
       	// XXX: Stats and Diff fields are typically populated

     

       114
       114
       -
       	// after fetching the actual diff information, which isn't

     

       115
       115
       -
       	// directly available in the commit object itself.

     

       116
       116
       -
       

     

       117
       117
       -
       	return niceDiff

     

       118
       118
       -
       }

+1 -2

appview/pages/pages.go

···

       31
       31
        
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       32
       32
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       33
       33
        
       	"github.com/go-git/go-git/v5/plumbing"

     

       34
       34
       -
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       35
       34
        
       )

     

       36
       35
        
       

     

       37
       36
        
       //go:embed templates/* static legal

     
···

       649
       648
        
       	RepoInfo      repoinfo.RepoInfo

     

       650
       649
        
       	Active        string

     

       651
       650
        
       	TagMap        map[string][]string

     

       652
       652
       -
       	CommitsTrunc  []*object.Commit

     

       651
       651
       +
       	CommitsTrunc  []types.Commit

     

       653
       652
        
       	TagsTrunc     []*types.TagReference

     

       654
       653
        
       	BranchesTrunc []types.Branch

     

       655
       654
        
       	// ForkInfo           *types.ForkInfo

+1 -1

appview/pages/templates/repo/commit.html

···

       35
       35
        
                 {{ end }}

     

       36
       36
        
       

     

       37
       37
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       38
       38
       -
                 {{ template "repo/fragments/time" $commit.Author.When }}

     

       38
       38
       +
                 {{ template "repo/fragments/time" $commit.Committer.When }}

     

       39
       39
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       40
       40
        
       

     

       41
       41
        
                 <a href="/{{ $repo }}/commit/{{ $commit.This }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ slice $commit.This 0 8 }}</a>

+1 -1

appview/repo/index.go

···

       122
       122
        
       		l.Error("failed to get email to did map", "err", err)

     

       123
       123
        
       	}

     

       124
       124
        
       

     

       125
       125
       -
       	vc, err := commitverify.GetVerifiedObjectCommits(rp.db, emailToDidMap, commitsTrunc)

     

       125
       125
       +
       	vc, err := commitverify.GetVerifiedCommits(rp.db, emailToDidMap, commitsTrunc)

     

       126
       126
        
       	if err != nil {

     

       127
       127
        
       		l.Error("failed to GetVerifiedObjectCommits", "err", err)

     

       128
       128
        
       	}

+2 -2

appview/repo/log.go

···

       116
       116
        
       		l.Error("failed to fetch email to did mapping", "err", err)

     

       117
       117
        
       	}

     

       118
       118
        
       

     

       119
       119
       -
       	vc, err := commitverify.GetVerifiedObjectCommits(rp.db, emailToDidMap, xrpcResp.Commits)

     

       119
       119
       +
       	vc, err := commitverify.GetVerifiedCommits(rp.db, emailToDidMap, xrpcResp.Commits)

     

       120
       120
        
       	if err != nil {

     

       121
       121
        
       		l.Error("failed to GetVerifiedObjectCommits", "err", err)

     

       122
       122
        
       	}

     
···

       192
       192
        
       		l.Error("failed to get email to did mapping", "err", err)

     

       193
       193
        
       	}

     

       194
       194
        
       

     

       195
       195
       -
       	vc, err := commitverify.GetVerifiedCommits(rp.db, emailToDidMap, []types.NiceDiff{*result.Diff})

     

       195
       195
       +
       	vc, err := commitverify.GetVerifiedCommits(rp.db, emailToDidMap, []types.Commit{result.Diff.Commit})

     

       196
       196
        
       	if err != nil {

     

       197
       197
        
       		l.Error("failed to GetVerifiedCommits", "err", err)

     

       198
       198
        
       	}

+2 -1

appview/repo/repo_util.go

···

       1
       1
        
       package repo

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"regexp"

     

       4
       5
        
       	"slices"

     

       5
       6
        
       	"sort"

     

       6
       7
        
       	"strings"

     
···

       42
       43
        
       	})

     

       43
       44
        
       }

     

       44
       45
        
       

     

       45
       45
       -
       func uniqueEmails(commits []*object.Commit) []string {

     

       46
       46
       +
       func uniqueEmails(commits []types.Commit) []string {

     

       46
       47
        
       	emails := make(map[string]struct{})

     

       47
       48
        
       	for _, commit := range commits {

     

       48
       49
        
       		if commit.Author.Email != "" {

+1 -34

crypto/verify.go

···

       5
       5
        
       	"crypto/sha256"

     

       6
       6
        
       	"encoding/base64"

     

       7
       7
        
       	"fmt"

     

       8
       8
       -
       	"strings"

     

       9
       8
        
       

     

       10
       9
        
       	"github.com/hiddeco/sshsig"

     

       11
       10
        
       	"golang.org/x/crypto/ssh"

     

       12
       12
       -
       	"tangled.org/core/types"

     

       13
       11
        
       )

     

       14
       12
        
       

     

       15
       13
        
       func VerifySignature(pubKey, signature, payload []byte) (error, bool) {

     
···

       28
       26
        
       	// multiple algorithms but sha-512 is most secure, and git's ssh signing defaults

     

       29
       27
        
       	// to sha-512 for all key types anyway.

     

       30
       28
        
       	err = sshsig.Verify(buf, sig, pub, sshsig.HashSHA512, "git")

     

       31
       31
       -
       	return err, err == nil

     

       32
       32
       -
       }

     

       33
       33
       -
       

     

       34
       34
       -
       // VerifyCommitSignature reconstructs the payload used to sign a commit. This is

     

       35
       35
       -
       // essentially the git cat-file output but without the gpgsig header.

     

       36
       36
       -
       //

     

       37
       37
       -
       // Caveats: signature verification will fail on commits with more than one parent,

     

       38
       38
       -
       // i.e. merge commits, because types.NiceDiff doesn't carry more than one Parent field

     

       39
       39
       -
       // and we are unable to reconstruct the payload correctly.

     

       40
       40
       -
       //

     

       41
       41
       -
       // Ideally this should directly operate on an *object.Commit.

     

       42
       42
       -
       func VerifyCommitSignature(pubKey string, commit types.NiceDiff) (error, bool) {

     

       43
       43
       -
       	signature := commit.Commit.PGPSignature

     

       44
       44
       -
       

     

       45
       45
       -
       	author := bytes.NewBuffer([]byte{})

     

       46
       46
       -
       	committer := bytes.NewBuffer([]byte{})

     

       47
       47
       -
       	commit.Commit.Author.Encode(author)

     

       48
       48
       -
       	commit.Commit.Committer.Encode(committer)

     

       49
       49
       -
       

     

       50
       50
       -
       	payload := strings.Builder{}

     

       51
       29
        
       

     

       52
       52
       -
       	fmt.Fprintf(&payload, "tree %s\n", commit.Commit.Tree)

     

       53
       53
       -
       	if commit.Commit.Parent != "" {

     

       54
       54
       -
       		fmt.Fprintf(&payload, "parent %s\n", commit.Commit.Parent)

     

       55
       55
       -
       	}

     

       56
       56
       -
       	fmt.Fprintf(&payload, "author %s\n", author.String())

     

       57
       57
       -
       	fmt.Fprintf(&payload, "committer %s\n", committer.String())

     

       58
       58
       -
       	if commit.Commit.ChangedId != "" {

     

       59
       59
       -
       		fmt.Fprintf(&payload, "change-id %s\n", commit.Commit.ChangedId)

     

       60
       60
       -
       	}

     

       61
       61
       -
       	fmt.Fprintf(&payload, "\n%s", commit.Commit.Message)

     

       62
       62
       -
       

     

       63
       63
       -
       	return VerifySignature([]byte(pubKey), []byte(signature), []byte(payload.String()))

     

       30
       30
       +
       	return err, err == nil

     

       64
       31
        
       }

     

       65
       32
        
       

     

       66
       33
        
       // SSHFingerprint computes the fingerprint of the supplied ssh pubkey.

+1 -17

knotserver/git/diff.go

···

       77
       77
        
       		nd.Diff = append(nd.Diff, ndiff)

     

       78
       78
        
       	}

     

       79
       79
        
       

     

       80
       80
       -
       	nd.Stat.FilesChanged = len(diffs)

     

       81
       81
       -
       	nd.Commit.This = c.Hash.String()

     

       82
       82
       -
       	nd.Commit.PGPSignature = c.PGPSignature

     

       83
       83
       -
       	nd.Commit.Committer = c.Committer

     

       84
       84
       -
       	nd.Commit.Tree = c.TreeHash.String()

     

       85
       85
       -
       

     

       86
       86
       -
       	if parent.Hash.IsZero() {

     

       87
       87
       -
       		nd.Commit.Parent = ""

     

       88
       88
       -
       	} else {

     

       89
       89
       -
       		nd.Commit.Parent = parent.Hash.String()

     

       90
       90
       -
       	}

     

       91
       91
       -
       	nd.Commit.Author = c.Author

     

       92
       92
       -
       	nd.Commit.Message = c.Message

     

       93
       93
       -
       

     

       94
       94
       -
       	if v, ok := c.ExtraHeaders["change-id"]; ok {

     

       95
       95
       -
       		nd.Commit.ChangedId = string(v)

     

       96
       96
       -
       	}

     

       80
       80
       +
       	nd.Commit.FromGoGitCommit(c)

     

       97
       81
        
       

     

       98
       82
        
       	return &nd, nil

     

       99
       83
        
       }

+6 -1

knotserver/xrpc/repo_log.go

···

       62
       62
        
       		return

     

       63
       63
        
       	}

     

       64
       64
        
       

     

       65
       65
       +
       	tcommits := make([]types.Commit, len(commits))

     

       66
       66
       +
       	for i, c := range commits {

     

       67
       67
       +
       		tcommits[i].FromGoGitCommit(c)

     

       68
       68
       +
       	}

     

       69
       69
       +
       

     

       65
       70
        
       	// Create response using existing types.RepoLogResponse

     

       66
       71
        
       	response := types.RepoLogResponse{

     

       67
       67
       -
       		Commits: commits,

     

       72
       72
       +
       		Commits: tcommits,

     

       68
       73
        
       		Ref:     ref,

     

       69
       74
        
       		Page:    (offset / limit) + 1,

     

       70
       75
        
       		PerPage: limit,

-1

patchutil/patchutil.go

···

       296
       296
        
       	}

     

       297
       297
        
       

     

       298
       298
        
       	nd := types.NiceDiff{}

     

       299
       299
       -
       	nd.Commit.Parent = targetBranch

     

       300
       299
        
       

     

       301
       300
        
       	for _, d := range diffs {

     

       302
       301
        
       		ndiff := types.Diff{}

+2 -12

types/diff.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"github.com/bluekeyes/go-gitdiff/gitdiff"

     

       5
       5
       -
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       6
       5
        
       )

     

       7
       6
        
       

     

       8
       7
        
       type DiffOpts struct {

     
···

       43
       42
        
       

     

       44
       43
        
       // A nicer git diff representation.

     

       45
       44
        
       type NiceDiff struct {

     

       46
       46
       -
       	Commit struct {

     

       47
       47
       -
       		Message      string           `json:"message"`

     

       48
       48
       -
       		Author       object.Signature `json:"author"`

     

       49
       49
       -
       		This         string           `json:"this"`

     

       50
       50
       -
       		Parent       string           `json:"parent"`

     

       51
       51
       -
       		PGPSignature string           `json:"pgp_signature"`

     

       52
       52
       -
       		Committer    object.Signature `json:"committer"`

     

       53
       53
       -
       		Tree         string           `json:"tree"`

     

       54
       54
       -
       		ChangedId    string           `json:"change_id"`

     

       55
       55
       -
       	} `json:"commit"`

     

       56
       56
       -
       	Stat struct {

     

       45
       45
       +
       	Commit Commit `json:"commit"`

     

       46
       46
       +
       	Stat   struct {

     

       57
       47
        
       		FilesChanged int `json:"files_changed"`

     

       58
       48
        
       		Insertions   int `json:"insertions"`

     

       59
       49
        
       		Deletions    int `json:"deletions"`

+17 -17

types/repo.go

···

       8
       8
        
       )

     

       9
       9
        
       

     

       10
       10
        
       type RepoIndexResponse struct {

     

       11
       11
       -
       	IsEmpty        bool             `json:"is_empty"`

     

       12
       12
       -
       	Ref            string           `json:"ref,omitempty"`

     

       13
       13
       -
       	Readme         string           `json:"readme,omitempty"`

     

       14
       14
       -
       	ReadmeFileName string           `json:"readme_file_name,omitempty"`

     

       15
       15
       -
       	Commits        []*object.Commit `json:"commits,omitempty"`

     

       16
       16
       -
       	Description    string           `json:"description,omitempty"`

     

       17
       17
       -
       	Files          []NiceTree       `json:"files,omitempty"`

     

       18
       18
       -
       	Branches       []Branch         `json:"branches,omitempty"`

     

       19
       19
       -
       	Tags           []*TagReference  `json:"tags,omitempty"`

     

       20
       20
       -
       	TotalCommits   int              `json:"total_commits,omitempty"`

     

       11
       11
       +
       	IsEmpty        bool            `json:"is_empty"`

     

       12
       12
       +
       	Ref            string          `json:"ref,omitempty"`

     

       13
       13
       +
       	Readme         string          `json:"readme,omitempty"`

     

       14
       14
       +
       	ReadmeFileName string          `json:"readme_file_name,omitempty"`

     

       15
       15
       +
       	Commits        []Commit        `json:"commits,omitempty"`

     

       16
       16
       +
       	Description    string          `json:"description,omitempty"`

     

       17
       17
       +
       	Files          []NiceTree      `json:"files,omitempty"`

     

       18
       18
       +
       	Branches       []Branch        `json:"branches,omitempty"`

     

       19
       19
       +
       	Tags           []*TagReference `json:"tags,omitempty"`

     

       20
       20
       +
       	TotalCommits   int             `json:"total_commits,omitempty"`

     

       21
       21
        
       }

     

       22
       22
        
       

     

       23
       23
        
       type RepoLogResponse struct {

     

       24
       24
       -
       	Commits     []*object.Commit `json:"commits,omitempty"`

     

       25
       25
       -
       	Ref         string           `json:"ref,omitempty"`

     

       26
       26
       -
       	Description string           `json:"description,omitempty"`

     

       27
       27
       -
       	Log         bool             `json:"log,omitempty"`

     

       28
       28
       -
       	Total       int              `json:"total,omitempty"`

     

       29
       29
       -
       	Page        int              `json:"page,omitempty"`

     

       30
       30
       -
       	PerPage     int              `json:"per_page,omitempty"`

     

       24
       24
       +
       	Commits     []Commit `json:"commits,omitempty"`

     

       25
       25
       +
       	Ref         string   `json:"ref,omitempty"`

     

       26
       26
       +
       	Description string   `json:"description,omitempty"`

     

       27
       27
       +
       	Log         bool     `json:"log,omitempty"`

     

       28
       28
       +
       	Total       int      `json:"total,omitempty"`

     

       29
       29
       +
       	Page        int      `json:"page,omitempty"`

     

       30
       30
       +
       	PerPage     int      `json:"per_page,omitempty"`

     

       31
       31
        
       }

     

       32
       32
        
       

     

       33
       33
        
       type RepoCommitResponse struct {