Add CSP nonce on inline script in storage-change-detection.html

Author: Nemo157

src/web/page/web_page.rs

@@ -10,7 +10,7 @@ use tera::Context;
 #[macro_export]
 macro_rules! impl_webpage {
     ($page:ty = $template:literal $(, status = $status:expr)? $(, content_type = $content_type:expr)? $(,)?) => {
-        impl_webpage!($page = |_| ::std::borrow::Cow::Borrowed($template) $(, status = $status)? $(, content_type = $content_type)?);
+        $crate::impl_webpage!($page = |_| ::std::borrow::Cow::Borrowed($template) $(, status = $status)? $(, content_type = $content_type)?);
     };
 
     ($page:ty = $template:expr $(, status = $status:expr)? $(, content_type = $content_type:expr)? $(,)?) => {

src/web/routes.rs

@@ -31,6 +31,15 @@ pub(super) fn build_routes() -> Routes {
 
     routes.static_resource("/-/static/:single", super::statics::static_handler);
     routes.static_resource("/-/static/*", super::statics::static_handler);
+    routes.internal_page("/-/storage-change-detection.html", {
+        #[derive(Debug, serde::Serialize)]
+        struct StorageChangeDetection {}
+        crate::impl_webpage!(StorageChangeDetection = "storage-change-detection.html");
+        fn storage_change_detection(req: &mut iron::Request) -> iron::IronResult<iron::Response> {
+            crate::web::page::WebPage::into_response(StorageChangeDetection {}, req)
+        }
+        storage_change_detection
+    });
 
     routes.internal_page("/", super::releases::home_page);
 

templates/rustdoc/body.html

@@ -31,6 +31,6 @@
   }
 </script>
 
-{# see comment in ../../static/storage-change-detection.html for details #}
-<iframe src="/-/static/storage-change-detection.html" width="0" height="0" style="display: none"></iframe>
+{# see comment in ../storage-change-detection.html for details #}
+<iframe src="/-/storage-change-detection.html" width="0" height="0" style="display: none"></iframe>
 {%- include "footer.html" -%}

static/storage-change-detection.html renamed to templates/storage-change-detection.html

@@ -8,7 +8,7 @@
             ../templates/theme.js when rustdoc in the current window changes the
             theme
         -->
-        <script type="text/javascript">
+        <script nonce="{{ csp_nonce }}" type="text/javascript">
             onstorage = function(ev) {
                 parent.postMessage({
                     storage: {

templates/theme.js

@@ -8,7 +8,7 @@ window.addEventListener('storage', function (ev) {
   }
 });
 
-// see ../static/storage-change-detection.html for details
+// see ./storage-change-detection.html for details
 window.addEventListener('message', function (ev) {
   if (ev.data && ev.data.storage && ev.data.storage.key === 'rustdoc-theme') {
     applyTheme(ev.data.storage.value);