From 7aa1f8744ce14e172e9c55fa82b7970f28a6be11 Mon Sep 17 00:00:00 2001
From: Arnaud Mandy <arnaud.mandy@intel.com>
Date: Mon, 30 Oct 2023 17:07:51 +0200
Subject: [PATCH 1/3] Provide guidelines for mitigation algorithms

This patch is providing guidelines on numerical values to select
for the mitigation algorithms parameters. [1]

[1] https://github.com/w3c/compute-pressure/issues/197#issuecomment-1698413311

Fixes: #240
---
 index.html | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index a9d9d24..ebd14c8 100644
--- a/index.html
+++ b/index.html
@@ -854,7 +854,7 @@ <h3>Supporting algorithms</h3>
       <ul>
         <li>
           set |observer|.{{PressureObserver/[[ObservationWindow]]}} to an [=implementation-defined=] randomized integer value in
-          milliseconds within an [=implementation-defined=] range, e.g., random between 300000 and 600000 (5 and 10 minutes).
+          milliseconds within an [=implementation-defined=] range.
         </li>
         <li>
           set |observer|.{{PressureObserver/[[MaxChangesThreshold]]}} to an [=implementation-defined=] randomized integer
@@ -870,6 +870,20 @@ <h3>Supporting algorithms</h3>
       </ul>
       Run the [=reset observation window=] steps and start a timer to re-run the steps when the observer.{{PressureObserver/[[ObservationWindow]]}}
       time has passed, using different randomized values.
+    <aside class="note">
+      Implementers are advised to use:
+      <ul>
+        <li>
+          a range in milliseconds between 300000 and 600000 for |observer|.{{PressureObserver/[[ObservationWindow]]}}.
+        </li>
+        <li>
+          a range in between 50 and 100 changes for |observer|.{{PressureObserver/[[MaxChangesThreshold]]}}.
+        </li>
+        <li>
+          a range in milliseconds between 5000 and 10000 for |observer|.{{PressureObserver/[[PenaltyDuration]]}}.
+        </li>
+      </ul>
+    </aside>
     </p>
     <p>
       <aside class="note">
@@ -1363,14 +1377,21 @@ <h4>Break calibration</h4>
           at runtime when this mitigation is running continuously. Any attempts to recalibrate
           will similarly be mitigated against.
         </p>
-        <div class="note">
+        <aside class="note">
+          This mitigation, if applied too often, can deteriorate the pressure state detection reliability.
+          Therefore it is targeted for longer calibration attack processes.
+          Implementers are advised to apply the mitigation to a randomized time value in milliseconds
+          within a range between 120000 and 240000 (2 and 4 minutes).
+          Faster calibration processes can be mitigated by [=rate obfuscation=] mitigation.
+        </aside>
+        <aside class="note">
           Modern browsers throttle background tabs using [=implementation-defined=]
           heuristics in order to reduce resource usage. For example, after a period of
           no user interaction a background tab can be throttled that will influence
           the global pressure state of the system. This built-in feature of modern
           browsers further improves the effectiveness of the break calibration
           mitigation.
-        </div>
+        </aside>
       </section>
       <section>
         <h4>Same-origin restriction</h4>

From d8be60299f705167a6e143ff39ae50b9e7a928d4 Mon Sep 17 00:00:00 2001
From: Arnaud Mandy <arnaud.mandy@intel.com>
Date: Tue, 31 Oct 2023 14:04:28 +0200
Subject: [PATCH 2/3] fix to non-normative section

Signed-off-by: Arnaud Mandy <arnaud.mandy@intel.com>
---
 index.html | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/index.html b/index.html
index ebd14c8..ae0fba4 100644
--- a/index.html
+++ b/index.html
@@ -870,20 +870,6 @@ <h3>Supporting algorithms</h3>
       </ul>
       Run the [=reset observation window=] steps and start a timer to re-run the steps when the observer.{{PressureObserver/[[ObservationWindow]]}}
       time has passed, using different randomized values.
