Skip to content

chore: escape raw html #2395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seaerchin merged 3 commits into from
Jul 15, 2025
Merged

chore: escape raw html #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b22570
chore: escape raw html
seaerchin Jul 10, 2025
0b0aaaf
fix: don't escape includes directives
seaerchin Jul 11, 2025
0842892
chore: don't escape long url
seaerchin Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/server/views/404.error.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta http-equiv="Content-Language" content="en">
<meta charset="UTF-8">
<title><%- displayHostname %>: Page not found</title>
<title><%= displayHostname %>: Page not found</title>
<base href="~/" />
<link href="/assets/styles/shared/shared-styles.css" rel="stylesheet">
<link href="/assets/<%- assetVariant %>/styles/colours.css" rel="stylesheet">
<link href="/assets/<%= assetVariant %>/styles/colours.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@400;500;700&display=swap" rel="stylesheet">
<link href="/assets/styles/not-found-page/not-found-page.css" rel="stylesheet">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
Expand All @@ -29,11 +29,11 @@
<div id="divider" class="divider"></div>
<div id="graphics-container">
<div id="graphic-div">
<img src="/assets/<%- assetVariant %>/not-found-page/images/not-found-graphic.svg" draggable="false" />
<img src="/assets/<%= assetVariant %>/not-found-page/images/not-found-graphic.svg" draggable="false" />
</div>
<div id="go-logo-div">
<!-- go logo -->
<img src="/assets/<%- assetVariant %>/not-found-page/icons/go-logo.svg" draggable="false" />
<img src="/assets/<%= assetVariant %>/not-found-page/icons/go-logo.svg" draggable="false" />
</div>
</div>
</main>
Expand Down
16 changes: 8 additions & 8 deletions src/server/views/transition-page.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta http-equiv="Content-Language" content="en">
<meta charset="UTF-8">
<title><%- displayHostname %></title>
<title><%= displayHostname %></title>
<link href="/assets/styles/shared/shared-styles.css" rel="stylesheet">
<link href="/assets/<%- assetVariant %>/styles/colours.css" rel="stylesheet">
<link href="/assets/<%= assetVariant %>/styles/colours.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@400;500;700&display=swap" rel="stylesheet">
<link href="/assets/styles/transition-page/transition-page.css" rel="stylesheet">
<link rel="apple-touch-icon" sizes="180x180" href="/assets/apple-touch-icon.png">
Expand All @@ -22,23 +22,23 @@
<div class="top-half">
<div class="top-half-content">
<h3>Check your address bar</h3>
<a href="https://go.gov.sg/go-antiphishing" target="_blank" rel="noreferrer noopener">Beware of phishing! <br class="mobile-break">Make sure your link starts with <%- displayHostname.toLowerCase() %></a>
<a href="https://go.gov.sg/go-antiphishing" target="_blank" rel="noreferrer noopener">Beware of phishing! <br class="mobile-break">Make sure your link starts with <%= displayHostname.toLowerCase() %></a>
<p id="url" data-href="<%- escapedLongUrl %>">You will be redirected in <span id="countdown-seconds">6</span> second<span id="s">s</span></p>
Copy link

Copilot AI Jul 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the escaped EJS tag (<%= escapedLongUrl %>) instead of the raw tag here to ensure that any HTML-sensitive characters in the URL are properly escaped, preventing injection risks.

Suggested change
<p id="url" data-href="<%- escapedLongUrl %>">You will be redirected in <span id="countdown-seconds">6</span> second<span id="s">s</span></p>
<p id="url" data-href="<%= escapedLongUrl %>">You will be redirected in <span id="countdown-seconds">6</span> second<span id="s">s</span></p>

Copilot uses AI. Check for mistakes.
<img id="spinner" src="/assets/<%- assetVariant %>/transition-page/images/spinner.gif" alt="loading" />
<div class="browser-image" style="background-image: url('/assets/<%- assetVariant %>/transition-page/images/browser.svg');">
<div class="links links-<%- assetVariant %>" ><%- displayHostname.toLowerCase() %>/</div>
<img id="spinner" src="/assets/<%= assetVariant %>/transition-page/images/spinner.gif" alt="loading" />
<div class="browser-image" style="background-image: url('/assets/<%= assetVariant %>/transition-page/images/browser.svg');">
<div class="links links-<%= assetVariant %>" ><%= displayHostname.toLowerCase() %>/</div>
</div>
</div>
</div>
<div class="bottom-half">

<div id="skip">
<span>I've checked the link. Skip ahead</span>
<img src="/assets/<%- assetVariant %>/transition-page/icons/icon-arrow-right.svg" alt="right arrow" />
<img src="/assets/<%= assetVariant %>/transition-page/icons/icon-arrow-right.svg" alt="right arrow" />
</div>
<div class="footer">
<div id="logo">
<img src="/assets/<%- assetVariant %>/transition-page/icons/ogp-logo.svg" alt="ogp logo" />
<img src="/assets/<%= assetVariant %>/transition-page/icons/ogp-logo.svg" alt="ogp logo" />
</div>
<p>You will only be shown this page the first time you access this short link.</p>
</div>
Expand Down
Loading