ipfs get: set correct content-type on resp

rht · rht · commit 1a7e100056a5 · 2015-11-24T16:48:08.000+07:00
License: MIT
Signed-off-by: rht &lt;rhtbot@gmail.com&gt;
diff --git a/commands/http/handler.go b/commands/http/handler.go
@@ -61,6 +61,8 @@ const (
 var mimeTypes = map[string]string{
 	cmds.JSON: "application/json",
 	cmds.XML:  "application/xml",
+	cmds.Tar:  "application/x-tar",
+	cmds.Gzip: "application/gzip", // http://tools.ietf.org/html/rfc6713
 	cmds.Text: "text/plain",
 }
 
@@ -232,7 +234,9 @@ func sendResponse(w http.ResponseWriter, r *http.Request, res cmds.Response, req
 	if _, ok := res.Output().(io.Reader); ok {
 		// set streams output type to text to avoid issues with browsers rendering
 		// html pages on priveleged api ports
-		mime = "text/plain"
+		if mime != mimeTypes[cmds.Tar] && mime != mimeTypes[cmds.Gzip] {
+			mime = mimeTypes[cmds.Text]
+		}
 		h.Set(streamHeader, "1")
 	}
 
diff --git a/commands/response.go b/commands/response.go
@@ -38,6 +38,8 @@ type EncodingType string
 const (
 	JSON = "json"
 	XML  = "xml"
+	Tar  = "tar"
+	Gzip = "gzip"
 	Text = "text"
 	// TODO: support more encoding types
 )
diff --git a/core/commands/get.go b/core/commands/get.go
@@ -69,6 +69,12 @@ may also specify the level of compression by specifying '-l=<1-9>'.
 			return
 		}
 
+		// set the correct mime type for tar stream
+		req.SetOption(cmds.EncShort, cmds.Tar)
+		if cmplvl != gzip.NoCompression {
+			req.SetOption(cmds.EncShort, cmds.Gzip)
+		}
+
 		archive, _, _ := req.Option("archive").Bool()
 		reader, err := uarchive.DagArchive(ctx, dn, p.String(), node.DAG, archive, cmplvl)
 		if err != nil {
diff --git a/test/sharness/t0090-get.sh b/test/sharness/t0090-get.sh
@@ -119,6 +119,9 @@ test_get_cmd
 # should work online
 test_launch_ipfs_daemon
 test_get_cmd
+test_expect_success "ipfs get response has the correct content-type" '
+    curl -I "http://localhost:$PORT_API/api/v0/get?arg=$HASH" | grep "^Content-Type: application/x-tar"
+'
 test_kill_ipfs_daemon
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ type EncodingType string`
`38`	`38`	`const (`
`39`	`39`	`JSON = "json"`
`40`	`40`	`XML = "xml"`
	`41`	`+ Tar = "tar"`
	`42`	`+ Gzip = "gzip"`
`41`	`43`	`Text = "text"`
`42`	`44`	`// TODO: support more encoding types`
`43`	`45`	`)`