a5bee27892
message: Change all references to 'master' into 'trunk' change_hash: ABJwxLvHMmj63oJPIv/vNeRCIp1ZDZYuPLQT57x9K1lO credentials: - type: pgp_signature pub_key_id: 95C46FA6A41148AC body: iQIzBAABAgAdFiEEJ6tQKp6olvZKJ0lwlcRvpqQRSKwFAl5Je88ACgkQlcRvpqQRSKyxyw/7B51/vvtlxLan9Z6q6rh7uyGcFf6WpWGiRDIccAJHqzegGP4eAb8V4Jzi9H4JJ82TnAc+EUegs8ewRiOcWj6YkU463b5CgUSwnzYKm86K6SyHGW1WH9OxFIDEMzCaVsktMEc9iLMl0dJNzakhPzu+qy74pU5xlypjCBzRLFeuqmnf4M1fq4FAq6fCs7ZVB3LccyC0mhCWsS2eiuCE/mVQ7WROVpxj5tplp71jlX6ZtWU7qsgvQS2V8ggtTVpCT2WE4u6bnu1oYOpSs9g+sxKKOAHKvZfjAMLG9qM3pOl1J+44W2Ms/mtON0VUX7G1Q5XVcmM0hPopXsiWLiAslSOAOuL+LE5iLq4nz1RyIbVh0QakYr+4NJL6Yt0L2I6lNVnUS4SgmMr86n8ZCcCjDAs6g5d7Zchqp3S3EF3bbJuLi0ICoOCxTD2gNkjo2BGverI8APLTUpujQl+9W/sGmT2aEdTpruGYjIcwsRaGo8VMDFECdZply5Ng1FbBoohv+j3vdO05fRyNkvRu3CBxP2tUe39jLxUmpu62igGF2VjZptsK0bLdzDpQ5Hv6jSZjn+mPyFJ5w+EX2JCRYpjn2eaYYtI/IyULGTaftzcEZeZibEhd/wQJnsEJNqXpCilDKgZajZyYhgy7BSeT9xDf2d8qyFoqWpvFhshHcesbUfG2O+Y= account: mediocregopher
160 lines
4.4 KiB
Go
160 lines
4.4 KiB
Go
package dehub
|
|
|
|
import (
|
|
"dehub/accessctl"
|
|
"dehub/sigcred"
|
|
"errors"
|
|
"reflect"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/davecgh/go-spew/spew"
|
|
"gopkg.in/src-d/go-git.v4/plumbing"
|
|
yaml "gopkg.in/yaml.v2"
|
|
)
|
|
|
|
func TestTrunkCommitVerify(t *testing.T) {
|
|
type step struct {
|
|
msg string
|
|
msgHead string // defaults to msg
|
|
tree map[string]string
|
|
}
|
|
testCases := []struct {
|
|
descr string
|
|
steps []step
|
|
}{
|
|
{
|
|
descr: "single commit",
|
|
steps: []step{
|
|
{
|
|
msg: "first commit",
|
|
tree: map[string]string{"a": "0", "b": "1"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
descr: "multiple commits",
|
|
steps: []step{
|
|
{
|
|
msg: "first commit",
|
|
tree: map[string]string{"a": "0", "b": "1"},
|
|
},
|
|
{
|
|
msg: "second commit, changing a",
|
|
tree: map[string]string{"a": "1"},
|
|
},
|
|
{
|
|
msg: "third commit, empty",
|
|
},
|
|
{
|
|
msg: "fourth commit, adding c, removing b",
|
|
tree: map[string]string{"b": "", "c": "2"},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
descr: "big body commits",
|
|
steps: []step{
|
|
{
|
|
msg: "first commit, single line but with newline\n",
|
|
},
|
|
{
|
|
msg: "second commit, single line but with two newlines\n\n",
|
|
msgHead: "second commit, single line but with two newlines\n\n",
|
|
},
|
|
{
|
|
msg: "third commit, multi-line with one newline\nanother line!",
|
|
msgHead: "third commit, multi-line with one newline\n\n",
|
|
},
|
|
{
|
|
msg: "fourth commit, multi-line with two newlines\n\nanother line!",
|
|
msgHead: "fourth commit, multi-line with two newlines\n\n",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, test := range testCases {
|
|
t.Run(test.descr, func(t *testing.T) {
|
|
h := newHarness(t)
|
|
for _, step := range test.steps {
|
|
h.stage(step.tree)
|
|
account := h.cfg.Accounts[0]
|
|
|
|
trunkCommit, hash := h.trunkCommit(step.msg, account.ID, h.sig)
|
|
if err := h.repo.VerifyTrunkCommit(hash); err != nil {
|
|
t.Fatalf("could not verify hash %v: %v", hash, err)
|
|
}
|
|
|
|
commit, err := h.repo.GitRepo.CommitObject(hash)
|
|
if err != nil {
|
|
t.Fatalf("failed to retrieve commit %v: %v", hash, err)
|
|
} else if step.msgHead == "" {
|
|
step.msgHead = strings.TrimSpace(step.msg) + "\n\n"
|
|
}
|
|
|
|
if !strings.HasPrefix(commit.Message, step.msgHead) {
|
|
t.Fatalf("commit message %q does not start with expected head %q", commit.Message, step.msgHead)
|
|
}
|
|
|
|
var actualTrunkCommit TrunkCommit
|
|
if err := actualTrunkCommit.UnmarshalText([]byte(commit.Message)); err != nil {
|
|
t.Fatalf("error unmarshaling commit body: %v", err)
|
|
} else if !reflect.DeepEqual(actualTrunkCommit, trunkCommit) {
|
|
t.Fatalf("returned trunk commit:\n%s\ndoes not match actual one:\n%s",
|
|
spew.Sdump(trunkCommit), spew.Sdump(actualTrunkCommit))
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestConfigChange(t *testing.T) {
|
|
h := newHarness(t)
|
|
|
|
var hashes []plumbing.Hash
|
|
|
|
// commit the initial staged changes, which merely include the config and
|
|
// public key
|
|
_, hash := h.trunkCommit("commit configuration", h.cfg.Accounts[0].ID, h.sig)
|
|
hashes = append(hashes, hash)
|
|
|
|
// create a new account and add it to the configuration. It should not be
|
|
// able to actually make that commit though.
|
|
newSig, newPubKeyBody := sigcred.SignifierPGPTmp(h.rand)
|
|
h.cfg.Accounts = append(h.cfg.Accounts, Account{
|
|
ID: "toot",
|
|
Signifiers: []sigcred.Signifier{{PGPPublicKey: &sigcred.SignifierPGP{
|
|
Body: string(newPubKeyBody),
|
|
}}},
|
|
})
|
|
h.cfg.AccessControls[0].Condition.Signature.AccountIDs = []string{"root", "toot"}
|
|
h.cfg.AccessControls[0].Condition.Signature.Count = "1"
|
|
|
|
cfgBody, err := yaml.Marshal(h.cfg)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
h.stage(map[string]string{ConfigPath: string(cfgBody)})
|
|
|
|
_, err = h.repo.NewTrunkCommit("add toot user", h.cfg.Accounts[1].ID, newSig)
|
|
if aclErr := (accessctl.ErrConditionSignatureUnsatisfied{}); !errors.As(err, &aclErr) {
|
|
t.Fatalf("NewTrunkCommit should have returned an ErrConditionSignatureUnsatisfied, but returned %v", err)
|
|
}
|
|
|
|
// now add with the root user, this should work.
|
|
_, hash = h.trunkCommit("add toot user", h.cfg.Accounts[0].ID, h.sig)
|
|
hashes = append(hashes, hash)
|
|
|
|
// _now_ the toot user should be able to do things.
|
|
h.stage(map[string]string{"foo/bar": "what a cool file"})
|
|
_, hash = h.trunkCommit("add a cool file", h.cfg.Accounts[1].ID, newSig)
|
|
hashes = append(hashes, hash)
|
|
|
|
for i, hash := range hashes {
|
|
if err := h.repo.VerifyTrunkCommit(hash); err != nil {
|
|
t.Fatalf("commit %d (%v) should have been verified but wasn't: %v", i, hash, err)
|
|
}
|
|
}
|
|
}
|