From 4e7904f37ea8275d894a245d35319dc8cbb2549f Mon Sep 17 00:00:00 2001 From: Troels Liebe Bentsen Date: Wed, 20 Nov 2019 00:09:37 +0100 Subject: [PATCH 1/2] Inherit extended agent so we get modern sign hashes Signed-off-by: Troels Liebe Bentsen --- session/sshforward/sshprovider/agentprovider.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session/sshforward/sshprovider/agentprovider.go b/session/sshforward/sshprovider/agentprovider.go index 7aa3e3dfc255..72e55c674475 100644 --- a/session/sshforward/sshprovider/agentprovider.go +++ b/session/sshforward/sshprovider/agentprovider.go @@ -178,7 +178,7 @@ type sock struct { } type readOnlyAgent struct { - agent.Agent + agent.ExtendedAgent } func (a *readOnlyAgent) Add(_ agent.AddedKey) error { From 9c70fb99270ffc9faf9e833f74b0ec4a5fee01e0 Mon Sep 17 00:00:00 2001 From: Troels Liebe Bentsen Date: Thu, 21 Nov 2019 21:52:36 +0100 Subject: [PATCH 2/2] Disallow Extensions for now Signed-off-by: Troels Liebe Bentsen --- session/sshforward/sshprovider/agentprovider.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/session/sshforward/sshprovider/agentprovider.go b/session/sshforward/sshprovider/agentprovider.go index 72e55c674475..4f569799f7b9 100644 --- a/session/sshforward/sshprovider/agentprovider.go +++ b/session/sshforward/sshprovider/agentprovider.go @@ -196,3 +196,7 @@ func (a *readOnlyAgent) RemoveAll() error { func (a *readOnlyAgent) Lock(_ []byte) error { return errors.Errorf("locking agent not allowed by buildkit") } + +func (a *readOnlyAgent) Extension(_ string, _ []byte) ([]byte, error) { + return nil, errors.Errorf("extensions not allowed by buildkit") +}