From 74acf93c7a8a355ab0570476025df22e7a3ec2bd Mon Sep 17 00:00:00 2001
From: Rich Harris <richard.a.harris@gmail.com>
Date: Sat, 14 Jul 2018 20:56:05 -0400
Subject: [PATCH] prevent unsafe replacements of preloaded data etc

---
 src/middleware.ts                       | 10 +++++-----
 test/app/routes/unsafe-replacement.html |  9 +++++++++
 test/common/test.js                     | 10 ++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 test/app/routes/unsafe-replacement.html

diff --git a/src/middleware.ts b/src/middleware.ts
index 44c2b5089..79e495052 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -360,11 +360,11 @@ function get_page_handler(App: Component, routes: RouteObject[], store_getter: (
 			}
 
 			const page = template()
-				.replace('%sapper.base%', `<base href="${req.baseUrl}/">`)
-				.replace('%sapper.scripts%', `<script>${inline_script}</script>${scripts}`)
-				.replace('%sapper.html%', html)
-				.replace('%sapper.head%', `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
-				.replace('%sapper.styles%', (css && css.code ? `<style>${css.code}</style>` : ''));
+				.replace('%sapper.base%', () => `<base href="${req.baseUrl}/">`)
+				.replace('%sapper.scripts%', () => `<script>${inline_script}</script>${scripts}`)
+				.replace('%sapper.html%', () => html)
+				.replace('%sapper.head%', () => `<noscript id='sapper-head-start'></noscript>${head}<noscript id='sapper-head-end'></noscript>`)
+				.replace('%sapper.styles%', () => (css && css.code ? `<style>${css.code}</style>` : ''));
 
 			res.statusCode = status;
 			res.end(page);
diff --git a/test/app/routes/unsafe-replacement.html b/test/app/routes/unsafe-replacement.html
new file mode 100644
index 000000000..98c654fec
--- /dev/null
+++ b/test/app/routes/unsafe-replacement.html
@@ -0,0 +1,9 @@
+$&
+
+<script>
+	export default {
+		preload() {
+			return '$&';
+		}
+	};
+</script>
\ No newline at end of file
diff --git a/test/common/test.js b/test/common/test.js
index 79751e71c..84fb55e9e 100644
--- a/test/common/test.js
+++ b/test/common/test.js
@@ -619,6 +619,16 @@ function run({ mode, basepath = '' }) {
 						assert.equal(name, 'BODY');
 					});
 			});
+
+			it('replaces %sapper.xxx% tags safely', () => {
+				return nightmare
+					.goto(`${base}/unsafe-replacement`)
+					.init()
+					.page.html()
+					.then(html => {
+						assert.equal(html.indexOf('%sapper'), -1);
+					});
+			});
 		});
 
 		describe('headers', () => {