Skip to content

fix: Add contract version to plugin sign request and plugin verify request #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
priteshbandi merged 2 commits into from
Mar 21, 2024
Merged

fix: Add contract version to plugin sign request and plugin verify request #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8a8b80
Add contract version to plugin sign request and plugin verify request
priteshbandi Mar 21, 2024
174fbcf
Merge branch 'main' into main
priteshbandi Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions signer/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ func (s *PluginSigner) generateSignatureEnvelope(ctx context.Context, desc ocisp
}
// Execute plugin sign command.
req := &plugin.GenerateEnvelopeRequest{
ContractVersion: plugin.ContractVersion,
KeyID: s.keyID,
Payload: payloadBytes,
SignatureEnvelopeType: opts.SignatureMediaType,
Expand Down Expand Up @@ -247,8 +248,9 @@ func (s *PluginSigner) mergeConfig(config map[string]string) map[string]string {

func (s *PluginSigner) describeKey(ctx context.Context, config map[string]string) (*plugin.DescribeKeyResponse, error) {
req := &plugin.DescribeKeyRequest{
KeyID: s.keyID,
PluginConfig: config,
ContractVersion: plugin.ContractVersion,
KeyID: s.keyID,
PluginConfig: config,
}
resp, err := s.plugin.DescribeKey(ctx, req)
if err != nil {
Expand Down Expand Up @@ -344,11 +346,12 @@ func (s *pluginPrimitiveSigner) Sign(payload []byte) ([]byte, []*x509.Certificat
}

req := &plugin.GenerateSignatureRequest{
KeyID: s.keyID,
KeySpec: keySpec,
Hash: keySpecHash,
Payload: payload,
PluginConfig: s.pluginConfig,
ContractVersion: plugin.ContractVersion,
KeyID: s.keyID,
KeySpec: keySpec,
Hash: keySpecHash,
Payload: payload,
PluginConfig: s.pluginConfig,
}

resp, err := s.plugin.GenerateSignature(s.ctx, req)
Expand Down
7 changes: 4 additions & 3 deletions verifier/verifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,9 +681,10 @@ func executePlugin(ctx context.Context, installedPlugin pluginframework.VerifyPl
}

req := &pluginframework.VerifySignatureRequest{
Signature: signature,
TrustPolicy: policy,
PluginConfig: pluginConfig,
ContractVersion: pluginframework.ContractVersion,
Signature: signature,
TrustPolicy: policy,
PluginConfig: pluginConfig,
}
return installedPlugin.VerifySignature(ctx, req)
}
Expand Down