Set AllowedHeaders on API CORS handler

Set AllowedHeaders on API CORS handler and add missing Access-Control-Expose-Headers to pull API. Fix go-gitea#16100 Signed-off-by: Andrew Thornton <[email protected]>
zeripath · Jul 23, 2021 · 5656138 · 5656138
1 parent 9421bfe
commit 5656138
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
@@ -569,6 +569,7 @@ func Routes() *web.Route {
 			//setting.CORSConfig.AllowSubdomain // FIXME: the cors middleware needs allowSubdomain option
 			AllowedMethods:   setting.CORSConfig.Methods,
 			AllowCredentials: setting.CORSConfig.AllowCredentials,
+			AllowedHeaders:   []string{"Authorization", "X-CSRFToken", "X-Gitea-OTP"},
 			MaxAge:           int(setting.CORSConfig.MaxAge.Seconds()),
 		}))
 	}

diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
@@ -1254,5 +1254,6 @@ func GetPullRequestCommits(ctx *context.APIContext) {
 	ctx.Header().Set("X-Total-Count", fmt.Sprintf("%d", totalNumberOfCommits))
 	ctx.Header().Set("X-PageCount", strconv.Itoa(totalNumberOfPages))
 	ctx.Header().Set("X-HasMore", strconv.FormatBool(listOptions.Page < totalNumberOfPages))
+	ctx.Header().Set("Access-Control-Expose-Headers", "X-Total-Count, X-PerPage, X-Total, X-PageCount, X-HasMore, Link")
 	ctx.JSON(http.StatusOK, &apiCommits)
 }