Remove ProxyHandler#whitelisted_host? in favor of just using ProxyHan…

…dler#whitelisted_url?
ibroadfo · Mar 12, 2014 · 84a682f · 84a682f
1 parent c41e757
commit 84a682f
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/lib/billy/handlers/proxy_handler.rb b/lib/billy/handlers/proxy_handler.rb
@@ -88,12 +88,10 @@ def cacheable?(url, headers, status)
       cacheable_headers?(headers) && cacheable_status?(status) && (!whitelisted_url?(url) || blacklisted_path?(url.path))
     end
 
-    def whitelisted_host?(host)
-      Billy.config.whitelist.include?(host)
-    end
-
     def whitelisted_url?(url)
-      whitelisted_host?(url.host) || whitelisted_host?("#{url.host}:#{url.port}")
+      !Billy.config.whitelist.index do |v|
+        v =~ /^#{url.host}(?::#{url.port})?$/
+      end.nil?
     end
 
     def blacklisted_path?(path)