IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

API: Cache-Control (browser caching) for datasource resources: part 2 (#63060)

Browse Source 
* Check if header string contains "public" or "private" target values
This commit is contained in:
Galen Kistler
2023-02-27 14:55:22 -06:00
committed by GitHub
parent 32aa0ad272
commit e58bef15ac
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/middleware/middleware.go
View File

@@ -109,10 +109,11 @@ func allowCacheControl(rw web.ResponseWriter) bool {
foundPrivate := false
foundPublic := false
for _, val := range ccHeaderValues {
if val == "private" {
strings.Contains(val, "private")
if strings.Contains(val, "private") {
foundPrivate = true
}
if val == "public" {
if strings.Contains(val, "public") {
foundPublic = true
}
}

6
pkg/middleware/middleware_test.go
View File

@@ -158,15 +158,15 @@ func TestMiddlewareContext(t *testing.T) {
middlewareScenario(t, "middleware should pass cache-control on resources with private cache control", func(t *testing.T, sc *scenarioContext) {
sc = sc.fakeReq("GET", "/api/datasources/1/resources/foo")
sc.resp.Header().Add("Cache-Control", "private")
sc.resp.Header().Add("Cache-Control", "private, max-age=86400")
sc.resp.Header().Add("X-Grafana-Cache", "true")
sc.exec()
assert.Equal(t, "private", sc.resp.Header().Get("Cache-Control"))
assert.Equal(t, "private, max-age=86400", sc.resp.Header().Get("Cache-Control"))
})
middlewareScenario(t, "middleware should not pass cache-control on resources with public cache control", func(t *testing.T, sc *scenarioContext) {
sc = sc.fakeReq("GET", "/api/datasources/1/resources/foo")
sc.resp.Header().Add("Cache-Control", "public")
sc.resp.Header().Add("Cache-Control", "public, max-age=86400, private")
sc.resp.Header().Add("X-Grafana-Cache", "true")
sc.exec()
assert.Equal(t, noStore, sc.resp.Header().Get("Cache-Control"))