Fix APK's Content-Type header

Author: szatyinadam

modules/base/tool.go

@@ -332,6 +332,11 @@ func IsAudioFile(data []byte) bool {
 	return strings.Contains(DetectContentType(data), "audio/")
 }
 
+// IsZipFile detects if data is a zip format
+func IsZipFile(data []byte) bool {
+	return strings.Contains(DetectContentType(data), "application/zip")
+}
+
 // EntryIcon returns the octicon class for displaying files/directories
 func EntryIcon(entry *git.TreeEntry) string {
 	switch {

modules/base/tool_test.go

@@ -329,6 +329,12 @@ func TestIsAudioFile(t *testing.T) {
 	assert.False(t, IsAudioFile([]byte("plain text")))
 }
 
+func TestIsZipFile(t *testing.T) {
+	zip, _ := base64.StdEncoding.DecodeString("UEsDBAoAAAAAANG0d1IAAAAAAAAAAAAAAAAIABwAdGV4dC50eHRVVAkAA9pfWmDaX1pgdXgLAAEE9QEAAAQUAAAAUEsBAh4DCgAAAAAA0bR3UgAAAAAAAAAAAAAAAAgAGAAAAAAAAAAAAKSBAAAAAHRleHQudHh0VVQFAAPaX1pgdXgLAAEE9QEAAAQUAAAAUEsFBgAAAAABAAEATgAAAEIAAAAAAA==")
+	assert.True(t, IsZipFile(zip))
+	assert.False(t, IsZipFile([]byte("plain text")))
+}
+
 // TODO: Test EntryIcon
 
 func TestSetupGiteaRoot(t *testing.T) {

routers/repo/download.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io"
 	"path"
+	"path/filepath"
 	"strings"
 
 	"code.gitea.io/gitea/modules/base"
@@ -61,6 +62,9 @@ func ServeData(ctx *context.Context, name string, size int64, reader io.Reader)
 	} else {
 		ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, name))
 		ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition")
+		if filepath.Ext(name) == ".apk" && base.IsZipFile(buf) {
+			ctx.Resp.Header().Set("Content-Type", "application/vnd.android.package-archive")
+		}
 	}
 
 	_, err = ctx.Resp.Write(buf)