From 93b0eee0dff2849081f16b47f4693fd8b25115bc Mon Sep 17 00:00:00 2001
From: Idan Elhalwani <idan@elhalwani.com>
Date: Thu, 7 May 2020 12:11:24 +0300
Subject: [PATCH] Set DisableCompression to true to disable unwanted httpclient
 transformation

Signed-off-by: Idan Elhalwani <idan@elhalwani.com>
---
 pkg/getter/httpgetter.go            |  29 +++++++++------------
 pkg/getter/httpgetter_test.go       |  39 ++++++++++++++++++++++++++++
 pkg/getter/testdata/empty-0.0.1.tgz | Bin 0 -> 130 bytes
 3 files changed, 51 insertions(+), 17 deletions(-)
 create mode 100644 pkg/getter/testdata/empty-0.0.1.tgz

diff --git a/pkg/getter/httpgetter.go b/pkg/getter/httpgetter.go
index 695a87743..46c817a9c 100644
--- a/pkg/getter/httpgetter.go
+++ b/pkg/getter/httpgetter.go
@@ -90,6 +90,10 @@ func NewHTTPGetter(options ...Option) (Getter, error) {
 }
 
 func (g *HTTPGetter) httpClient() (*http.Client, error) {
+	transport := &http.Transport{
+		DisableCompression: true,
+		Proxy: http.ProxyFromEnvironment,
+	}
 	if (g.opts.certFile != "" && g.opts.keyFile != "") || g.opts.caFile != "" {
 		tlsConf, err := tlsutil.NewClientTLS(g.opts.certFile, g.opts.keyFile, g.opts.caFile)
 		if err != nil {
@@ -103,28 +107,19 @@ func (g *HTTPGetter) httpClient() (*http.Client, error) {
 		}
 		tlsConf.ServerName = sni
 
-		client := &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: tlsConf,
-				Proxy:           http.ProxyFromEnvironment,
-			},
-		}
-
-		return client, nil
+		transport.TLSClientConfig = tlsConf
 	}
 
 	if g.opts.insecureSkipVerifyTLS {
-		client := &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					InsecureSkipVerify: true,
-				},
-				Proxy: http.ProxyFromEnvironment,
-			},
+		transport.TLSClientConfig = &tls.Config{
+			InsecureSkipVerify: true,
 		}
 
-		return client, nil
 	}
 
-	return http.DefaultClient, nil
+	client := &http.Client{
+		Transport: transport,
+	}
+
+	return client, nil
 }
diff --git a/pkg/getter/httpgetter_test.go b/pkg/getter/httpgetter_test.go
index 4d7ada852..0e157eccd 100644
--- a/pkg/getter/httpgetter_test.go
+++ b/pkg/getter/httpgetter_test.go
@@ -17,10 +17,13 @@ package getter
 
 import (
 	"fmt"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"testing"
 
@@ -248,3 +251,39 @@ func TestDownloadInsecureSkipTLSVerify(t *testing.T) {
 	}
 
 }
+
+func TestHTTPGetterTarDownload(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		f, _ := os.Open("testdata/empty-0.0.1.tgz")
+		defer f.Close()
+
+		b := make([]byte, 512)
+		f.Read(b)
+		//Get the file size
+		FileStat, _ := f.Stat()
+		FileSize := strconv.FormatInt(FileStat.Size(), 10)
+
+		//Simulating improper header values from bitbucket
+		w.Header().Set("Content-Type", "application/x-tar")
+		w.Header().Set("Content-Encoding", "gzip")
+		w.Header().Set("Content-Length", FileSize)
+
+		f.Seek(0, 0)
+		io.Copy(w, f)
+	}))
+
+	defer srv.Close()
+
+	g, err := NewHTTPGetter(WithURL(srv.URL))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	data, _ := g.Get(srv.URL)
+	mimeType := http.DetectContentType(data.Bytes())
+
+	expectedMimeType := "application/x-gzip"
+	if mimeType != expectedMimeType {
+		t.Fatalf("Expected response with MIME type %s, but got %s", expectedMimeType, mimeType)
+	}
+}
\ No newline at end of file
diff --git a/pkg/getter/testdata/empty-0.0.1.tgz b/pkg/getter/testdata/empty-0.0.1.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..6c4c3d20597f344826ec27c18aeca1ae585392b7
GIT binary patch
literal 130
zcmb2|=3v-$Wpf+@^V<uyd`%7lYyo|n%nKqDEc-iE#9V|}_U`);?%}9<xBBdK&t*T-
z{O-OjnE89(jldqm=Q8tlMm(?9SbgV8?&P4^PCCKsZYzaUPy01%{pG@#RXv9da^K!P
hAG`hQ((95}pRW-47cIm919i3x8x7W~GH5U`002ANImrM3

literal 0
HcmV?d00001