From 094cf7b09df77f701f05959a171baf5bba9ea1d1 Mon Sep 17 00:00:00 2001 From: Spike Curtis Date: Tue, 10 Oct 2023 09:10:35 +0400 Subject: [PATCH] fix: fix MaliciousTar test case --- provisionerd/provisionerd_test.go | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go index 3d8617a4a5551..c39edd491a3b2 100644 --- a/provisionerd/provisionerd_test.go +++ b/provisionerd/provisionerd_test.go @@ -146,27 +146,24 @@ func TestProvisionerd(t *testing.T) { var ( completeChan = make(chan struct{}) completeOnce sync.Once + acq = newAcquireOne(t, &proto.AcquiredJob{ + JobId: "test", + Provisioner: "someprovisioner", + TemplateSourceArchive: createTar(t, map[string]string{ + "../../../etc/passwd": "content", + }), + Type: &proto.AcquiredJob_TemplateImport_{ + TemplateImport: &proto.AcquiredJob_TemplateImport{ + Metadata: &sdkproto.Metadata{}, + }, + }, + }) ) closer := createProvisionerd(t, func(ctx context.Context) (proto.DRPCProvisionerDaemonClient, error) { return createProvisionerDaemonClient(t, done, provisionerDaemonTestServer{ - acquireJobWithCancel: func(stream proto.DRPCProvisionerDaemon_AcquireJobWithCancelStream) error { - err := stream.Send(&proto.AcquiredJob{ - JobId: "test", - Provisioner: "someprovisioner", - TemplateSourceArchive: createTar(t, map[string]string{ - "../../../etc/passwd": "content", - }), - Type: &proto.AcquiredJob_TemplateImport_{ - TemplateImport: &proto.AcquiredJob_TemplateImport{ - Metadata: &sdkproto.Metadata{}, - }, - }, - }) - assert.NoError(t, err) - return nil - }, - updateJob: noopUpdateJob, + acquireJobWithCancel: acq.acquireWithCancel, + updateJob: noopUpdateJob, failJob: func(ctx context.Context, job *proto.FailedJob) (*proto.Empty, error) { completeOnce.Do(func() { close(completeChan) }) return &proto.Empty{}, nil