HSTS: Improved tokenization (#3277)

PrismJS · Dec 18, 2021 · 3d708b9 · 3d708b9
1 parent a943f2b
commit 3d708b9
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 35 deletions.
diff --git 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
diff --git a/tests/languages/hsts/max-age_feature.test 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
diff --git a/tests/languages/hsts/unsafe_maxage_feature.test b/tests/languages/hsts/unsafe_maxage_feature.test