vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-06 05:30:57 +00:00
Code Issues Projects Releases Wiki Activity

handle GpgDisableVerify and ignore-signatures consistently

Browse Source 
and be less verbose
This commit is contained in:
André Roth
2024-07-03 00:11:01 +02:00
parent d16110068c
commit c1f7e5fe96
12 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgp/gnupg.go
+2 -2
View File
@@ -163,8 +163,8 @@ func NewGpgVerifier(finder GPGFinder) *GpgVerifier {
}
// InitKeyring verifies that gpg is installed and some keys are trusted
func (g *GpgVerifier) InitKeyring() error {
if len(g.keyRings) == 0 {
func (g *GpgVerifier) InitKeyring(verbose bool) error {
if len(g.keyRings) == 0 && verbose {
// using default keyring
output, err := exec.Command(g.gpg, "--no-default-keyring", "--no-auto-check-trustdb", "--keyring", "trustedkeys.gpg", "--list-keys").Output()
if err == nil && len(output) == 0 {
pgp/gnupg_test.go
+4 -4
View File
@@ -94,7 +94,7 @@ func (s *Gnupg1VerifierSuite) SetUpTest(c *C) {
s.verifier = NewGpgVerifier(finder)
s.verifier.AddKeyring("./trusted.gpg")
c.Assert(s.verifier.InitKeyring(), IsNil)
c.Assert(s.verifier.InitKeyring(false), IsNil)
}
type Gnupg1SignerSuite struct {
@@ -122,7 +122,7 @@ func (s *Gnupg1SignerSuite) SetUpTest(c *C) {
s.verifier.AddKeyring("./keyrings/aptly.pub")
s.verifier.AddKeyring("./keyrings/aptly_passphrase.pub")
c.Assert(s.verifier.InitKeyring(), IsNil)
c.Assert(s.verifier.InitKeyring(false), IsNil)
s.SignerSuite.SetUpTest(c)
}
@@ -143,7 +143,7 @@ func (s *Gnupg2VerifierSuite) SetUpTest(c *C) {
s.verifier = NewGpgVerifier(finder)
s.verifier.AddKeyring("./trusted.gpg")
c.Assert(s.verifier.InitKeyring(), IsNil)
c.Assert(s.verifier.InitKeyring(false), IsNil)
}
type Gnupg2SignerSuite struct {
@@ -210,7 +210,7 @@ func (s *Gnupg2SignerSuite) SetUpTest(c *C) {
s.verifier = &GoVerifier{}
s.verifier.AddKeyring("./keyrings/aptly2_trusted.pub")
c.Assert(s.verifier.InitKeyring(), IsNil)
c.Assert(s.verifier.InitKeyring(false), IsNil)
s.skipDefaultKey = true
pgp/internal.go
+2 -2
View File
@@ -283,7 +283,7 @@ type GoVerifier struct {
}
// InitKeyring verifies that gpg is installed and some keys are trusted
func (g *GoVerifier) InitKeyring() error {
func (g *GoVerifier) InitKeyring(verbose bool) error {
var err error
if len(g.keyRingFiles) == 0 {
@@ -304,7 +304,7 @@ func (g *GoVerifier) InitKeyring() error {
}
}
if len(g.trustedKeyring) == 0 {
if len(g.trustedKeyring) == 0 && verbose {
fmt.Printf("\nLooks like your keyring with trusted keys is empty. You might consider importing some keys.\n")
if len(g.keyRingFiles) == 0 {
// using default keyring
pgp/internal_test.go
+2 -2
View File
@@ -14,7 +14,7 @@ func (s *GoVerifierSuite) SetUpTest(c *C) {
s.verifier = &GoVerifier{}
s.verifier.AddKeyring("./trusted.gpg")
c.Assert(s.verifier.InitKeyring(), IsNil)
c.Assert(s.verifier.InitKeyring(false), IsNil)
}
type GoSignerSuite struct {
@@ -36,7 +36,7 @@ func (s *GoSignerSuite) SetUpTest(c *C) {
s.verifier.AddKeyring("./keyrings/aptly.pub")
s.verifier.AddKeyring("./keyrings/aptly_passphrase.pub")
c.Assert(s.verifier.InitKeyring(), IsNil)
c.Assert(s.verifier.InitKeyring(false), IsNil)
s.SignerSuite.SetUpTest(c)
}
pgp/pgp.go
+1 -1
View File
@@ -51,7 +51,7 @@ type Signer interface {
// Verifier interface describes signature verification factility
type Verifier interface {
InitKeyring() error
InitKeyring(verbose bool) error
AddKeyring(keyring string)
VerifyDetachedSignature(signature, cleartext io.Reader, showKeyTip bool) error
IsClearSigned(clearsigned io.Reader) (bool, error)