From 413d13c41140dea2b058f4d1c47f3e43a0b6364d Mon Sep 17 00:00:00 2001
From: Giovanni Tirloni <gtirloni@ret.cx>
Date: Thu, 26 Apr 2018 18:59:30 -0300
Subject: [PATCH] Handle HTTP download errors

---
 common/download.go      |  4 ++++
 common/download_test.go | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/common/download.go b/common/download.go
index 6d3d2a685..74bef6313 100644
--- a/common/download.go
+++ b/common/download.go
@@ -290,6 +290,8 @@ func (d *HTTPDownloader) Download(dst *os.File, src *url.URL) error {
 				}
 			}
 		}
+	} else if err != nil || (resp.StatusCode >= 400 && resp.StatusCode < 600) {
+		return fmt.Errorf("%s", resp.Status)
 	}
 
 	// Set the request to GET now, and redo the query to download
@@ -298,6 +300,8 @@ func (d *HTTPDownloader) Download(dst *os.File, src *url.URL) error {
 	resp, err = httpClient.Do(req)
 	if err != nil {
 		return err
+	} else if err != nil || (resp.StatusCode >= 400 && resp.StatusCode < 600) {
+		return fmt.Errorf("%s", resp.Status)
 	}
 
 	d.total = d.current + uint64(resp.ContentLength)
diff --git a/common/download_test.go b/common/download_test.go
index beac9cbab..217b49cdb 100644
--- a/common/download_test.go
+++ b/common/download_test.go
@@ -170,6 +170,24 @@ func TestDownloadClient_checksumNoDownload(t *testing.T) {
 	}
 }
 
+func TestDownloadClient_notFound(t *testing.T) {
+	tf, _ := ioutil.TempFile("", "packer")
+	tf.Close()
+	os.Remove(tf.Name())
+
+	ts := httptest.NewServer(http.FileServer(http.Dir("./test-fixtures/root")))
+	defer ts.Close()
+
+	client := NewDownloadClient(&DownloadConfig{
+		Url:        ts.URL + "/not-found.txt",
+		TargetPath: tf.Name(),
+	})
+
+	if _, err := client.Get(); err == nil {
+		t.Fatal("should error")
+	}
+}
+
 func TestDownloadClient_resume(t *testing.T) {
 	tf, _ := ioutil.TempFile("", "packer")
 	tf.Write([]byte("w"))