Add Access-Control-Expose-Headers (#12446)

zeripath · silverwind · web-flow · commit 2ef318e6f1d0 · 2020-08-13T18:18:18.000+01:00
Fix #12424 Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: silverwind <me@silverwind.io>
diff --git a/modules/context/context.go b/modules/context/context.go
@@ -222,6 +222,7 @@ func (ctx *Context) ServeContent(name string, r io.ReadSeeker, params ...interfa
 	ctx.Resp.Header().Set("Expires", "0")
 	ctx.Resp.Header().Set("Cache-Control", "must-revalidate")
 	ctx.Resp.Header().Set("Pragma", "public")
+	ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition")
 	http.ServeContent(ctx.Resp, ctx.Req.Request, name, modtime, r)
 }
 
diff --git a/modules/lfs/server.go b/modules/lfs/server.go
@@ -183,6 +183,7 @@ func getContentHandler(ctx *context.Context) {
 			}
 
 			ctx.Resp.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", fromByte, toByte, meta.Size-fromByte))
+			ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Range")
 		}
 	}
 
@@ -204,6 +205,7 @@ func getContentHandler(ctx *context.Context) {
 		decodedFilename, err := base64.RawURLEncoding.DecodeString(filename)
 		if err == nil {
 			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename=\""+string(decodedFilename)+"\"")
+			ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition")
 		}
 	}
 
diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go
@@ -121,5 +121,6 @@ func GetAllOrgs(ctx *context.APIContext) {
 
 	ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 	ctx.JSON(http.StatusOK, &orgs)
 }
diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go
@@ -370,5 +370,6 @@ func GetAllUsers(ctx *context.APIContext) {
 
 	ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 	ctx.JSON(http.StatusOK, &results)
 }
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
@@ -135,6 +135,7 @@ func GetAll(ctx *context.APIContext) {
 
 	ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 	ctx.JSON(http.StatusOK, &orgs)
 }
 
diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go
@@ -686,6 +686,7 @@ func SearchTeam(ctx *context.APIContext) {
 
 	ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"ok":   true,
 		"data": apiTeams,
diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go
@@ -211,6 +211,7 @@ func GetAllCommits(ctx *context.APIContext) {
 
 	ctx.SetLinkHeader(int(commitsCountTotal), listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", commitsCountTotal))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, X-PerPage, X-Total, X-PageCount, X-HasMore, Link")
 
 	ctx.JSON(http.StatusOK, &apiCommits)
 }
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
@@ -173,6 +173,8 @@ func SearchIssues(ctx *context.APIContext) {
 	}
 
 	ctx.SetLinkHeader(issueCount, setting.UI.IssuePagingNum)
+	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", issueCount))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 	ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues))
 }
 
@@ -322,6 +324,7 @@ func ListIssues(ctx *context.APIContext) {
 
 	ctx.SetLinkHeader(ctx.Repo.Repository.NumIssues, listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", ctx.Repo.Repository.NumIssues))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 
 	ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues))
 }
diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
@@ -115,6 +115,7 @@ func ListPullRequests(ctx *context.APIContext, form api.ListPullRequestsOptions)
 
 	ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 	ctx.JSON(http.StatusOK, &apiPrs)
 }
 
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
@@ -222,6 +222,7 @@ func Search(ctx *context.APIContext) {
 
 	ctx.SetLinkHeader(int(count), opts.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", count))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 	ctx.JSON(http.StatusOK, api.SearchResults{
 		OK:   true,
 		Data: results,
diff --git a/routers/api/v1/repo/status.go b/routers/api/v1/repo/status.go
@@ -227,6 +227,7 @@ func getCommitStatuses(ctx *context.APIContext, sha string) {
 
 	ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 
 	ctx.JSON(http.StatusOK, apiStatuses)
 }
diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go
@@ -43,6 +43,7 @@ func listUserRepos(ctx *context.APIContext, u *models.User, private bool) {
 
 	ctx.SetLinkHeader(int(count), opts.PageSize)
 	ctx.Header().Set("X-Total-Count", strconv.FormatInt(count, 10))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 	ctx.JSON(http.StatusOK, &apiRepos)
 }
 
@@ -129,6 +130,7 @@ func ListMyRepos(ctx *context.APIContext) {
 
 	ctx.SetLinkHeader(int(count), opts.ListOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", strconv.FormatInt(count, 10))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 	ctx.JSON(http.StatusOK, &results)
 }
 
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
@@ -82,6 +82,7 @@ func Search(ctx *context.APIContext) {
 
 	ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")
 
 	ctx.JSON(http.StatusOK, map[string]interface{}{
 		"ok":   true,
diff --git a/routers/repo/download.go b/routers/repo/download.go
@@ -42,8 +42,10 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error {
 		ctx.Resp.Header().Set("Content-Type", "text/plain; charset="+strings.ToLower(cs))
 	} else if base.IsImageFile(buf) || base.IsPDFFile(buf) {
 		ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, name))
+		ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition")
 	} else {
 		ctx.Resp.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, name))
+		ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition")
 	}
 
 	_, err := ctx.Resp.Write(buf)

Original file line number	Diff line number	Diff line change
`@@ -222,6 +222,7 @@ func (ctx *Context) ServeContent(name string, r io.ReadSeeker, params ...interfa`
`222`	`222`	`ctx.Resp.Header().Set("Expires", "0")`
`223`	`223`	`ctx.Resp.Header().Set("Cache-Control", "must-revalidate")`
`224`	`224`	`ctx.Resp.Header().Set("Pragma", "public")`
	`225`	`+ ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition")`
`225`	`226`	`http.ServeContent(ctx.Resp, ctx.Req.Request, name, modtime, r)`
`226`	`227`	`}`
`227`	`228`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ func getContentHandler(ctx *context.Context) {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`ctx.Resp.Header().Set("Content-Range", fmt.Sprintf("bytes %d-%d/%d", fromByte, toByte, meta.Size-fromByte))`
	`186`	`+ ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Range")`
`186`	`187`	`}`
`187`	`188`	`}`
`188`	`189`
`@@ -204,6 +205,7 @@ func getContentHandler(ctx *context.Context) {`
`204`	`205`	`decodedFilename, err := base64.RawURLEncoding.DecodeString(filename)`
`205`	`206`	`if err == nil {`
`206`	`207`	`ctx.Resp.Header().Set("Content-Disposition", "attachment; filename=\""+string(decodedFilename)+"\"")`
	`208`	`+ ctx.Resp.Header().Set("Access-Control-Expose-Headers", "Content-Disposition")`
`207`	`209`	`}`
`208`	`210`	`}`
`209`	`211`
Original file line number	Diff line number	Diff line change
`@@ -121,5 +121,6 @@ func GetAllOrgs(ctx *context.APIContext) {`
`121`	`121`
`122`	`122`	`ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)`
`123`	`123`	`ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))`
	`124`	`+ ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")`
`124`	`125`	`ctx.JSON(http.StatusOK, &orgs)`
`125`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -370,5 +370,6 @@ func GetAllUsers(ctx *context.APIContext) {`
`370`	`370`
`371`	`371`	`ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)`
`372`	`372`	`ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))`
	`373`	`+ ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")`
`373`	`374`	`ctx.JSON(http.StatusOK, &results)`
`374`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ func GetAll(ctx *context.APIContext) {`
`135`	`135`
`136`	`136`	`ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)`
`137`	`137`	`ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))`
	`138`	`+ ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")`
`138`	`139`	`ctx.JSON(http.StatusOK, &orgs)`
`139`	`140`	`}`
`140`	`141`
Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,7 @@ func GetAllCommits(ctx *context.APIContext) {`
`211`	`211`
`212`	`212`	`ctx.SetLinkHeader(int(commitsCountTotal), listOptions.PageSize)`
`213`	`213`	`ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", commitsCountTotal))`
	`214`	`+ ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, X-PerPage, X-Total, X-PageCount, X-HasMore, Link")`
`214`	`215`
`215`	`216`	`ctx.JSON(http.StatusOK, &apiCommits)`
`216`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,8 @@ func SearchIssues(ctx *context.APIContext) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`ctx.SetLinkHeader(issueCount, setting.UI.IssuePagingNum)`
	`176`	`+ ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", issueCount))`
	`177`	`+ ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")`
`176`	`178`	`ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues))`
`177`	`179`	`}`
`178`	`180`
`@@ -322,6 +324,7 @@ func ListIssues(ctx *context.APIContext) {`
`322`	`324`
`323`	`325`	`ctx.SetLinkHeader(ctx.Repo.Repository.NumIssues, listOptions.PageSize)`
`324`	`326`	`ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", ctx.Repo.Repository.NumIssues))`
	`327`	`+ ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")`
`325`	`328`
`326`	`329`	`ctx.JSON(http.StatusOK, convert.ToAPIIssueList(issues))`
`327`	`330`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ func ListPullRequests(ctx *context.APIContext, form api.ListPullRequestsOptions)`
`115`	`115`
`116`	`116`	`ctx.SetLinkHeader(int(maxResults), listOptions.PageSize)`
`117`	`117`	`ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", maxResults))`
	`118`	`+ ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, Link")`
`118`	`119`	`ctx.JSON(http.StatusOK, &apiPrs)`
`119`	`120`	`}`
`120`	`121`