HPKP: Improved tokenization (#3278)

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

Hide file tree

Showing 6 changed files with 23 additions and 36 deletions.
diff --git a/components/prism-hpkp.js b/components/prism-hpkp.js
@@ -6,15 +6,9 @@
 
 Prism.languages.hpkp = {
 	'directive': {
-		pattern: /\b(?:(?:includeSubDomains|preload|strict)(?: |;)|pin-sha256="[a-zA-Z\d+=/]+"|(?:max-age|report-uri)=|report-to )/,
-		alias: 'keyword'
+		pattern: /\b(?:includeSubDomains|max-age|pin-sha256|preload|report-to|report-uri|strict)(?=[\s;=]|$)/i,
+		alias: 'property'
 	},
-	'safe': {
-		pattern: /\b\d{7,}\b/,
-		alias: 'selector'
-	},
-	'unsafe': {
-		pattern: /\b\d{1,6}\b/,
-		alias: 'function'
-	}
+	'operator': /=/,
+	'punctuation': /;/
 };
diff --git a/components/prism-hpkp.min.js b/components/prism-hpkp.min.js
diff --git a/tests/languages/hpkp/max-age_feature.test b/tests/languages/hpkp/max-age_feature.test
@@ -0,0 +1,13 @@
+max-age=123;
+max-age=31536000
+
+----------------------------------------------------
+
+[
+	["directive", "max-age"], ["operator", "="], "123", ["punctuation", ";"],
+	["directive", "max-age"], ["operator", "="], "31536000"
+]
+
+----------------------------------------------------
+
+Checks for HPKP with an "unsafe" max-age.
diff --git a/tests/languages/hpkp/safe_maxage_feature.test b/tests/languages/hpkp/safe_maxage_feature.test
diff --git a/tests/languages/hpkp/sha256_pin_feature.test b/tests/languages/hpkp/sha256_pin_feature.test
@@ -3,7 +3,11 @@ pin-sha256="EpOpN/ahUF6jhWShDUdy+NvvtaGcu5F7qM6+x2mfkh4="
 ----------------------------------------------------
 
 [
-	["directive", "pin-sha256=\"EpOpN/ahUF6jhWShDUdy+NvvtaGcu5F7qM6+x2mfkh4=\""]
+	["directive", "pin-sha256"],
+	["operator", "="],
+	"\"EpOpN/ahUF6jhWShDUdy+NvvtaGcu5F7qM6+x2mfkh4",
+	["operator", "="],
+	"\""
 ]
 
 ----------------------------------------------------

diff --git a/tests/languages/hpkp/unsafe_maxage_feature.test b/tests/languages/hpkp/unsafe_maxage_feature.test