secure_headers 1.1.1 → 2.0.0

data/spec/lib/secure_headers/headers/content_security_policy_spec.rb

@@ -4,12 +4,11 @@ module SecureHeaders
   describe ContentSecurityPolicy do
     let(:default_opts) do
       {
-        :disable_chrome_extension => true,
         :disable_fill_missing => true,
-        :default_src => 'https://*',
+        :default_src => 'https:',
         :report_uri => '/csp_report',
-        :script_src => 'inline eval https://* data:',
-        :style_src => "inline https://* about:"
+        :script_src => 'inline eval https: data:',
+        :style_src => "inline https: about:"
       }
     end
 
@@ -30,44 +29,41 @@ module SecureHeaders
 
     describe "#name" do
       context "when supplying options to override request" do
-        specify { ContentSecurityPolicy.new(default_opts, :ua => IE).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(default_opts, :ua => FIREFOX).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(default_opts, :ua => FIREFOX_23).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(default_opts, :ua => CHROME).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(default_opts, :ua => CHROME_25).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :ua => IE).name).to eq(HEADER_NAME + "-Report-Only")}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :ua => FIREFOX).name).to eq(HEADER_NAME + "-Report-Only")}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :ua => FIREFOX_23).name).to eq(HEADER_NAME + "-Report-Only")}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :ua => CHROME).name).to eq(HEADER_NAME + "-Report-Only")}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :ua => CHROME_25).name).to eq(HEADER_NAME + "-Report-Only")}
       end
 
       context "when in report-only mode" do
-        specify { ContentSecurityPolicy.new(default_opts, :request => request_for(IE)).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(default_opts, :request => request_for(FIREFOX)).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(default_opts, :request => request_for(FIREFOX_23)).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(default_opts, :request => request_for(CHROME)).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(default_opts, :request => request_for(CHROME_25)).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :request => request_for(IE)).name).to eq(HEADER_NAME + "-Report-Only")}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :request => request_for(FIREFOX)).name).to eq(HEADER_NAME + "-Report-Only")}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :request => request_for(FIREFOX_23)).name).to eq(HEADER_NAME + "-Report-Only")}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :request => request_for(CHROME)).name).to eq(HEADER_NAME + "-Report-Only")}
+        specify { expect(ContentSecurityPolicy.new(default_opts, :request => request_for(CHROME_25)).name).to eq(HEADER_NAME + "-Report-Only")}
       end
 
       context "when in enforce mode" do
         let(:opts) { default_opts.merge(:enforce => true)}
 
-        specify { ContentSecurityPolicy.new(opts, :request => request_for(IE)).name.should == STANDARD_HEADER_NAME}
-        specify { ContentSecurityPolicy.new(opts, :request => request_for(FIREFOX)).name.should == STANDARD_HEADER_NAME}
-        specify { ContentSecurityPolicy.new(opts, :request => request_for(FIREFOX_23)).name.should == STANDARD_HEADER_NAME}
-        specify { ContentSecurityPolicy.new(opts, :request => request_for(CHROME)).name.should == STANDARD_HEADER_NAME}
-        specify { ContentSecurityPolicy.new(opts, :request => request_for(CHROME_25)).name.should == STANDARD_HEADER_NAME}
+        specify { expect(ContentSecurityPolicy.new(opts, :request => request_for(IE)).name).to eq(HEADER_NAME)}
+        specify { expect(ContentSecurityPolicy.new(opts, :request => request_for(FIREFOX)).name).to eq(HEADER_NAME)}
+        specify { expect(ContentSecurityPolicy.new(opts, :request => request_for(FIREFOX_23)).name).to eq(HEADER_NAME)}
+        specify { expect(ContentSecurityPolicy.new(opts, :request => request_for(CHROME)).name).to eq(HEADER_NAME)}
+        specify { expect(ContentSecurityPolicy.new(opts, :request => request_for(CHROME_25)).name).to eq(HEADER_NAME)}
       end
