Ensure Cache-Control is verified

aw · Apr 28, 2015 · 7545c40 · 7545c40
1 parent 24094d3
commit 7545c40
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.14 (2015-04-28)
+
+  * Ensure Cache-Control is verified
+
 ## 0.1.13 (2015-04-28)
 
   * Don't cache the Host header

diff --git a/cache_rules.gemspec b/cache_rules.gemspec
@@ -6,7 +6,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'cache_rules'
-  s.version     = '0.1.13'
+  s.version     = '0.1.14'
 
   s.date        = Date.today.to_s
 

diff --git a/lib/validations.rb b/lib/validations.rb
@@ -90,11 +90,13 @@ def validate_no_cache?(headers)
 
     # source: https://tools.ietf.org/html/rfc7234#section-5.2.2.2
     # source: https://tools.ietf.org/html/rfc7234#section-3.2
-    return 1 if (( cached = cached_headers['Cache-Control'] )) &&
-      helper_no_cache.call(cached_headers)                               ||
-        (cached['no-cache'] && cached['no-cache']['quoted_string'].nil?) ||
-        (cached['s-maxage'] && cached['s-maxage']['token'].to_s == "0")  ||
-        (cached['max-age'] && cached['max-age']['token'].to_s   == "0")
+    if cached_headers['Cache-Control']
+      return 1 if (( cached = cached_headers['Cache-Control'] )) &&
+        helper_no_cache.call(cached_headers)                               ||
+          (cached['no-cache'] && cached['no-cache']['quoted_string'].nil?) ||
+          (cached['s-maxage'] && cached['s-maxage']['token'].to_s == "0")  ||
+          (cached['max-age'] && cached['max-age']['token'].to_s   == "0")
+    end
 
     # source: https://tools.ietf.org/html/rfc7234#section-5.4
     # Legacy support for HTTP/1.0 Pragma header