From 7eb2dbbf3546580bca931d5f1eff1b6137f4a185 Mon Sep 17 00:00:00 2001
From: Will Faught <willfaught@users.noreply.github.com>
Date: Tue, 24 Jan 2023 21:46:58 -0800
Subject: [PATCH] Add missing uses of safeURL

---
 layouts/partials/paige/a.html      |  2 +-
 layouts/partials/paige/link.html   |  2 +-
 layouts/partials/paige/links.html  | 18 +++++++++---------
 layouts/partials/paige/menu.html   |  2 +-
 layouts/partials/paige/script.html |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/layouts/partials/paige/a.html b/layouts/partials/paige/a.html
index d5282bd0..942b137d 100644
--- a/layouts/partials/paige/a.html
+++ b/layouts/partials/paige/a.html
@@ -3,4 +3,4 @@
 {{ $href := .href }}
 {{ $style := .style }}
 
-<a {{ with $class }} class="{{ . }}" {{ end }} {{ with $href }} href="{{ . }}" {{ end }} {{ with $style }} style="{{ . | safeCSS }}" {{ end }}>{{ $content }}</a>
+<a {{ with $class }} class="{{ . }}" {{ end }} {{ with $href }} href="{{ . | safeURL }}" {{ end }} {{ with $style }} style="{{ . | safeCSS }}" {{ end }}>{{ $content }}</a>
diff --git a/layouts/partials/paige/link.html b/layouts/partials/paige/link.html
index 80415774..7efcb1a0 100644
--- a/layouts/partials/paige/link.html
+++ b/layouts/partials/paige/link.html
@@ -16,4 +16,4 @@
     {{ $integrity = $resource.Data.Integrity }}
 {{ end }}
 
-<link {{ with $crossorigin }} crossorigin="{{ . }}" {{ end }} href="{{ $href }}" integrity="{{ $integrity }}" {{ with $referrerpolicy }} referrerpolicy="{{ . }}" {{ end }} rel="stylesheet">
+<link {{ with $crossorigin }} crossorigin="{{ . }}" {{ end }} href="{{ $href | safeURL }}" integrity="{{ $integrity }}" {{ with $referrerpolicy }} referrerpolicy="{{ . }}" {{ end }} rel="stylesheet">
diff --git a/layouts/partials/paige/links.html b/layouts/partials/paige/links.html
index 8a9dd7ec..16db82da 100644
--- a/layouts/partials/paige/links.html
+++ b/layouts/partials/paige/links.html
@@ -1,13 +1,13 @@
-<link href="{{ relLangURL `apple-touch-icon.png` }}" rel="apple-touch-icon" sizes="180x180">
-<link href="{{ relLangURL `favicon-16x16.png` }}" rel="icon" sizes="16x16" type="image/png">
-<link href="{{ relLangURL `favicon-32x32.png` }}" rel="icon" sizes="32x32" type="image/png">
+<link href="{{ relLangURL `apple-touch-icon.png` | safeURL }}" rel="apple-touch-icon" sizes="180x180">
+<link href="{{ relLangURL `favicon-16x16.png` | safeURL }}" rel="icon" sizes="16x16" type="image/png">
+<link href="{{ relLangURL `favicon-32x32.png` | safeURL }}" rel="icon" sizes="32x32" type="image/png">
 {{ if ne (relLangURL "favicon.ico") "/favicon.ico" }}
-    <link href="{{ relLangURL `favicon.ico` }}" rel="shortcut icon">
+    <link href="{{ relLangURL `favicon.ico` | safeURL }}" rel="shortcut icon">
 {{ end }}
-<link href="{{ relLangURL `favicon.png` }}" rel="icon" type="image/png">
-<link href="{{ relLangURL `favicon.svg` }}" rel="icon" type="image/svg+xml">
-<link color="{{ .Site.Params.paige.color | default `#0d6efd` }}" href="{{ relLangURL `safari-pinned-tab.svg` }}" rel="mask-icon">
-<link href="{{ relLangURL `site.webmanifest` }}" rel="manifest">
+<link href="{{ relLangURL `favicon.png` | safeURL }}" rel="icon" type="image/png">
+<link href="{{ relLangURL `favicon.svg` | safeURL }}" rel="icon" type="image/svg+xml">
+<link color="{{ .Site.Params.paige.color | default `#0d6efd` }}" href="{{ relLangURL `safari-pinned-tab.svg` | safeURL }}" rel="mask-icon">
+<link href="{{ relLangURL `site.webmanifest` | safeURL }}" rel="manifest">
 {{ partial "paige/link.html" (dict
     "href" (.Site.Params.paige.bootstrap.icons.link_href | default "https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.3/font/bootstrap-icons.css")
     "integrity" .Site.Params.paige.bootstrap.icons.link_integrity
@@ -28,6 +28,6 @@
 {{ if .AlternativeOutputFormats }}
     {{ $title := partial "paige/func-title.html" . }}
     {{ range .AlternativeOutputFormats }}
-        <link href="{{ .Permalink }}" rel="{{ .Rel }}" title="{{ $title }}" type="{{ .MediaType.Type }}">
+        <link href="{{ .Permalink | safeURL }}" rel="{{ .Rel }}" title="{{ $title }}" type="{{ .MediaType.Type }}">
     {{ end }}
 {{ end }}
diff --git a/layouts/partials/paige/menu.html b/layouts/partials/paige/menu.html
index f3bfc353..ab71dbc9 100644
--- a/layouts/partials/paige/menu.html
+++ b/layouts/partials/paige/menu.html
@@ -24,6 +24,6 @@
         {{ $pagePath := strings.TrimPrefix $basepath $.RelPermalink }}
         {{ $menuPath := strings.TrimPrefix $basepath .URL }}
         {{ $active := or (and (eq $menuPath `/`) (eq $pagePath `/`)) (and (ne $menuPath `/`) (hasPrefix $pagePath $menuPath)) }}
-        <a {{ if $active }} aria-current="page" {{ end }} class="{{ if $active }} active {{ if $links }} link-secondary {{ end }} {{ end }} nav-link" href="{{ .URL }}">{{ .Name }}</a>
+        <a {{ if $active }} aria-current="page" {{ end }} class="{{ if $active }} active {{ if $links }} link-secondary {{ end }} {{ end }} nav-link" href="{{ .URL | safeURL }}">{{ .Name }}</a>
     {{ end }}
 </nav>
diff --git a/layouts/partials/paige/script.html b/layouts/partials/paige/script.html
index 2a51668d..ccc13e9a 100644
--- a/layouts/partials/paige/script.html
+++ b/layouts/partials/paige/script.html
@@ -18,4 +18,4 @@
     {{ $src = $resource.RelPermalink }}
 {{ end }}
 
-<script {{ with $crossorigin }} crossorigin="{{ . }}" {{ end }} {{ with $defer }} defer {{ end }} integrity="{{ $integrity }}" {{ with $onload }} onload="{{ . }}" {{ end }} {{ with $referrerpolicy }} referrerpolicy="{{ . }}" {{ end }} src="{{ $src }}"></script>
+<script {{ with $crossorigin }} crossorigin="{{ . }}" {{ end }} {{ with $defer }} defer {{ end }} integrity="{{ $integrity }}" {{ with $onload }} onload="{{ . }}" {{ end }} {{ with $referrerpolicy }} referrerpolicy="{{ . }}" {{ end }} src="{{ $src | safeURL }}"></script>