Refactor GPG signer/verifier

Goal is to make it easier to plug in another implementation.
This commit is contained in:
Andrey Smirnov
2017-05-23 02:54:56 +03:00
parent c026106352
commit 1be8d39105
21 changed files with 135 additions and 110 deletions
+3 -2
View File
@@ -6,6 +6,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/smira/aptly/deb"
"github.com/smira/aptly/pgp"
"github.com/smira/aptly/utils"
)
@@ -20,12 +21,12 @@ type SigningOptions struct {
PassphraseFile string
}
func getSigner(options *SigningOptions) (utils.Signer, error) {
func getSigner(options *SigningOptions) (pgp.Signer, error) {
if options.Skip {
return nil, nil
}
signer := &utils.GpgSigner{}
signer := &pgp.GpgSigner{}
signer.SetKey(options.GpgKey)
signer.SetKeyRing(options.Keyring, options.SecretKeyring)
signer.SetPassphrase(options.Passphrase, options.PassphraseFile)
+2 -1
View File
@@ -9,6 +9,7 @@ import (
"github.com/smira/aptly/aptly"
"github.com/smira/aptly/database"
"github.com/smira/aptly/deb"
"github.com/smira/aptly/pgp"
"github.com/smira/aptly/utils"
)
@@ -296,7 +297,7 @@ func apiReposPackageFromDir(c *gin.Context) {
return
}
verifier := &utils.GpgVerifier{}
verifier := &pgp.GpgVerifier{}
var (
sources []string