Commit 0b7e9a4

Daniel Axtens <dja@axtens.net>
2026-10-04 22:57:41
Set up CSP, break CSS into standalone page to support
It's ironic, this is no longer "best practice" for speed, afaik. But trying to do CSP with a nonce breaks static deployment, and doing it with a hash is apparently (and I believe it) very fiddly.
1 parent 71a11b7
Changed files (3)
blog
assets
layouts
_default
nginx
blog/assets/style.css
@@ -0,0 +1,156 @@
+  :root {
+    --width: 720px;
+    --font-main: Verdana, sans-serif;
+    --font-secondary: Verdana, sans-serif;
+    --font-scale: 1em;
+    --background-color: #fff;
+    --heading-color: #222;
+    --text-color: #444;
+    --link-color: #3273dc;
+    --visited-color: #8b6fcb;
+    --blockquote-color: #222;
+  }
+
+  @media (prefers-color-scheme: dark) {
+    :root {
+      --background-color: #01242e;
+      --heading-color: #eee;
+      --text-color: #ddd;
+      --link-color: #8cc2dd;
+      --visited-color: #8b6fcb;
+      --blockquote-color: #ccc;
+    }
+  }
+
+  body {
+    font-family: var(--font-secondary);
+    font-size: var(--font-scale);
+    margin: auto;
+    padding: 20px;
+    max-width: var(--width);
+    text-align: left;
+    background-color: var(--background-color);
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+    line-height: 1.5;
+    color: var(--text-color);
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    font-family: var(--font-main);
+    color: var(--heading-color);
+  }
+
+  a {
+    color: var(--link-color);
+    cursor: pointer;
+    text-decoration: none;
+  }
+
+  a:hover {
+    text-decoration: underline;
+  }
+
+  nav a {
+    margin-right: 8px;
+  }
+
+  strong,
+  b {
+    color: var(--heading-color);
+  }
+
+  button {
+    margin: 0;
+    cursor: pointer;
+  }
+
+  time {
+    font-family: monospace;
+    font-style: normal;
+    font-size: 15px;
+  }
+
+  main {
+    line-height: 1.6;
+  }
+
+  table {
+    width: 100%;
+  }
+
+  hr {
+    border: 0;
+    border-top: 1px dashed;
+  }
+
+  img {
+    max-width: 100%;
+  }
+
+  code {
+    font-family: monospace;
+    padding: 2px;
+    border-radius: 3px;
+  }
+
+  blockquote {
+    border-left: 1px solid #999;
+    color: var(--blockquote-color);
+    padding-left: 20px;
+    font-style: italic;
+  }
+
+  footer {
+    padding: 25px 0;
+    text-align: center;
+  }
+
+  .title:hover {
+    text-decoration: none;
+  }
+
+  .title h1 {
+    font-size: 1.5em;
+  }
+
+  .inline {
+    width: auto !important;
+  }
+
+  .highlight,
+  .code {
+    border-radius: 3px;
+    margin-block-start: 1em;
+    margin-block-end: 1em;
+    overflow-x: auto;
+  }
+
+  .highlight pre,
+  .code pre {
+    min-width: 100%;
+    width: max-content;
+  }
+
+  /* blog post list */
+  ul.blog-posts {
+    list-style-type: none;
+    padding: unset;
+  }
+
+  ul.blog-posts li {
+    display: flex;
+  }
+
+  ul.blog-posts li span {
+    flex: 0 0 130px;
+  }
+
+  ul.blog-posts li a:visited {
+    color: var(--visited-color);
+  }
blog/layouts/_default/baseof.html
@@ -14,7 +14,8 @@
   {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
   {{ end -}}
 
-  {{- partial "style.html" . -}}
+  {{ $css := resources.Get "style.css" | minify | resources.Fingerprint site.Params.digest }}
+  <link type=text/css rel=stylesheet href={{ $css.RelPermalink }} integrity={{ $css.Data.Integrity }} >
 
   <!-- A partial to be overwritten by the user.
   Simply place a custom_head.html into
nginx/nginx.conf
@@ -49,6 +49,12 @@ http {
                 return 304;
             }
 
+            # should always be overridden below but just in case
+            # keep our CSP and give us a surrogate key to purge
+            add_header Surrogate-Key "blog-etag-missing";
+            add_header Last-Modified "";
+            add_header Content-Security-Policy "default-src 'none'; style-src 'self'; base-uri 'none'; require-trusted-types-for;";
+
             etag off;
             if ($hash_etag != "") {
                 add_header ETag $hash_etag always;
@@ -58,6 +64,10 @@ http {
                 add_header Surrogate-Key "blog";
                 # etag is enough, let's not confuse stuff with last-modified
                 add_header Last-Modified "";
+
+                # Content security policy
+                # Assumes no JS, which works fine atm but may one day require adjusting
+                add_header Content-Security-Policy "default-src 'none'; style-src 'self'; base-uri 'none'; require-trusted-types-for;";
             }
         }