Skip to content

Commit 99bc2bc

Browse files
authored
fix: quick fix to use correct sign/verify plugin (#338)
Changes in this PR: 1. `signer.NewFromPlugin(plugin plugin.SignPlugin, ...)` 2. `verifer.executePlugin(ctx context.Context, installedPlugin plugin.VerifyPlugin, ...)` --------- Signed-off-by: Patrick Zheng <patrickzheng@microsoft.com>
1 parent 3981f69 commit 99bc2bc

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

signer/plugin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type pluginSigner struct {
4343
// NewFromPlugin creates a notation.Signer that signs artifacts and generates
4444
// signatures by delegating the one or more operations to the named plugin,
4545
// as defined in https://github.com/notaryproject/notaryproject/blob/main/specs/plugin-extensibility.md#signing-interfaces.
46-
func NewFromPlugin(plugin plugin.Plugin, keyID string, pluginConfig map[string]string) (notation.Signer, error) {
46+
func NewFromPlugin(plugin plugin.SignPlugin, keyID string, pluginConfig map[string]string) (notation.Signer, error) {
4747
if plugin == nil {
4848
return nil, errors.New("nil plugin")
4949
}

verifier/verifier.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func (v *verifier) processSignature(ctx context.Context, sigBlob []byte, envelop
205205
return err
206206
}
207207

208-
var installedPlugin plugin.Plugin
208+
var installedPlugin plugin.VerifyPlugin
209209
if verificationPluginName != "" {
210210
logger.Debugf("Finding verification plugin %s", verificationPluginName)
211211
verificationPluginMinVersion, err := getVerificationPluginMinVersion(&outcome.EnvelopeContent.SignerInfo)
@@ -633,7 +633,7 @@ func verifyRevocation(outcome *notation.VerificationOutcome, r revocation.Revoca
633633
return result
634634
}
635635

636-
func executePlugin(ctx context.Context, installedPlugin plugin.Plugin, trustPolicy *trustpolicy.TrustPolicy, capabilitiesToVerify []proto.Capability, envelopeContent *signature.EnvelopeContent, pluginConfig map[string]string) (*proto.VerifySignatureResponse, error) {
636+
func executePlugin(ctx context.Context, installedPlugin plugin.VerifyPlugin, trustPolicy *trustpolicy.TrustPolicy, capabilitiesToVerify []proto.Capability, envelopeContent *signature.EnvelopeContent, pluginConfig map[string]string) (*proto.VerifySignatureResponse, error) {
637637
logger := log.GetLogger(ctx)
638638
// sanity check
639639
if installedPlugin == nil {

0 commit comments

Comments
 (0)