Commit 0f1b5810fa95add9a3b5d4d9cb243e02a0407d6f
2021-12-18T13:27:30
HPKP: Improved tokenization (#3278)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105
diff --git a/components/prism-hpkp.js b/components/prism-hpkp.js
index 1db0264..e3f15b5 100644
--- 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
index 099dfde..50ca60c 100644
--- a/components/prism-hpkp.min.js
+++ b/components/prism-hpkp.min.js
@@ -1 +1 @@
-Prism.languages.hpkp={directive:{pattern:/\b(?:(?:includeSubDomains|preload|strict)(?: |;)|pin-sha256="[a-zA-Z\d+=/]+"|(?:max-age|report-uri)=|report-to )/,alias:"keyword"},safe:{pattern:/\b\d{7,}\b/,alias:"selector"},unsafe:{pattern:/\b\d{1,6}\b/,alias:"function"}};
\ No newline at end of file
+Prism.languages.hpkp={directive:{pattern:/\b(?:includeSubDomains|max-age|pin-sha256|preload|report-to|report-uri|strict)(?=[\s;=]|$)/i,alias:"property"},operator:/=/,punctuation:/;/};
\ No newline at end of file
diff --git a/tests/languages/hpkp/max-age_feature.test b/tests/languages/hpkp/max-age_feature.test
new file mode 100644
index 0000000..9b1ae76
--- /dev/null
+++ 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
deleted file mode 100644
index 169f23c..0000000
--- a/tests/languages/hpkp/safe_maxage_feature.test
+++ /dev/null
@@ -1,12 +0,0 @@
-max-age=31536000
-
-----------------------------------------------------
-
-[
- ["directive", "max-age="],
- ["safe", "31536000"]
-]
-
-----------------------------------------------------
-
-Checks for HPKP with a "safe" max-age.
diff --git a/tests/languages/hpkp/sha256_pin_feature.test b/tests/languages/hpkp/sha256_pin_feature.test
index 45adf1c..e9b46c7 100644
--- 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
deleted file mode 100644
index 4f1ff96..0000000
--- a/tests/languages/hpkp/unsafe_maxage_feature.test
+++ /dev/null
@@ -1,12 +0,0 @@
-max-age=123
-
-----------------------------------------------------
-
-[
- ["directive", "max-age="],
- ["unsafe", "123"]
-]
-
-----------------------------------------------------
-
-Checks for HPKP with an "unsafe" max-age.