Add support for missing Cache-Control directives (#8619)

no-cache, only-if-cached and no-store directives are
being enforced in this PR.
This commit is contained in:
poornas
2019-12-06 18:19:36 -08:00
committed by Nitish Tiwari
parent 476111968a
commit be0c8b1ec0
2 changed files with 40 additions and 6 deletions

View File

@@ -29,11 +29,14 @@ import (
)
type cacheControl struct {
expiry time.Time
maxAge int
sMaxAge int
minFresh int
maxStale int
expiry time.Time
maxAge int
sMaxAge int
minFresh int
maxStale int
noStore bool
onlyIfCached bool
noCache bool
}
func (c cacheControl) isEmpty() bool {
@@ -45,6 +48,19 @@ func (c cacheControl) isStale(modTime time.Time) bool {
if c.isEmpty() {
return false
}
// response will never be stale if only-if-cached is set
if c.onlyIfCached {
return false
}
// Cache-Control value no-store indicates never cache
if c.noStore {
return true
}
// Cache-Control value no-cache indicates cache entry needs to be revalidated before
// serving from cache
if c.noCache {
return true
}
now := time.Now()
if c.sMaxAge > 0 && c.sMaxAge < int(now.Sub(modTime).Seconds()) {
@@ -88,6 +104,19 @@ func cacheControlOpts(o ObjectInfo) (c cacheControl) {
vals := strings.Split(headerVal, ",")
for _, val := range vals {
val = strings.TrimSpace(val)
if val == "no-store" {
c.noStore = true
continue
}
if val == "only-if-cached" {
c.onlyIfCached = true
continue
}
if val == "no-cache" {
c.noCache = true
continue
}
p := strings.Split(val, "=")
if len(p) != 2 {