+    end
 
-      context "when in experimental mode" do
-        let(:opts) { default_opts.merge(:enforce => true).merge(:experimental => {})}
-        specify { ContentSecurityPolicy.new(opts, {:experimental => true, :request => request_for(IE)}).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(opts, {:experimental => true, :request => request_for(FIREFOX)}).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(opts, {:experimental => true, :request => request_for(FIREFOX_23)}).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(opts, {:experimental => true, :request => request_for(CHROME)}).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
-        specify { ContentSecurityPolicy.new(opts, {:experimental => true, :request => request_for(CHROME_25)}).name.should == STANDARD_HEADER_NAME + "-Report-Only"}
+    context "when using hash sources" do
+      it "adds hashes and unsafe-inline to the script-src" do
+        policy = ContentSecurityPolicy.new(default_opts.merge(:script_hashes => ['sha256-abc123']))
+        expect(policy.value).to match /script-src[^;]*'sha256-abc123'/
       end
     end
 
     describe "#normalize_csp_options" do
       before(:each) do
-        default_opts.delete(:disable_chrome_extension)
         default_opts.delete(:disable_fill_missing)
         default_opts[:script_src] << ' self none'
         @opts = default_opts
@@ -76,115 +72,41 @@ module SecureHeaders
       context "Content-Security-Policy" do
         it "converts the script values to their equivilents" do
           csp = ContentSecurityPolicy.new(@opts, :request => request_for(CHROME))
-          csp.value.should include("script-src 'unsafe-inline' 'unsafe-eval' https://* data: 'self' 'none'")
-        end
-      end
-    end
-
-    describe "#same_origin?" do
-      let(:origin) {"https://example.com:123"}
-
-      it "matches when host, scheme, and port match" do
-        csp = ContentSecurityPolicy.new({:report_uri => 'https://example.com'}, :request => request_for(FIREFOX, "https://example.com"))
-        csp.send(:same_origin?).should be_true
-
-        csp = ContentSecurityPolicy.new({:report_uri => 'https://example.com'}, :request => request_for(FIREFOX, "https://example.com:443"))
-        csp.send(:same_origin?).should be_true
-
-        csp = ContentSecurityPolicy.new({:report_uri => 'https://example.com:123'}, :request => request_for(FIREFOX, "https://example.com:123"))
-        csp.send(:same_origin?).should be_true
-
-        csp = ContentSecurityPolicy.new({:report_uri => 'http://example.com'}, :request => request_for(FIREFOX, "http://example.com"))
-        csp.send(:same_origin?).should be_true
-
-        csp = ContentSecurityPolicy.new({:report_uri => 'http://example.com:80'}, :request => request_for(FIREFOX, "http://example.com"))
-        csp.send(:same_origin?).should be_true
-
-        csp = ContentSecurityPolicy.new({:report_uri => 'http://example.com'}, :request => request_for(FIREFOX, "http://example.com:80"))
-        csp.send(:same_origin?).should be_true
-      end
-
-      it "does not match port mismatches" do
-        csp = ContentSecurityPolicy.new({:report_uri => 'http://example.com'}, :request => request_for(FIREFOX, "http://example.com:81"))
-        csp.send(:same_origin?).should be_false
-      end
-
-      it "does not match host mismatches" do
-        csp = ContentSecurityPolicy.new({:report_uri => 'http://twitter.com'}, :request => request_for(FIREFOX, "http://example.com"))
-        csp.send(:same_origin?).should be_false
-      end
-
-      it "does not match host mismatches because of subdomains" do
-        csp = ContentSecurityPolicy.new({:report_uri => 'http://example.com'}, :request => request_for(FIREFOX, "http://sub.example.com"))
-        csp.send(:same_origin?).should be_false
-      end
-
-      it "does not match scheme mismatches" do
-        csp = ContentSecurityPolicy.new({:report_uri => 'https://example.com'}, :request => request_for(FIREFOX, "ftp://example.com"))
-        csp.send(:same_origin?).should be_false
-      end
-
-      it "does not match on substring collisions" do
-        csp = ContentSecurityPolicy.new({:report_uri => 'https://example.com'}, :request => request_for(FIREFOX, "https://anotherexample.com"))
-        csp.send(:same_origin?).should be_false
-      end
-    end
-
-    describe "#normalize_reporting_endpoint" do
-      let(:opts) {{:report_uri => 'https://example.com/csp', :forward_endpoint => anything}}
-
-      context "when using firefox" do
-        it "updates the report-uri when posting to a different host" do
-          csp = ContentSecurityPolicy.new(opts, :request => request_for(FIREFOX, "https://anexample.com"))
-          csp.report_uri.should == FF_CSP_ENDPOINT
+          expect(csp.value).to include("script-src 'unsafe-inline' 'unsafe-eval' https: data: 'self' 'none'")
         end
 
-        it "doesn't change report-uri if a path supplied" do
-          csp = ContentSecurityPolicy.new({:report_uri => "/csp_reports"}, :request => request_for(FIREFOX, "https://anexample.com"))
-          csp.report_uri.should == "/csp_reports"
+        it "adds a @enforce and @app_name variables to the report uri" do
+          opts = @opts.merge(:tag_report_uri => true, :enforce => true, :app_name => lambda { 'twitter' })
+          csp = ContentSecurityPolicy.new(opts, :request => request_for(CHROME))
+          expect(csp.value).to include("/csp_report?enforce=true&app_name=twitter")
         end
 
-        it "forwards if the request_uri is set to a non-matching value" do
-          csp = ContentSecurityPolicy.new({:report_uri => "https://another.example.com", :forward_endpoint => '/somewhere'}, :ua => "Firefox", :request_uri => "https://anexample.com")
-          csp.report_uri.should == FF_CSP_ENDPOINT
+        it "does not add an empty @app_name variable to the report uri" do
+          opts = @opts.merge(:tag_report_uri => true, :enforce => true)
+          csp = ContentSecurityPolicy.new(opts, :request => request_for(CHROME))
+          expect(csp.value).to include("/csp_report?enforce=true")
         end
-      end
-
-      it "does not update the URI is the report_uri is on the same origin" do
-        opts = {:report_uri => 'https://example.com/csp', :forward_endpoint => 'https://anotherexample.com'}
-        csp = ContentSecurityPolicy.new(opts, :request => request_for(FIREFOX, "https://example.com/somewhere"))
-        csp.report_uri.should == 'https://example.com/csp'
-      end
 
-      it "does not update the report-uri when using a non-firefox browser" do
-        csp = ContentSecurityPolicy.new(opts, :request => request_for(CHROME))
-        csp.report_uri.should == 'https://example.com/csp'
-      end
-
-      context "when using a protocol-relative value for report-uri" do
-        let(:opts) {
-          {
+        it "accepts procs for report-uris" do
+          opts = {
             :default_src => 'self',
-            :report_uri => '//example.com/csp'
+            :report_uri => lambda { "http://lambda/result" }
           }
-        }
-
-        it "uses the current protocol" do
-          csp = ContentSecurityPolicy.new(opts, :request => request_for(FIREFOX, '/', :ssl => true))
-          csp.value.should =~ %r{report-uri https://example.com/csp;}
 
-          csp = ContentSecurityPolicy.new(opts, :request => request_for(FIREFOX))
-          csp.value.should =~ %r{report-uri http://example.com/csp;}
+          csp = ContentSecurityPolicy.new(opts)
+          expect(csp.value).to match("report-uri http://lambda/result")
         end
 
-        it "uses the pre-configured https protocol" do
-          csp = ContentSecurityPolicy.new(opts, :ua => "Firefox", :ssl => true)
-          csp.value.should =~ %r{report-uri https://example.com/csp;}
-        end
+        it "accepts procs for other fields" do
+          opts = {
+            :default_src => lambda { "http://lambda/result" },
+            :enforce => lambda { true },
+            :disable_fill_missing => lambda { true }
+          }
 
-        it "uses the pre-configured http protocol" do
-          csp = ContentSecurityPolicy.new(opts, :ua => "Firefox", :ssl => false)
-          csp.value.should =~ %r{report-uri http://example.com/csp;}
+          csp = ContentSecurityPolicy.new(opts)
+          expect(csp.value).to eq("default-src http://lambda/result; img-src http://lambda/result data:;")
+          expect(csp.name).to match("Content-Security-Policy")
         end
       end
     end
@@ -192,73 +114,83 @@ module SecureHeaders
     describe "#value" do
       it "raises an exception when default-src is missing" do
         csp = ContentSecurityPolicy.new({:script_src => 'anything'}, :request => request_for(CHROME))
-        lambda {
+        expect {
           csp.value
-        }.should raise_error(ContentSecurityPolicyBuildError, "Couldn't build CSP header :( Expected to find default_src directive value")
+        }.to raise_error(RuntimeError)
+      end
+
+      context "CSP level 2 directives" do
+        let(:config) { {:default_src => 'self'} }
+        ::SecureHeaders::ContentSecurityPolicy::Constants::NON_DEFAULT_SOURCES.each do |non_default_source|
+          it "supports all level 2 directives" do
+            directive_name = ::SecureHeaders::ContentSecurityPolicy.send(:symbol_to_hyphen_case, non_default_source)
+            config.merge!({ non_default_source => "value" })
+            csp = ContentSecurityPolicy.new(config, :request => request_for(CHROME))
+            expect(csp.value).to match(/#{directive_name} value;/)
+          end
+        end
       end
 
       context "auto-whitelists data: uris for img-src" do
         it "sets the value if no img-src specified" do
-          csp = ContentSecurityPolicy.new({:default_src => 'self', :disable_fill_missing => true, :disable_chrome_extension => true}, :request => request_for(CHROME))
-          csp.value.should == "default-src 'self'; img-src data:;"
+          csp = ContentSecurityPolicy.new({:default_src => 'self', :disable_fill_missing => true}, :request => request_for(CHROME))
+          expect(csp.value).to eq("default-src 'self'; img-src 'self' data:;")
         end
 
         it "appends the value if img-src is specified" do
-          csp = ContentSecurityPolicy.new({:default_src => 'self', :img_src => 'self', :disable_fill_missing => true, :disable_chrome_extension => true}, :request => request_for(CHROME))
-          csp.value.should == "default-src 'self'; img-src 'self' data:;"
+          csp = ContentSecurityPolicy.new({:default_src => 'self', :img_src => 'self', :disable_fill_missing => true}, :request => request_for(CHROME))
+          expect(csp.value).to eq("default-src 'self'; img-src 'self' data:;")
         end
       end
 
       it "fills in directives without values with default-src value" do
         options = default_opts.merge(:disable_fill_missing => false)
         csp = ContentSecurityPolicy.new(options, :request => request_for(CHROME))
-        value = "default-src https://*; connect-src https://*; font-src https://*; frame-src https://*; img-src https://* data:; media-src https://*; object-src https://*; script-src 'unsafe-inline' 'unsafe-eval' https://* data:; style-src 'unsafe-inline' https://* about:; report-uri /csp_report;"
-        csp.value.should == value
+        value = "default-src https:; connect-src https:; font-src https:; frame-src https:; img-src https: data:; media-src https:; object-src https:; script-src 'unsafe-inline' 'unsafe-eval' https: data:; style-src 'unsafe-inline' https: about:; report-uri /csp_report;"
+        expect(csp.value).to eq(value)
       end
 
       it "sends the standard csp header if an unknown browser is supplied" do
         csp = ContentSecurityPolicy.new(default_opts, :request => request_for(IE))
-        csp.value.should match "default-src"
+        expect(csp.value).to match "default-src"
       end
 
       context "Firefox" do
         it "builds a csp header for firefox" do
           csp = ContentSecurityPolicy.new(default_opts, :request => request_for(FIREFOX))
-          csp.value.should == "default-src https://*; img-src data:; script-src 'unsafe-inline' 'unsafe-eval' https://* data:; style-src 'unsafe-inline' https://* about:; report-uri /csp_report;"
+          expect(csp.value).to eq("default-src https:; img-src https: data:; script-src 'unsafe-inline' 'unsafe-eval' https: data:; style-src 'unsafe-inline' https: about:; report-uri /csp_report;")
         end
       end
 
       context "Chrome" do
         it "builds a csp header for chrome" do
           csp = ContentSecurityPolicy.new(default_opts, :request => request_for(CHROME))
-          csp.value.should == "default-src https://*; img-src data:; script-src 'unsafe-inline' 'unsafe-eval' https://* data:; style-src 'unsafe-inline' https://* about:; report-uri /csp_report;"
+          expect(csp.value).to eq("default-src https:; img-src https: data:; script-src 'unsafe-inline' 'unsafe-eval' https: data:; style-src 'unsafe-inline' https: about:; report-uri /csp_report;")
         end
+      end
 
-        it "ignores :forward_endpoint settings" do
-          csp = ContentSecurityPolicy.new(@options_with_forwarding, :request => request_for(CHROME))
-          csp.value.should =~ /report-uri #{@options_with_forwarding[:report_uri]};/
+      context "when using a nonce" do
+        it "adds a nonce and unsafe-inline to the script-src value" do
+          header = ContentSecurityPolicy.new(default_opts.merge(:script_src => "self nonce"), :request => request_for(CHROME))
+          expect(header.value).to include("script-src 'self' 'nonce-#{header.nonce}' 'unsafe-inline'")
         end
-      end
 
-      context "when supplying a experimental values" do
-        let(:options) {{
-          :disable_chrome_extension => true,
-          :disable_fill_missing => true,
-          :default_src => 'self',
-          :script_src => 'https://*',
-          :experimental => {
-            :script_src => 'self'
-          }
-        }}
+        it "adds a nonce and unsafe-inline to the style-src value" do
+          header = ContentSecurityPolicy.new(default_opts.merge(:style_src => "self nonce"), :request => request_for(CHROME))
+          expect(header.value).to include("style-src 'self' 'nonce-#{header.nonce}' 'unsafe-inline'")
+        end
 
-        it "returns the original value" do
-          header = ContentSecurityPolicy.new(options, :request => request_for(CHROME))
-          header.value.should == "default-src 'self'; img-src data:; script-src https://*;"
+        it "adds an identical nonce to the style and script-src directives" do
+          header = ContentSecurityPolicy.new(default_opts.merge(:style_src => "self nonce", :script_src => "self nonce"), :request => request_for(CHROME))
+          nonce = header.nonce
+          value = header.value
+          expect(value).to include("style-src 'self' 'nonce-#{nonce}' 'unsafe-inline'")
+          expect(value).to include("script-src 'self' 'nonce-#{nonce}' 'unsafe-inline'")
         end
 
-        it "it returns the experimental value if requested" do
-          header = ContentSecurityPolicy.new(options, {:request => request_for(CHROME), :experimental => true})
-          header.value.should_not =~ /https/
+        it "does not add 'unsafe-inline' twice" do
+          header = ContentSecurityPolicy.new(default_opts.merge(:script_src => "self nonce inline"), :request => request_for(CHROME))
+          expect(header.value).to include("script-src 'self' 'nonce-#{header.nonce}' 'unsafe-inline';")
         end
       end
 
@@ -266,93 +198,68 @@ module SecureHeaders
         let(:options) {
           default_opts.merge({
             :http_additions => {
-              :frame_src => "http://*",
-              :img_src => "http://*"
+              :frame_src => "http:",
+              :img_src => "http:"
             }
           })
         }
 
         it "adds directive values for headers on http" do
           csp = ContentSecurityPolicy.new(options, :request => request_for(CHROME))
-          csp.value.should == "default-src https://*; frame-src http://*; img-src http://* data:; script-src 'unsafe-inline' 'unsafe-eval' https://* data:; style-src 'unsafe-inline' https://* about:; report-uri /csp_report;"
+          expect(csp.value).to eq("default-src https:; frame-src http:; img-src http: data:; script-src 'unsafe-inline' 'unsafe-eval' https: data:; style-src 'unsafe-inline' https: about:; report-uri /csp_report;")
         end
 
         it "does not add the directive values if requesting https" do
           csp = ContentSecurityPolicy.new(options, :request => request_for(CHROME, '/', :ssl => true))
-          csp.value.should_not =~ /http:/
+          expect(csp.value).not_to match(/http:/)
         end
 
         it "does not add the directive values if requesting https" do
           csp = ContentSecurityPolicy.new(options, :ua => "Chrome", :ssl => true)
-          csp.value.should_not =~ /http:/
+          expect(csp.value).not_to match(/http:/)
         end
+      end
 
-        context "when supplying an experimental block" do
-          # this simulates the situation where we are enforcing that scripts
-          # only come from http[s]? depending if we're on ssl or not. The
-          # report only tag will allow scripts from self over ssl, and
-          # from a secure CDN over non-ssl
-          let(:options) {{
-            :disable_chrome_extension => true,
-            :disable_fill_missing => true,
-            :default_src => 'self',
-            :script_src => 'https://*',
-            :http_additions => {
-              :script_src => 'http://*'
-            },
-            :experimental => {
-              :script_src => 'self',
-              :http_additions => {
-                :script_src => 'https://mycdn.example.com'
-              }
-            }
-          }}
-          # for comparison purposes, if not using the experimental header this would produce
-          # "allow 'self'; script-src https://*" for https requests
-          # and
-          # "allow 'self'; script-src https://* http://*" for http requests
-
-          it "uses the value in the experimental block over SSL" do
-            csp = ContentSecurityPolicy.new(options, :experimental => true, :request => request_for(FIREFOX, '/', :ssl => true))
-            csp.value.should == "default-src 'self'; img-src data:; script-src 'self';"
-          end
-
-          it "detects the :ssl => true option" do
-            csp = ContentSecurityPolicy.new(options, :experimental => true, :ua => FIREFOX, :ssl => true)
-            csp.value.should == "default-src 'self'; img-src data:; script-src 'self';"
-          end
-
-          it "merges the values from experimental/http_additions when not over SSL" do
-            csp = ContentSecurityPolicy.new(options, :experimental => true, :request => request_for(FIREFOX))
-            csp.value.should == "default-src 'self'; img-src data:; script-src 'self' https://mycdn.example.com;"
+      describe "class methods" do
+        let(:ua) { CHROME }
+        let(:env) do
+          double.tap do |env|
+            allow(env).to receive(:[]).with('HTTP_USER_AGENT').and_return(ua)
           end
         end
-      end
-
-      context "when supplying a script nonce callback" do
-        let(:options) {
-          default_opts.merge({
-            :script_nonce => "random",
-          })
-        }
-
-        it "uses the value in the X-Webkit-CSP" do
-          csp = ContentSecurityPolicy.new(options, :request => request_for(CHROME))
-          csp.value.should match "script-nonce random;"
+        let(:request) do
+          double(
+            :ssl? => true,
+            :url => 'https://example.com',
+            :env => env
+          )
         end
 
-        it "runs a dynamic nonce generator" do
-          options[:script_nonce] = lambda { 'something' }
-          csp = ContentSecurityPolicy.new(options, :request => request_for(CHROME))
-          csp.value.should match "script-nonce something;"
+        describe ".add_to_env" do
+          let(:controller) { double }
+          let(:config) { {:default_src => 'self'} }
+          let(:options) { {:controller => controller} }
+
+          it "adds metadata to env" do
+            metadata = {
+              :config => config,
+              :options => options
+            }
+            expect(ContentSecurityPolicy).to receive(:options_from_request).and_return(options)
+            expect(env).to receive(:[]=).with(ContentSecurityPolicy::ENV_KEY, metadata)
+            ContentSecurityPolicy.add_to_env(request, controller, config)
+          end
         end
 
-        it "runs against the given controller context" do
-          fake_params = {}
-          options[:script_nonce] = lambda { params[:script_nonce] = 'something' }
-          csp = ContentSecurityPolicy.new(options, :request => request_for(CHROME), :controller => double(:params => fake_params))
-          csp.value.should match "script-nonce something;"
-          fake_params.should == {:script_nonce => 'something'}
+        describe ".options_from_request" do
+          it "extracts options from request" do
+            options = ContentSecurityPolicy.options_from_request(request)
+            expect(options).to eql({
+              :ua => ua,
+              :ssl => true,
+              :request_uri => 'https://example.com'
+            })
+          end
         end
       end
     end

data/spec/lib/secure_headers/headers/strict_transport_security_spec.rb

@@ -2,59 +2,60 @@ require 'spec_helper'
 
 module SecureHeaders
   describe StrictTransportSecurity do
-    specify{ StrictTransportSecurity.new.name.should == "Strict-Transport-Security" }
+    specify{ expect(StrictTransportSecurity.new.name).to eq("Strict-Transport-Security") }
 
     describe "#value" do
-      specify { StrictTransportSecurity.new.value.should == StrictTransportSecurity::Constants::DEFAULT_VALUE}
-      specify { StrictTransportSecurity.new("max-age=1234").value.should == "max-age=1234"}
-      specify { StrictTransportSecurity.new(:max_age => '1234').value.should == "max-age=1234"}
-      specify { StrictTransportSecurity.new(:max_age => 1234).value.should == "max-age=1234"}
-      specify { StrictTransportSecurity.new(:max_age => HSTS_MAX_AGE, :include_subdomains => true).value.should == "max-age=#{HSTS_MAX_AGE}; includeSubdomains"}
+      specify { expect(StrictTransportSecurity.new.value).to eq(StrictTransportSecurity::Constants::DEFAULT_VALUE)}
+      specify { expect(StrictTransportSecurity.new("max-age=1234").value).to eq("max-age=1234")}
+      specify { expect(StrictTransportSecurity.new(:max_age => '1234').value).to eq("max-age=1234")}
+      specify { expect(StrictTransportSecurity.new(:max_age => 1234).value).to eq("max-age=1234")}
+      specify { expect(StrictTransportSecurity.new(:max_age => HSTS_MAX_AGE, :include_subdomains => true).value).to eq("max-age=#{HSTS_MAX_AGE}; includeSubdomains")}
+      specify { expect(StrictTransportSecurity.new(:max_age => HSTS_MAX_AGE, :include_subdomains => true, :preload => true).value).to eq("max-age=#{HSTS_MAX_AGE}; includeSubdomains; preload")}
 
       context "with an invalid configuration" do
         context "with a hash argument" do
           it "should allow string values for max-age" do
-            lambda {
+            expect {
               StrictTransportSecurity.new(:max_age => '1234')
-            }.should_not raise_error
+            }.not_to raise_error
           end
 
           it "should allow integer values for max-age" do
-            lambda {
+            expect {
               StrictTransportSecurity.new(:max_age => 1234)
-            }.should_not raise_error
+            }.not_to raise_error
           end
 
           it "raises an exception with an invalid max-age" do
-            lambda {
+            expect {
               StrictTransportSecurity.new(:max_age => 'abc123')
-            }.should raise_error(STSBuildError)
+            }.to raise_error(STSBuildError)
           end
 
           it "raises an exception if max-age is not supplied" do
-            lambda {
+            expect {
               StrictTransportSecurity.new(:includeSubdomains => true)
-            }.should raise_error(STSBuildError)
+            }.to raise_error(STSBuildError)
           end
         end
 
         context "with a string argument" do
           it "raises an exception with an invalid max-age" do
-            lambda {
+            expect {
               StrictTransportSecurity.new('max-age=abc123')
-            }.should raise_error(STSBuildError)
+            }.to raise_error(STSBuildError)
           end
 
           it "raises an exception if max-age is not supplied" do
-            lambda {
+            expect {
               StrictTransportSecurity.new('includeSubdomains')
-            }.should raise_error(STSBuildError)
+            }.to raise_error(STSBuildError)
           end
 
           it "raises an exception with an invalid format" do
-            lambda {
+            expect {
               StrictTransportSecurity.new('max-age=123includeSubdomains')
-            }.should raise_error(STSBuildError)
+            }.to raise_error(STSBuildError)
           end
         end
       end

data/spec/lib/secure_headers/headers/x_content_type_options_spec.rb

@@ -1,33 +1,33 @@
 module SecureHeaders
   describe XContentTypeOptions do
-    specify{ XContentTypeOptions.new.name.should == "X-Content-Type-Options" }
+    specify{ expect(XContentTypeOptions.new.name).to eq("X-Content-Type-Options") }
 
     describe "#value" do
-      specify { XContentTypeOptions.new.value.should == XContentTypeOptions::Constants::DEFAULT_VALUE}
-      specify { XContentTypeOptions.new("nosniff").value.should == "nosniff"}
-      specify { XContentTypeOptions.new(:value => 'nosniff').value.should == "nosniff"}
+      specify { expect(XContentTypeOptions.new.value).to eq(XContentTypeOptions::Constants::DEFAULT_VALUE)}
+      specify { expect(XContentTypeOptions.new("nosniff").value).to eq("nosniff")}
+      specify { expect(XContentTypeOptions.new(:value => 'nosniff').value).to eq("nosniff")}
 
       context "invalid configuration values" do
         it "accepts nosniff" do
-          lambda {
+          expect {
             XContentTypeOptions.new("nosniff")
-          }.should_not raise_error
+          }.not_to raise_error
 
-          lambda {
+          expect {
             XContentTypeOptions.new(:value => "nosniff")
-          }.should_not raise_error
+          }.not_to raise_error
         end
 
         it "accepts nil" do
-          lambda {
+          expect {
             XContentTypeOptions.new
-          }.should_not raise_error
+          }.not_to raise_error
         end
 
         it "doesn't accept anything besides no-sniff" do
-          lambda {
+          expect {
             XContentTypeOptions.new("donkey")
-          }.should raise_error
+          }.to raise_error
         end
       end
     end

data/spec/lib/secure_headers/headers/x_download_options_spec.rb

@@ -0,0 +1,32 @@
+module SecureHeaders
+  describe XDownloadOptions do
+    specify { expect(XDownloadOptions.new.name).to eq(XDO_HEADER_NAME)}
+    specify { expect(XDownloadOptions.new.value).to eq("noopen")}
+    specify { expect(XDownloadOptions.new('noopen').value).to eq('noopen')}
+    specify { expect(XDownloadOptions.new(:value => 'noopen').value).to eq('noopen') }
+
+    context "invalid configuration values" do
+      it "accepts noopen" do
+        expect {
+          XDownloadOptions.new("noopen")
+        }.not_to raise_error
+
+        expect {
+          XDownloadOptions.new(:value => "noopen")
+        }.not_to raise_error
+      end
+
+      it "accepts nil" do
+        expect {
+          XDownloadOptions.new
+        }.not_to raise_error
+      end
+
+      it "doesn't accept anything besides noopen" do
+        expect {
+          XDownloadOptions.new("open")
+        }.to raise_error
+      end
+    end
+  end
+end