Merge pull request #1158 from alphagov/add-sri-again

Add sri again
alphagov · Oct 3, 2017 · 770a3ce · 770a3ce
2 parents 5588798 + 0f201ad
commit 770a3ce
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,6 +9,7 @@ gem 'rack_strip_client_ip', '0.0.2'
 gem 'actionpack-page_caching', '1.1.0'
 gem 'uglifier', ">= 1.3.0"
 gem 'sass-rails', "5.0.6"
+gem 'asset_bom_removal-rails', '~> 1.0.0'
 gem 'nokogiri', "~> 1.7"
 gem 'redis', "~> 3.3.3"
 gem 'govuk_publishing_components', '~> 1.10.0', require: false
@@ -40,5 +41,5 @@ end
 
 gem 'plek', '1.11.0'
 gem 'govuk_frontend_toolkit', '~> 7.0.1'
-gem 'govuk_template', '0.22.2'
+gem 'govuk_template', '0.23.0'
 gem 'gds-api-adapters', '~> 48.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -43,6 +43,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     arel (8.0.0)
+    asset_bom_removal-rails (1.0.2)
+      rails (>= 4.2)
+      sass (> 3.4)
     ast (2.2.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
@@ -113,7 +116,7 @@ GEM
       rouge
       sass-rails (>= 5.0.4)
       slimmer (>= 11.1.0)
-    govuk_template (0.22.2)
+    govuk_template (0.23.0)
       rails (>= 3.1)
     hashdiff (0.3.6)
     highline (1.7.8)
@@ -303,6 +306,7 @@ PLATFORMS
 
 DEPENDENCIES
   actionpack-page_caching (= 1.1.0)
+  asset_bom_removal-rails (~> 1.0.0)
   better_errors
   binding_of_caller
   capybara (~> 2.5.0)
@@ -312,7 +316,7 @@ DEPENDENCIES
   govuk_app_config (~> 0.3.0)
   govuk_frontend_toolkit (~> 7.0.1)
   govuk_publishing_components (~> 1.10.0)
-  govuk_template (= 0.22.2)
+  govuk_template (= 0.23.0)
   image_optim (= 0.17.1)
   jasmine-rails (~> 0.14.1)
   logstasher (= 0.4.8)

diff --git a/app/assets/javascripts/webchat-iframe.html.erb b/app/assets/javascripts/webchat-iframe.html.erb
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8"/>
-    <%= javascript_include_tag 'libs/jquery/jquery-1.12.4.js' %>
+    <%= javascript_include_tag 'libs/jquery/jquery-1.12.4.js', integrity: true, crossorigin: 'anonymous' %>
   </head>
   <body>
   <script>

diff --git a/app/views/root/_javascript.html.erb b/app/views/root/_javascript.html.erb
@@ -1,3 +1,3 @@
-<%= javascript_include_tag 'libs/jquery/jquery-1.12.4.js' %>
-<%= javascript_include_tag local_assigns[:js_file] || 'application' %>
-<%= javascript_include_tag 'surveys' %>
+<%= javascript_include_tag 'libs/jquery/jquery-1.12.4.js', integrity: true, crossorigin: 'anonymous' %>
+<%= javascript_include_tag local_assigns[:js_file] || 'application', integrity: true, crossorigin: 'anonymous' %>
+<%= javascript_include_tag 'surveys', integrity: true, crossorigin: 'anonymous' %>
diff --git a/app/views/root/_stylesheet.html.erb b/app/views/root/_stylesheet.html.erb
@@ -1,9 +1,9 @@
 <%
   css_file = local_assigns[:css_file] || 'static'
 %>
-<!--[if gt IE 8]><!--><%= stylesheet_link_tag css_file %><!--<![endif]-->
+<!--[if gt IE 8]><!--><%= stylesheet_link_tag css_file, integrity: true, crossorigin: "anonymous" %><!--<![endif]-->
 <!--[if IE 6]><%= stylesheet_link_tag "#{css_file}-ie6" %><script>var ieVersion = 6;</script><![endif]-->
 <!--[if IE 7]><%= stylesheet_link_tag "#{css_file}-ie7" %><script>var ieVersion = 7;</script><![endif]-->
 <!--[if IE 8]><%= stylesheet_link_tag "#{css_file}-ie8" %><script>var ieVersion = 8;</script><![endif]-->
 
-<%= stylesheet_link_tag "#{css_file}-print", media: "print" %>
+<%= stylesheet_link_tag "#{css_file}-print", media: "print", integrity: true, crossorigin: "anonymous" %>
diff --git a/app/views/root/print.html.erb b/app/views/root/print.html.erb
@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <meta name="robots" content="noindex, nofollow">
 
-  <%= stylesheet_link_tag 'guides-print', media: 'all' %>
+  <%= stylesheet_link_tag 'guides-print', media: 'all', integrity: true, crossorigin: 'anonymous' %>
   <script type="text/javascript">
     window.onload = function() { window.print(); }
   </script>