From 3d708b9780b68bdc60e638ddad9156d7f4efa92b Mon Sep 17 00:00:00 2001
From: Michael Schmidt <mitchi5000.ms@googlemail.com>
Date: Sat, 18 Dec 2021 13:27:08 +0100
Subject: [PATCH] HSTS: Improved tokenization (#3277)

---
 components/prism-hsts.js                      | 14 +++-------
 components/prism-hsts.min.js                  |  2 +-
 tests/languages/hsts/max-age_feature.test     | 27 +++++++++++++++++++
 tests/languages/hsts/safe_maxage_feature.test | 12 ---------
 .../languages/hsts/unsafe_maxage_feature.test | 12 ---------
 5 files changed, 32 insertions(+), 35 deletions(-)
 create mode 100644 tests/languages/hsts/max-age_feature.test
 delete mode 100644 tests/languages/hsts/safe_maxage_feature.test
 delete mode 100644 tests/languages/hsts/unsafe_maxage_feature.test

diff --git a/components/prism-hsts.js b/components/prism-hsts.js
index 4d56433fd0..e2276a1908 100644
--- a/components/prism-hsts.js
+++ b/components/prism-hsts.js
@@ -6,15 +6,9 @@
 
 Prism.languages.hsts = {
 	'directive': {
-		pattern: /\b(?:max-age=|includeSubDomains|preload)/,
-		alias: 'keyword'
+		pattern: /\b(?:includeSubDomains|max-age|preload)(?=[\s;=]|$)/i,
+		alias: 'property'
 	},
-	'safe': {
-		pattern: /\b\d{8,}\b/,
-		alias: 'selector'
-	},
-	'unsafe': {
-		pattern: /\b\d{1,7}\b/,
-		alias: 'function'
-	}
+	'operator': /=/,
+	'punctuation': /;/
 };
diff --git a/components/prism-hsts.min.js b/components/prism-hsts.min.js
index b92d756c52..3faeef2003 100644
--- a/components/prism-hsts.min.js
+++ b/components/prism-hsts.min.js
@@ -1 +1 @@
-Prism.languages.hsts={directive:{pattern:/\b(?:max-age=|includeSubDomains|preload)/,alias:"keyword"},safe:{pattern:/\b\d{8,}\b/,alias:"selector"},unsafe:{pattern:/\b\d{1,7}\b/,alias:"function"}};
\ No newline at end of file
+Prism.languages.hsts={directive:{pattern:/\b(?:includeSubDomains|max-age|preload)(?=[\s;=]|$)/i,alias:"property"},operator:/=/,punctuation:/;/};
\ No newline at end of file
diff --git a/tests/languages/hsts/max-age_feature.test b/tests/languages/hsts/max-age_feature.test
new file mode 100644
index 0000000000..55d6453496
--- /dev/null
+++ b/tests/languages/hsts/max-age_feature.test
@@ -0,0 +1,27 @@
+max-age=0;
+max-age="0";
+max-age=31536000;
+max-age="31536000"
+
+----------------------------------------------------
+
+[
+	["directive", "max-age"],
+	["operator", "="],
+	"0",
+	["punctuation", ";"],
+
+	["directive", "max-age"],
+	["operator", "="],
+	"\"0\"",
+	["punctuation", ";"],
+
+	["directive", "max-age"],
+	["operator", "="],
+	"31536000",
+	["punctuation", ";"],
+
+	["directive", "max-age"],
+	["operator", "="],
+	"\"31536000\""
+]
diff --git a/tests/languages/hsts/safe_maxage_feature.test b/tests/languages/hsts/safe_maxage_feature.test
deleted file mode 100644
index 6797fff3b1..0000000000
--- a/tests/languages/hsts/safe_maxage_feature.test
+++ /dev/null
@@ -1,12 +0,0 @@
-max-age=31536000
-
-----------------------------------------------------
-
-[
-	["directive", "max-age="],
-	["safe", "31536000"]
-]
-
-----------------------------------------------------
-
-Checks for HSTS with a "safe" max-age.
diff --git a/tests/languages/hsts/unsafe_maxage_feature.test b/tests/languages/hsts/unsafe_maxage_feature.test
deleted file mode 100644
index dba69dc304..0000000000
--- a/tests/languages/hsts/unsafe_maxage_feature.test
+++ /dev/null
@@ -1,12 +0,0 @@
-max-age=123
-
-----------------------------------------------------
-
-[
-	["directive", "max-age="],
-	["unsafe", "123"]
-]
-
-----------------------------------------------------
-
-Checks for HSTS with an "unsafe" max-age.