-    <aside class="note">
-      Implementers are advised to use:
-      <ul>
-        <li>
-          a range in milliseconds between 300000 and 600000 for |observer|.{{PressureObserver/[[ObservationWindow]]}}.
-        </li>
-        <li>
-          a range in between 50 and 100 changes for |observer|.{{PressureObserver/[[MaxChangesThreshold]]}}.
-        </li>
-        <li>
-          a range in milliseconds between 5000 and 10000 for |observer|.{{PressureObserver/[[PenaltyDuration]]}}.
-        </li>
-      </ul>
-    </aside>
     </p>
     <p>
       <aside class="note">
@@ -1364,6 +1350,24 @@ <h4>Rate obfuscation</h4>
           received from the platform collector during this penalty.
         </p>
       </section>
+      <section>
+        <h4>Rate obfuscation parameters</h4>
+        <p><i>This section is non-normative.</i></p>
+        <p>
+          Implementers are advised to use:
+          <ul>
+            <li>
+              a range between 300000 milliseconds (5 minutes) and 600000 milliseconds (10 minutes) for |observer|.{{PressureObserver/[[ObservationWindow]]}}.
+            </li>
+            <li>
+              a range in between 50 and 100 changes for |observer|.{{PressureObserver/[[MaxChangesThreshold]]}}.
+            </li>
+            <li>
+              a range in milliseconds between 5000 and 10000 for |observer|.{{PressureObserver/[[PenaltyDuration]]}}.
+            </li>
+          </ul>
+        </p>
+      </section>
       <section>
         <h4>Break calibration</h4>
         <p>
@@ -1377,13 +1381,6 @@ <h4>Break calibration</h4>
           at runtime when this mitigation is running continuously. Any attempts to recalibrate
           will similarly be mitigated against.
         </p>
-        <aside class="note">
-          This mitigation, if applied too often, can deteriorate the pressure state detection reliability.
-          Therefore it is targeted for longer calibration attack processes.
-          Implementers are advised to apply the mitigation to a randomized time value in milliseconds
-          within a range between 120000 and 240000 (2 and 4 minutes).
-          Faster calibration processes can be mitigated by [=rate obfuscation=] mitigation.
-        </aside>
         <aside class="note">
           Modern browsers throttle background tabs using [=implementation-defined=]
           heuristics in order to reduce resource usage. For example, after a period of
@@ -1393,6 +1390,13 @@ <h4>Break calibration</h4>
           mitigation.
         </aside>
       </section>
+      <section>
+        <h4>Break calibration parameters</h4>
+        <p><i>This section is non-normative.</i></p>
+        <p>
+          Implementers are advised to apply the mitigation to a randomized time value within a range
+          between 120000 milliseconds (2minutes) and 240000 milliseconds (4 minutes).
+      </section>
       <section>
         <h4>Same-origin restriction</h4>
         <p>

From 1871894ad64248c5f34dfb6ec4c65a5ce800b965 Mon Sep 17 00:00:00 2001
From: Arnaud Mandy <arnaud.mandy@intel.com>
Date: Tue, 31 Oct 2023 15:00:16 +0200
Subject: [PATCH 3/3] fix milliseconds

Signed-off-by: Arnaud Mandy <arnaud.mandy@intel.com>
---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index ae0fba4..2d0e115 100644
--- a/index.html
+++ b/index.html
@@ -1357,13 +1357,13 @@ <h4>Rate obfuscation parameters</h4>
           Implementers are advised to use:
           <ul>
             <li>
-              a range between 300000 milliseconds (5 minutes) and 600000 milliseconds (10 minutes) for |observer|.{{PressureObserver/[[ObservationWindow]]}}.
+              a range in between 300000 milliseconds (5 minutes) and 600000 milliseconds (10 minutes) for |observer|.{{PressureObserver/[[ObservationWindow]]}}.
             </li>
             <li>
               a range in between 50 and 100 changes for |observer|.{{PressureObserver/[[MaxChangesThreshold]]}}.
             </li>
             <li>
-              a range in milliseconds between 5000 and 10000 for |observer|.{{PressureObserver/[[PenaltyDuration]]}}.
+              a range in between 5000 milliseconds and 10000 milliseconds for |observer|.{{PressureObserver/[[PenaltyDuration]]}}.
             </li>
           </ul>
         </p>