Skip to content

Commit 0a3dee4

Browse files
committed
fix: Add contract version to plugin sign request and plugin verify request (notaryproject#390)
Add contract version to plugin sign request and plugin verify request. As per [specification](https://github.com/notaryproject/specifications/blob/main/specs/plugin-extensibility.md) `contractVersion` is a mandatory field. Signed-off-by: Pritesh Bandi <priteshbandi@gmail.com>
1 parent e686d8b commit 0a3dee4

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

signer/plugin.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ func (s *PluginSigner) generateSignatureEnvelope(ctx context.Context, desc ocisp
180180
}
181181
// Execute plugin sign command.
182182
req := &plugin.GenerateEnvelopeRequest{
183+
ContractVersion: plugin.ContractVersion,
183184
KeyID: s.keyID,
184185
Payload: payloadBytes,
185186
SignatureEnvelopeType: opts.SignatureMediaType,
@@ -247,8 +248,9 @@ func (s *PluginSigner) mergeConfig(config map[string]string) map[string]string {
247248

248249
func (s *PluginSigner) describeKey(ctx context.Context, config map[string]string) (*plugin.DescribeKeyResponse, error) {
249250
req := &plugin.DescribeKeyRequest{
250-
KeyID: s.keyID,
251-
PluginConfig: config,
251+
ContractVersion: plugin.ContractVersion,
252+
KeyID: s.keyID,
253+
PluginConfig: config,
252254
}
253255
resp, err := s.plugin.DescribeKey(ctx, req)
254256
if err != nil {
@@ -344,11 +346,12 @@ func (s *pluginPrimitiveSigner) Sign(payload []byte) ([]byte, []*x509.Certificat
344346
}
345347

346348
req := &plugin.GenerateSignatureRequest{
347-
KeyID: s.keyID,
348-
KeySpec: keySpec,
349-
Hash: keySpecHash,
350-
Payload: payload,
351-
PluginConfig: s.pluginConfig,
349+
ContractVersion: plugin.ContractVersion,
350+
KeyID: s.keyID,
351+
KeySpec: keySpec,
352+
Hash: keySpecHash,
353+
Payload: payload,
354+
PluginConfig: s.pluginConfig,
352355
}
353356

354357
resp, err := s.plugin.GenerateSignature(s.ctx, req)

verifier/verifier.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -681,9 +681,10 @@ func executePlugin(ctx context.Context, installedPlugin pluginframework.VerifyPl
681681
}
682682

683683
req := &pluginframework.VerifySignatureRequest{
684-
Signature: signature,
685-
TrustPolicy: policy,
686-
PluginConfig: pluginConfig,
684+
ContractVersion: pluginframework.ContractVersion,
685+
Signature: signature,
686+
TrustPolicy: policy,
687+
PluginConfig: pluginConfig,
687688
}
688689
return installedPlugin.VerifySignature(ctx, req)
689690
}

0 commit comments

Comments
 (0)