From d4db1d134296385456f63141814da70712ec6717 Mon Sep 17 00:00:00 2001 From: GreenHedgehog Date: Wed, 3 Feb 2021 21:09:05 +0300 Subject: [PATCH 1/3] fix possible nil pointer dereference in azure sdk --- backend/remote-state/azure/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/remote-state/azure/client.go b/backend/remote-state/azure/client.go index 6c120e722..29c3121de 100644 --- a/backend/remote-state/azure/client.go +++ b/backend/remote-state/azure/client.go @@ -39,7 +39,7 @@ func (c *RemoteClient) Get() (*remote.Payload, error) { ctx := context.TODO() blob, err := c.giovanniBlobClient.Get(ctx, c.accountName, c.containerName, c.keyName, options) if err != nil { - if blob.Response.StatusCode == 404 { + if blob.Response.Response != nil && blob.Response.StatusCode == 404 { return nil, nil } return nil, err From f52a18b13402558feb44dba8ea79cf081d2a4f81 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 15 Feb 2021 12:04:07 -0800 Subject: [PATCH 2/3] Update backend/remote-state/azure/client.go Co-authored-by: Tom Harvey --- backend/remote-state/azure/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/remote-state/azure/client.go b/backend/remote-state/azure/client.go index 29c3121de..cd019f326 100644 --- a/backend/remote-state/azure/client.go +++ b/backend/remote-state/azure/client.go @@ -39,7 +39,7 @@ func (c *RemoteClient) Get() (*remote.Payload, error) { ctx := context.TODO() blob, err := c.giovanniBlobClient.Get(ctx, c.accountName, c.containerName, c.keyName, options) if err != nil { - if blob.Response.Response != nil && blob.Response.StatusCode == 404 { + if blob.Response.IsHTTPStatus(http.StatusNotFound) { return nil, nil } return nil, err From 2b42445454adf6c66211d4bd32d1f935d2d923ba Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Mon, 15 Feb 2021 12:09:31 -0800 Subject: [PATCH 3/3] Update client.go --- backend/remote-state/azure/client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/remote-state/azure/client.go b/backend/remote-state/azure/client.go index cd019f326..d63e34ac4 100644 --- a/backend/remote-state/azure/client.go +++ b/backend/remote-state/azure/client.go @@ -6,6 +6,7 @@ import ( "encoding/json" "fmt" "log" + "net/http" "github.com/hashicorp/go-multierror" "github.com/hashicorp/go-uuid"