token2/snapd
0
0
Fork 0
mirror of https://github.com/token2/snapd.git synced 2026-03-13 11:15:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

kill or change some fiddly bits of tests by using the public key export and signing functionality on the Database

Browse Source
This commit is contained in:
Samuele Pedroni
2015-12-01 14:28:54 +01:00
parent c864d346c5
commit 7e6caffc70
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
asserts/account_key_test.go
View File

@@ -20,9 +20,6 @@
package asserts_test
import (
"bytes"
"encoding/base64"
"encoding/hex"
"fmt"
"path/filepath"
"strings"
@@ -43,15 +40,19 @@ type accountKeySuite struct {
var _ = Suite(&accountKeySuite{})
func (aks *accountKeySuite) SetUpSuite(c *C) {
var err error
aks.fp = hex.EncodeToString(testPrivKey1.PublicKey.Fingerprint[:])
cfg1 := &asserts.DatabaseConfig{Path: filepath.Join(c.MkDir(), "asserts-db1")}
accDb, err := asserts.OpenDatabase(cfg1)
aks.fp, err = accDb.ImportKey("acc-id1", asserts.WrapPrivateKey(testPrivKey1))
c.Assert(err, IsNil)
pubKey, err := accDb.ExportPublicKey("acc-id1", aks.fp)
c.Assert(err, IsNil)
pubKeyEncoded, err := asserts.EncodePublicKey(pubKey)
c.Assert(err, IsNil)
aks.pubKeyBody = string(pubKeyEncoded)
aks.since, err = time.Parse(time.RFC822, "16 Nov 15 15:04 UTC")
c.Assert(err, IsNil)
aks.until = aks.since.AddDate(1, 0, 0)
buf := new(bytes.Buffer)
err = testPrivKey1.PublicKey.Serialize(buf)
c.Assert(err, IsNil)
aks.pubKeyBody = "openpgp " + base64.StdEncoding.EncodeToString(buf.Bytes())
aks.sinceLine = "since: " + aks.since.Format(time.RFC3339) + "\n"
aks.untilLine = "until: " + aks.until.Format(time.RFC3339) + "\n"
}

35
asserts/snap_asserts_test.go
View File

@@ -20,9 +20,6 @@
package asserts_test
import (
"bytes"
"encoding/base64"
"encoding/hex"
"path/filepath"
"strings"
"time"
@@ -100,16 +97,18 @@ func (sds *snapDeclSuite) TestDecodeInvalid(c *C) {
}
}
func makeDatabaseWithAccountKey(c *C) *asserts.Database {
func makeSignAndCheckDbWithAccountKey(c *C) (accSignDB, checkDB *asserts.Database) {
trustedKey := testPrivKey0
accPrivKey := testPrivKey1
// TODO: crypto.go should have helpers for this related to exporting
buf := new(bytes.Buffer)
err := accPrivKey.PublicKey.Serialize(buf)
cfg1 := &asserts.DatabaseConfig{Path: filepath.Join(c.MkDir(), "asserts-db1")}
accSignDB, err := asserts.OpenDatabase(cfg1)
accFingerp, err := accSignDB.ImportKey("dev-id1", asserts.WrapPrivateKey(testPrivKey1))
c.Assert(err, IsNil)
accPubKeyBody := "openpgp " + base64.StdEncoding.EncodeToString(buf.Bytes())
accFingerp := hex.EncodeToString(testPrivKey1.PublicKey.Fingerprint[:])
pubKey, err := accSignDB.ExportPublicKey("dev-id1", accFingerp)
c.Assert(err, IsNil)
pubKeyEncoded, err := asserts.EncodePublicKey(pubKey)
c.Assert(err, IsNil)
accPubKeyBody := string(pubKeyEncoded)
headers := map[string]string{
"authority-id": "canonical",
@@ -128,18 +127,17 @@ func makeDatabaseWithAccountKey(c *C) *asserts.Database {
"canonical": {asserts.WrapPublicKey(&trustedKey.PublicKey)},
},
}
db, err := asserts.OpenDatabase(cfg)
checkDB, err = asserts.OpenDatabase(cfg)
c.Assert(err, IsNil)
err = db.Add(accKey)
err = checkDB.Add(accKey)
c.Assert(err, IsNil)
return db
return accSignDB, checkDB
}
func (sds *snapDeclSuite) TestSnapDeclarationCheck(c *C) {
accPrivKey := testPrivKey1
db := makeDatabaseWithAccountKey(c)
accSignDB, db := makeSignAndCheckDbWithAccountKey(c)
headers := map[string]string{
"authority-id": "dev-id1",
@@ -149,7 +147,7 @@ func (sds *snapDeclSuite) TestSnapDeclarationCheck(c *C) {
"snap-size": "1025",
"timestamp": "2015-11-25T20:00:00Z",
}
snapDecl, err := asserts.BuildAndSignInTest(asserts.SnapDeclarationType, headers, nil, asserts.WrapPrivateKey(accPrivKey))
snapDecl, err := accSignDB.Sign(asserts.SnapDeclarationType, headers, nil, "")
c.Assert(err, IsNil)
err = db.Check(snapDecl)
@@ -157,8 +155,7 @@ func (sds *snapDeclSuite) TestSnapDeclarationCheck(c *C) {
}
func (sds *snapDeclSuite) TestSnapDeclarationCheckInconsistentTimestamp(c *C) {
accPrivKey := testPrivKey1
db := makeDatabaseWithAccountKey(c)
accSignDB, db := makeSignAndCheckDbWithAccountKey(c)
headers := map[string]string{
"authority-id": "dev-id1",
@@ -168,7 +165,7 @@ func (sds *snapDeclSuite) TestSnapDeclarationCheckInconsistentTimestamp(c *C) {
"snap-size": "1025",
"timestamp": "2013-01-01T14:00:00Z",
}
snapDecl, err := asserts.BuildAndSignInTest(asserts.SnapDeclarationType, headers, nil, asserts.WrapPrivateKey(accPrivKey))
snapDecl, err := accSignDB.Sign(asserts.SnapDeclarationType, headers, nil, "")
c.Assert(err, IsNil)
err = db.Check(snapDecl)